Changeset 3532b7 for tests

Timestamp:

Aug 3, 2015, 3:03:34 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

725a1d

Parents:

8e790eb

git-author:

Frederik Heber <heber@…> (07/31/15 10:21:56)

git-committer:

Frederik Heber <heber@…> (08/03/15 15:03:34)

Message:

DISTFIX: adjacencymatcher and trianglematcher are check_PROGRAMS, not bin_...

• as such they are not installed and hence .in files must not use AUTOTEST_PATH but topdir (top build directory).
• also in GuiChecks, regresssion, and Tesselations tests TESTSUITE was made dependent on them but target check and installcheck only actually depend on the wrapper scripts (molecuilder, ...).

Location:

tests

Files:

• GuiChecks/Makefile.am (modified) (3 diffs)
• GuiChecks/adjacencymatcher.in (modified) (1 diff)
• GuiChecks/trianglematcher.in (modified) (1 diff)
• Tesselations/Makefile.am (modified) (3 diffs)
• Tesselations/trianglematcher.in (modified) (1 diff)
• regression/Makefile.am (modified) (3 diffs)
• regression/adjacencymatcher.in (modified) (1 diff)
• regression/trianglematcher.in (modified) (1 diff)

tests/GuiChecks/Makefile.am

@@ -217 +217 @@
 max_jobs = 4
  
-guicheck: atlocal package.m4 $(TESTSUITE)
+guicheck: adjacencymatcher atlocal package.m4 molecuilder molecuilderguitest trianglematcher $(TESTSUITE)
         nrjobs=; \
         for flag in $$MAKEFLAGS; do \
@@ -227 +227 @@
         $(SHELL) '$(TESTSUITE)' $$nrjobs AUTOTEST_PATH='$(abs_top_builddir)/src' $(TESTSUITEFLAGS)
 
-installguicheck: atconfig atlocal $(TESTSUITE)
+installguicheck: adjacencymatcher atconfig atlocal molecuilder molecuilderguitest trianglematcher $(TESTSUITE)
         nrjobs=; \
         for flag in $$MAKEFLAGS; do \
@@ -242 +242 @@
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): $(srcdir)/testsuite.at molecuilder molecuilderguitest package.m4 trianglematcher $(TESTSCRIPTS)
+$(TESTSUITE): $(srcdir)/testsuite.at package.m4 $(TESTSCRIPTS)
         $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
         mv $@.tmp $@

tests/GuiChecks/adjacencymatcher.in

@@ -20 +20 @@
 --track-origins=yes \
 --show-reachable=yes \
-"${AUTOTEST_PATH}/Bond/AdjacencyMatcher/adjacencymatcher" \
+"${topdir}/src/Bond/AdjacencyMatcher/adjacencymatcher" \
 ${1+"$@"}
 else
-"${AUTOTEST_PATH}/Bond/AdjacencyMatcher/adjacencymatcher" \
+"${topdir}/src/Bond/AdjacencyMatcher/adjacencymatcher" \
 ${1+"$@"}
 fi

tests/GuiChecks/trianglematcher.in

@@ -20 +20 @@
 --track-origins=yes \
 --show-reachable=yes \
-"${AUTOTEST_PATH}/Tesselation/TriangleMatcher/trianglematcher" \
+"${topdir}/src/Tesselation/TriangleMatcher/trianglematcher" \
 ${1+"$@"}
 else
-"${AUTOTEST_PATH}/Tesselation/TriangleMatcher/trianglematcher" \
+"${topdir}/src/Tesselation/TriangleMatcher/trianglematcher" \
 ${1+"$@"}
 fi

tests/Tesselations/Makefile.am

@@ -78 +78 @@
 max_jobs = 4
  
-check-local: atconfig atlocal $(TESTSUITE)
+check-local: atconfig atlocal molecuilder trianglematcher $(TESTSUITE)
         nrjobs=; \
         for flag in $$MAKEFLAGS; do \
@@ -88 +88 @@
         $(SHELL) '$(TESTSUITE)' $$nrjobs AUTOTEST_PATH='$(abs_top_builddir)/src' $(TESTSUITEFLAGS)
 
-installcheck-local: atconfig atlocal $(TESTSUITE)
+installcheck-local: atconfig atlocal molecuilder trianglematcher $(TESTSUITE)
         nrjobs=; \
         for flag in $$MAKEFLAGS; do \
@@ -103 +103 @@
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): $(srcdir)/testsuite.at molecuilder package.m4 trianglematcher $(TESTSCRIPTS)
+$(TESTSUITE): $(srcdir)/testsuite.at package.m4 $(TESTSCRIPTS)
         $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
         mv $@.tmp $@

tests/Tesselations/trianglematcher.in

@@ -20 +20 @@
 --track-origins=yes \
 --show-reachable=yes \
-"${AUTOTEST_PATH}/Tesselation/TriangleMatcher/trianglematcher" \
+"${topdir}/src/Tesselation/TriangleMatcher/trianglematcher" \
 ${1+"$@"}
 else
-"${AUTOTEST_PATH}/Tesselation/TriangleMatcher/trianglematcher" \
+"${topdir}/src/Tesselation/TriangleMatcher/trianglematcher" \
 ${1+"$@"}
 fi

tests/regression/Makefile.am

@@ -241 +241 @@
 max_jobs = 4
  
-check-local: atconfig atlocal $(TESTSUITE)
+check-local: adjacencymatcher atconfig atlocal molecuilder runpython trianglematcher $(TESTSUITE)
         nrjobs=; \
         for flag in $$MAKEFLAGS; do \
@@ -251 +251 @@
         $(SHELL) '$(TESTSUITE)' $$nrjobs AUTOTEST_PATH='$(abs_top_builddir)/src' $(TESTSUITEFLAGS)
 
-installcheck-local: atconfig atlocal $(TESTSUITE)
+installcheck-local: adjacencymatcher atconfig atlocal molecuilder runpython trianglematcher $(TESTSUITE)
         nrjobs=; \
         for flag in $$MAKEFLAGS; do \
@@ -266 +266 @@
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): $(srcdir)/testsuite.at molecuilder package.m4 runpython trianglematcher $(TESTSCRIPTS)
+$(TESTSUITE): $(srcdir)/testsuite.at package.m4 $(TESTSCRIPTS)
         $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
         mv $@.tmp $@

tests/regression/adjacencymatcher.in

@@ -20 +20 @@
 --track-origins=yes \
 --show-reachable=yes \
-"${AUTOTEST_PATH}/Bond/AdjacencyMatcher/adjacencymatcher" \
+"${topdir}/src/Bond/AdjacencyMatcher/adjacencymatcher" \
 ${1+"$@"}
 else
-"${AUTOTEST_PATH}/Bond/AdjacencyMatcher/adjacencymatcher" \
+"${topdir}/src/Bond/AdjacencyMatcher/adjacencymatcher" \
 ${1+"$@"}
 fi

tests/regression/trianglematcher.in

@@ -20 +20 @@
 --track-origins=yes \
 --show-reachable=yes \
-"${AUTOTEST_PATH}/Tesselation/TriangleMatcher/trianglematcher" \
+"${topdir}/src/Tesselation/TriangleMatcher/trianglematcher" \
 ${1+"$@"}
 else
-"${AUTOTEST_PATH}/Tesselation/TriangleMatcher/trianglematcher" \
+"${topdir}/src/Tesselation/TriangleMatcher/trianglematcher" \
 ${1+"$@"}
 fi