Changeset c2f543 for tests/Calculations/Makefile.am

Timestamp:

Mar 2, 2017, 2:02:46 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

161fed

Parents:

440ac3

git-author:

Frederik Heber <heber@…> (02/20/17 11:26:59)

git-committer:

Frederik Heber <heber@…> (03/02/17 14:02:46)

Message:

Target extracheck now uses Server/PoolWorker when JobMarket is available.

• FIX: anthracene has two possible energies depending on how bond degrees are set.
• check of energy is performed after server and poolworker have been shut down as the kill inside the negative action statement would not work.
• extracheck is running through without error.

File:

• tests/Calculations/Makefile.am (modified) (4 diffs)

tests/Calculations/Makefile.am

@@ -25 +25 @@
         testsuite-calculations-tartaric_acid.at
 
+TESTJOBMARKETSCRIPTS = \
+        testsuite-calculations-jobmarket-1_2-dimethoxyethane.at \
+        testsuite-calculations-jobmarket-1_2-dimethylbenzene.at \
+        testsuite-calculations-jobmarket-2-methylcyclohexanone.at \
+        testsuite-calculations-jobmarket-anthracene.at \
+        testsuite-calculations-jobmarket-benzene.at \
+        testsuite-calculations-jobmarket-cholesterol.at \
+        testsuite-calculations-jobmarket-coronene.at \
+        testsuite-calculations-jobmarket-cycloheptane.at \
+        testsuite-calculations-jobmarket-dimethyl_bromomalonate.at \
+        testsuite-calculations-jobmarket-glucose.at \
+        testsuite-calculations-jobmarket-heptan.at \
+        testsuite-calculations-jobmarket-isoleucine.at \
+        testsuite-calculations-jobmarket-mpqc.at \
+        testsuite-calculations-jobmarket-naphthalene.at \
+        testsuite-calculations-jobmarket-neohexane.at \
+        testsuite-calculations-jobmarket-N_N-dimethylacetamide.at \
+        testsuite-calculations-jobmarket-phenanthrene.at \
+        testsuite-calculations-jobmarket-proline.at \
+        testsuite-calculations-jobmarket-putrescine.at \
+        testsuite-calculations-jobmarket-tartaric_acid.at
+
 DISTCLEANFILES = atconfig
 
@@ -31 +53 @@
         package.m4 \
         testsuite.at \
+        testsuite_jobmarket.at \
         $(TESTSUITE) \
-        $(TESTSCRIPTS)
+        $(TESTSCRIPTS) \
+        $(TESTJOBMARKETSCRIPTS)
 
 max_jobs = 4
 
-if CONDJOBMARKET
-
-extracheck:
-installextracheck:
-
-else
 
 extracheck: atlocal package.m4 $(TESTSUITE)
@@ -63 +81 @@
         $(SHELL) '$(TESTSUITE)' $$nrjobs AUTOTEST_PATH='$(bindir)' $(TESTSUITEFLAGS)
 
-endif
 
 clean-local:
@@ -70 +87 @@
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
+
+if CONDJOBMARKET
+$(TESTSUITE): $(srcdir)/testsuite_jobmarket.at package.m4 $(TESTJOBMARKETSCRIPTS)
+        $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $(srcdir)/testsuite_jobmarket.at
+        mv $@.tmp $@
+else
 $(TESTSUITE): $(srcdir)/testsuite.at package.m4 $(TESTSCRIPTS)
-        $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+        $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $(srcdir)/testsuite.at
         mv $@.tmp $@
+endif
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.