Changeset e9e86f for src/Actions/unittests

Timestamp:

Aug 20, 2014, 12:59:14 PM (10 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:

d93b4b3

Parents:

09806a

git-author:

Frederik Heber <heber@…> (08/17/14 21:31:27)

git-committer:

Frederik Heber <heber@…> (08/20/14 12:59:14)

Message:

FIX: UnitTestMain placed into convenience libUnitTest.

• removed UnitTestMain.cpp from all .._SOURCES (except LinearAlgebra).
• this is due to subdir-objects: we cannot use absolute paths anymore. automake tries to place .deps folder in the respective source path. Wrapping it up in a library removes this.

File:

• src/Actions/unittests/Makefile.am (modified) (4 diffs)

src/Actions/unittests/Makefile.am

@@ -25 +25 @@
 
 ACTIONLIBS = \
+        libUnitTest.la \
         ../libMolecuilderUI.la
 if CONDJOBMARKET
@@ -33 +34 @@
 # note that DummyUI inherits Dialog which depends on boost/file_system ...
 
-ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ActionRegistryUnitTest_SOURCES = \
         ../Actions/unittests/ActionRegistryUnitTest.cpp \
         ../Actions/unittests/ActionRegistryUnitTest.hpp \
@@ -40 +41 @@
         ../Parameters/unittests/stubs/BoxVectorValidatorStub.cpp \
         ../Parameters/unittests/stubs/TimeStepPresentValidatorStub.cpp
-ActionRegistryUnitTest_LDADD = ${ACTIONLIBS}
+ActionRegistryUnitTest_LDADD = ${ACTIONLIBS} \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
-ActionSequenceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ActionSequenceUnitTest_SOURCES = \
         ../Actions/unittests/ActionSequenceUnitTest.cpp \
         ../Actions/unittests/ActionSequenceUnitTest.hpp \
@@ -55 +57 @@
         $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
-AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+AtomsCalculationUnitTest_SOURCES = \
         ../Actions/unittests/AtomsCalculationUnitTest.cpp \
         ../Actions/unittests/AtomsCalculationUnitTest.hpp
 AtomsCalculationUnitTest_LDADD = ${ACTIONLIBS}
 
-ManipulateAtomsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ManipulateAtomsUnitTest_SOURCES = \
         ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
         ../Actions/unittests/ManipulateAtomsUnitTest.hpp \