Changeset 24e19e

Timestamp:

Aug 12, 2013, 11:30:33 AM (11 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:

f5724f

Parents:

353326

git-author:

Frederik Heber <heber@…> (08/07/13 13:19:25)

git-committer:

Frederik Heber <heber@…> (08/12/13 11:30:33)

Message:

FIX: Have configure.ac create tests/Python and JobMarket, otherwist dist-targets fail.

• we remove Python via CONDPYTHON inside tests/Python/Makefile.am.
• similarly for JobMarket.

Files:

• configure.ac (modified) (1 diff)
• tests/JobMarket/Makefile.am (modified) (2 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/Python/Makefile.am (modified) (2 diffs)

configure.ac

@@ -411 +411 @@
 
 # produce python scripts and tests only when python's present
+AC_CONFIG_TESTDIR([tests/Python])
+AC_CONFIG_FILES([tests/Python/atlocal])
 AM_COND_IF([CONDPYTHON],[
-        AC_CONFIG_TESTDIR([tests/Python])
         AC_CONFIG_FILES([utils/Python/boxmaker.py:utils/Python/boxmaker.py.in], [chmod +x utils/Python/boxmaker.py])
         AC_CONFIG_FILES([utils/Python/python_wrapper:utils/Python/python_wrapper.in], [chmod +x utils/Python/python_wrapper])
         AC_CONFIG_FILES([tests/Python/run], [chmod +x tests/Python/run])
-        AC_CONFIG_FILES([tests/Python/atlocal])
-        AC_CONFIG_FILES([tests/Python/Makefile])
-])
+])
+AC_CONFIG_FILES([tests/Python/Makefile])
 
 AC_OUTPUT

tests/JobMarket/Makefile.am

@@ -25 +25 @@
 DISTCLEANFILES = atconfig
 
+if CONDJOBMARKET
 TESTSCRIPTS = \
         $(srcdir)/testsuite-jobmarket.at \
@@ -61 +62 @@
         $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
         mv $@.tmp $@
+endif
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.

tests/Makefile.am

@@ -5 +5 @@
         regression \
         Fragmentations \
-        Tesselations
-
-if CONDPYTHON
-SUBDIRS += Python
-endif
-
-if CONDJOBMARKET
-SUBDIRS += JobMarket
-endif
+        Tesselations \
+        Python \
+        JobMarket

tests/Python/Makefile.am

@@ -26 +26 @@
         $(srcdir)/CommandHelp/testsuite-python-commandhelp.at \
         $(srcdir)/ReturnValueActions/testsuite-python-returnvalueactions.at
-endif
 
 max_jobs = 4
@@ -58 +57 @@
         $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
         mv $@.tmp $@
+endif
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.