source: src/unittests/Makefile.am@ 8cbb97

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 Candidate_v1.7.0 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
Last change on this file since 8cbb97 was 5f612ee, checked in by Frederik Heber <heber@…>, 16 years ago

Merge branch 'Analysis_PairCorrelation' into StructureRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in

Conflicts have been many and too numerous to listen here, just the few general cases

  • new molecule() replaced by World::getInstance().createMolecule()
  • new atom() replaced by World::getInstance().createAtom() where appropriate.
  • Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
  • DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
  • ...

Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.

This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.

Signed-off-by: Frederik Heber <heber@…>
  • Property mode set to 100644
File size: 7.3 KB
RevLine 
[b9907c]1INCLUDES = -I$(top_srcdir)/src
2
[831a14]3AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
4AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
[be90f1]5
[5f612ee]6MENUTESTS = \
7 ActionSequenceTest
[147339]8
[9fb860]9TESTS = \
10 ActOnAllUnitTest \
11 AnalysisBondsUnitTests \
12 AnalysisCorrelationToPointUnitTest \
13 AnalysisCorrelationToSurfaceUnitTest \
14 AnalysisPairCorrelationUnitTest \
[57adc7]15 atomsCalculationTest \
16 AtomDescriptorTest \
[9fb860]17 BondGraphUnitTest \
[57adc7]18 CacheableTest \
[dfe8ef]19 CountBondsUnitTest \
[fc3b67]20 GSLMatrixSymmetricUnitTest \
21 GSLMatrixUnitTest \
[9fb860]22 GSLVectorUnitTest \
23 InfoUnitTest \
[f60610]24 LinearSystemOfEquationsUnitTest \
[dcea0f]25 LinkedCellUnitTest \
[9fb860]26 ListOfBondsUnitTest \
27 LogUnitTest \
[57adc7]28 manipulateAtomsTest \
[9fb860]29 MemoryUsageObserverUnitTest \
30 MemoryAllocatorUnitTest \
[57adc7]31 MoleculeDescriptorTest \
32 ObserverTest \
[7ca806]33 SingletonTest \
[9fb860]34 StackClassUnitTest \
35 TesselationUnitTest \
[e9c677]36 Tesselation_BoundaryTriangleUnitTest \
37 Tesselation_InOutsideUnitTest \
[63c1f6]38 VectorUnitTest \
[46d958]39 ${MENUTESTS}
40
[9fb860]41
[63c1f6]42check_PROGRAMS = $(TESTS)
[9b6b2f]43noinst_PROGRAMS = $(TESTS) TestRunner
[b9907c]44
[4d9c01]45GSLLIBS = ../libgslwrapper.a
46ALLLIBS = ../libmolecuilder.a ${GSLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
47
[9b6b2f]48TESTSOURCES = \
49 ActOnAllUnitTest.cpp \
[57adc7]50 ActionSequenceTest.cpp \
[9b6b2f]51 analysisbondsunittest.cpp \
52 AnalysisCorrelationToPointUnitTest.cpp \
53 AnalysisCorrelationToSurfaceUnitTest.cpp \
54 AnalysisPairCorrelationUnitTest.cpp \
[57adc7]55 AtomDescriptorTest.cpp \
56 atomsCalculationTest.cpp \
[9b6b2f]57 bondgraphunittest.cpp \
[57adc7]58 CacheableTest.cpp \
[5f612ee]59 CountBondsUnitTest.cpp \
[9b6b2f]60 gslmatrixsymmetricunittest.cpp \
61 gslmatrixunittest.cpp \
62 gslvectorunittest.cpp \
63 infounittest.cpp \
64 linearsystemofequationsunittest.cpp \
[5f612ee]65 LinkedCellUnitTest.cpp \
[9b6b2f]66 listofbondsunittest.cpp \
67 logunittest.cpp \
[57adc7]68 manipulateAtomsTest.cpp \
[9b6b2f]69 memoryallocatorunittest.cpp \
70 memoryusageobserverunittest.cpp \
[57adc7]71 MoleculeDescriptorTest.cpp \
72 ObserverTest.cpp \
[7ca806]73 SingletonTest.cpp \
[9b6b2f]74 stackclassunittest.cpp \
75 tesselationunittest.cpp \
76 tesselation_boundarytriangleunittest.cpp \
77 tesselation_insideoutsideunittest.cpp \
[57adc7]78 vectorunittest.cpp
[9b6b2f]79
80TESTHEADERS = \
[5f612ee]81 ActOnAllUnitTest.hpp \
82 ActionSequenceTest.hpp \
83 analysisbondsunittest.hpp \
84 AnalysisCorrelationToPointUnitTest.hpp \
85 AnalysisCorrelationToSurfaceUnitTest.hpp \
86 AnalysisPairCorrelationUnitTest.hpp \
87 AtomDescriptorTest.hpp \
88 atomsCalculationTest.hpp \
89 bondgraphunittest.hpp \
90 CacheableTest.hpp \
91 CountBondsUnitTest.hpp \
92 gslmatrixsymmetricunittest.hpp \
93 gslmatrixunittest.hpp \
94 gslvectorunittest.hpp \
95 infounittest.hpp \
96 linearsystemofequationsunittest.hpp \
97 LinkedCellUnitTest.hpp \
98 listofbondsunittest.hpp \
99 logunittest.hpp \
100 manipulateAtomsTest.hpp \
101 memoryallocatorunittest.hpp \
102 memoryusageobserverunittest.hpp \
103 MoleculeDescriptorTest.hpp \
104 ObserverTest.hpp \
105 SingletonTest.hpp \
106 stackclassunittest.hpp \
107 tesselationunittest.hpp \
108 tesselation_boundarytriangleunittest.hpp \
109 tesselation_insideoutsideunittest.hpp \
110 vectorunittest.hpp
[9fb860]111
[9b6b2f]112
113ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
[4d9c01]114ActOnAllUnitTest_LDADD = ${ALLLIBS}
[c111db]115
[9b6b2f]116AnalysisBondsUnitTests_SOURCES = UnitTestMain.cpp analysisbondsunittest.cpp analysisbondsunittest.hpp
[4d9c01]117AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
[96c961]118
[9b6b2f]119AnalysisCorrelationToPointUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
[4d9c01]120AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
[c4d4df]121
[9b6b2f]122AnalysisCorrelationToSurfaceUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
[4d9c01]123AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
[c4d4df]124
[9b6b2f]125AnalysisPairCorrelationUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
[4d9c01]126AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
[c111db]127
[6e97e5]128atomsCalculationTest_SOURCES = UnitTestMain.cpp atomsCalculationTest.cpp atomsCalculationTest.hpp
129atomsCalculationTest_LDADD = ${ALLLIBS}
130
[9b6b2f]131BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
[4d9c01]132BondGraphUnitTest_LDADD = ${ALLLIBS}
[46ea3b]133
[5f612ee]134CountBondsUnitTest_SOURCES = UnitTestMain.cpp CountBondsUnitTest.cpp CountBondsUnitTest.hpp
135CountBondsUnitTest_LDADD = ${ALLLIBS}
136
[9b6b2f]137GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
[4d9c01]138GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
[9fb860]139
[9b6b2f]140GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
[4d9c01]141GSLMatrixUnitTest_LDADD = ${GSLLIBS}
[9fb860]142
[9b6b2f]143GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
[4d9c01]144GSLVectorUnitTest_LDADD = ${GSLLIBS}
[46ea3b]145
[9b6b2f]146InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
[4d9c01]147InfoUnitTest_LDADD = ${ALLLIBS}
[8725ed]148
[9b6b2f]149LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
[4d9c01]150LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
[8725ed]151
[5f612ee]152LinkedCellUnitTest_SOURCES = UnitTestMain.cpp LinkedCellUnitTest.cpp LinkedCellUnitTest.hpp
153LinkedCellUnitTest_LDADD = ${ALLLIBS}
[46ea3b]154
[9b6b2f]155ListOfBondsUnitTest_SOURCES = UnitTestMain.cpp listofbondsunittest.cpp listofbondsunittest.hpp
[4d9c01]156ListOfBondsUnitTest_LDADD = ${ALLLIBS}
[266237]157
[9b6b2f]158LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
[4d9c01]159LogUnitTest_LDADD = ${ALLLIBS}
[7326b2]160
[9b6b2f]161MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
[4d9c01]162MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
[be90f1]163
[9b6b2f]164MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
[4d9c01]165MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
[831a14]166
[57adc7]167MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
168MoleculeDescriptorTest_LDADD = ${ALLLIBS}
169
[7ca806]170SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
171SingletonTest_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB}
172
[9b6b2f]173StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
[4d9c01]174StackClassUnitTest_LDADD = ${ALLLIBS}
[d96277]175
[9b6b2f]176TesselationUnitTest_SOURCES = UnitTestMain.cpp tesselationunittest.cpp tesselationunittest.hpp
[4d9c01]177TesselationUnitTest_LDADD = ${ALLLIBS}
[c15ca2]178
[9b6b2f]179Tesselation_BoundaryTriangleUnitTest_SOURCES = UnitTestMain.cpp tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
[4d9c01]180Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
[e9c677]181
[9b6b2f]182Tesselation_InOutsideUnitTest_SOURCES = UnitTestMain.cpp tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
[4d9c01]183Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
[d96277]184
[9b6b2f]185VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
[4d9c01]186VectorUnitTest_LDADD = ${ALLLIBS}
[d96277]187
[9b6b2f]188ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
[4d9c01]189ActionSequenceTest_LDADD = ${ALLLIBS}
[d96277]190
[9b6b2f]191ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
[4d9c01]192ObserverTest_LDADD = ${ALLLIBS}
[63c1f6]193
[9b6b2f]194CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
[4d9c01]195CacheableTest_LDADD = ${ALLLIBS}
[e3c8b4]196
[57adc7]197AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
198AtomDescriptorTest_LDADD = ${ALLLIBS}
[7c4e29]199
[a1510d]200manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
[7c4e29]201manipulateAtomsTest_LDADD = ${ALLLIBS}
[7a1ce5]202
[9b6b2f]203TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
204TestRunner_LDADD = ${ALLLIBS}
[7a1ce5]205
[831a14]206#AUTOMAKE_OPTIONS = parallel-tests
[7326b2]207
Note: See TracBrowser for help on using the repository browser.