Changeset 6c438f for src/unittests/Makefile.am

Timestamp:

Aug 28, 2010, 3:21:11 AM (14 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:

a6e6b5, f8982c

Parents:

2ad482 (diff), fd4905 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (08/28/10 03:17:48)

git-committer:

Frederik Heber <heber@…> (08/28/10 03:21:11)

Message:

Merge branch 'StructureRefactoring' into Shapes

Conflicts:

src/Box.cpp
src/Box.hpp
src/Descriptors/AtomShapeDescriptor.cpp
src/Descriptors/AtomShapeDescriptor.hpp
src/Descriptors/AtomShapeDescriptor_impl.hpp
src/LinearAlgebra/Line.cpp
src/LinearAlgebra/Line.hpp
src/LinearAlgebra/Matrix.cpp
src/LinearAlgebra/Matrix.hpp
src/Makefile.am
src/Shapes/BaseShapes.cpp
src/Shapes/BaseShapes_impl.hpp
src/Shapes/Shape.cpp
src/Shapes/Shape.hpp
src/Shapes/ShapeOps_impl.hpp
src/Shapes/Shape_impl.hpp
src/unittests/ShapeUnittest.cpp

• AtomShapeDescriptor had been implemented doubly.
• LineSegment* moved to LinearAlgebra/
• BaseShapes:: Cuboid is from (0,0,0) and not from (-1,-1,-1) to (1,1,1)
  • had to fix ShapeUnittest
• some overlap in Shapes due to getHomogeneousPointsOnSurface added in stable.
• BUGFIX: Matrix::transpose() did not allocate MatrixContent::content.
• merged BaseShapesUnitTest into ShapeUnitTest.

File:

• src/unittests/Makefile.am (modified) (13 diffs)

src/unittests/Makefile.am

@@ -7 +7 @@
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
 
-MENUTESTS = \
-  ActionSequenceTest
-
 TESTS = \
+  ActionSequenceTest \
   ActOnAllUnitTest \
   AnalysisBondsUnitTests \
@@ -19 +17 @@
   AtomDescriptorTest \
   BondGraphUnitTest \
+  BoxUnittest \
   CacheableTest \
   CountBondsUnitTest \
@@ -44 +43 @@
   Tesselation_BoundaryTriangleUnitTest \
   Tesselation_InOutsideUnitTest \
-  VectorUnitTest \
-  ${MENUTESTS}
+  VectorUnitTest
   
   
@@ -51 +49 @@
 noinst_PROGRAMS = $(TESTS) TestRunner
 
-GSLLIBS = ../libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
-ALLLIBS = ../libmolecuilder.a ${GSLLIBS} 
-PARSERLIBS = ../libparser.a ${ALLLIBS} 
+GSLLIBS = \
+        ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
+        ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
+        ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
+        $(BOOST_LIB) \
+        ${BOOST_THREAD_LIB}
+ALLLIBS = \
+        ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
+        ../Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
+        ${PARSERLIBS} \
+        ../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
+        ${GSLLIBS} \
+        ${BOOST_PROGRAM_OPTIONS_LIB}
+PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
+UILIBS = ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la  
 
 TESTSOURCES = \
@@ -65 +75 @@
   atomsCalculationTest.cpp \
   bondgraphunittest.cpp \
+  BoxUnittest.cpp \
   CacheableTest.cpp \
   CountBondsUnitTest.cpp \
@@ -102 +113 @@
   atomsCalculationTest.hpp \
   bondgraphunittest.hpp \
+  BoxUnittest.hpp \
   CacheableTest.hpp \
   CountBondsUnitTest.hpp \
@@ -118 +130 @@
   MoleculeDescriptorTest.hpp \
   periodentafelTest.hpp \
+  ParserUnitTest.hpp \
   PlaneUnittest.hpp \
   ObserverTest.hpp \
@@ -128 +141 @@
   
 
-ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
-ActionSequenceTest_LDADD = ${ALLLIBS}
+ActionSequenceTest_SOURCES = UnitTestMain.cpp ActionSequenceTest.cpp ActionSequenceTest.hpp
+ActionSequenceTest_LDADD = ${UILIBS} ${ALLLIBS}
 
 ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
@@ -155 +168 @@
 BondGraphUnitTest_LDADD = ${ALLLIBS}
 
+BoxUnittest_SOURCES = UnitTestMain.cpp BoxUnittest.cpp BoxUnittest.hpp
+BoxUnittest_LDADD = ${ALLLIBS}
+
 CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
 CacheableTest_LDADD = ${ALLLIBS}
@@ -165 +181 @@
 
 GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
-GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
+GSLMatrixSymmetricUnitTest_LDADD = ${ALLLIBS}
 
 GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
-GSLMatrixUnitTest_LDADD = ${GSLLIBS}
+GSLMatrixUnitTest_LDADD = ${ALLLIBS}
 
 GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
-GSLVectorUnitTest_LDADD = ${GSLLIBS}
+GSLVectorUnitTest_LDADD = ${ALLLIBS}
 
 InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
@@ -192 +208 @@
 
 manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
-manipulateAtomsTest_LDADD = ${ALLLIBS}
+manipulateAtomsTest_LDADD = ${UILIBS} ${ALLLIBS}
 
 MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
@@ -204 +220 @@
 
 ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
-ParserUnitTest_LDADD = ${PARSERLIBS}
+ParserUnitTest_LDADD = ${ALLLIBS} 
 
 periodentafelTest_SOURCES = UnitTestMain.cpp periodentafelTest.cpp periodentafelTest.hpp
@@ -231 +247 @@
 
 TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
-TestRunner_LDADD = ${ALLLIBS}
+TestRunner_LDADD = ${UILIBS} ${ALLLIBS}
 
 VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp