Ignore:
Timestamp:
Feb 25, 2010, 2:17:15 PM (15 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:
c296c2, cee0a17
Parents:
685100
Message:

Tests now work with Eclipse ECUT's TestRunner.

  • new switch in configure.ac: --enable-ecut
  • all tests are compiled as single test as before
  • and a new TestRunner test suite that combines all test into a single executable which can be run as CppUnit program in Eclipse (and then gives JUnit like output).
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    r685100 r9b6b2f  
    3434 
    3535check_PROGRAMS = $(TESTS)
    36 noinst_PROGRAMS = $(TESTS)
     36noinst_PROGRAMS = $(TESTS) TestRunner
    3737
    3838GSLLIBS = ../libgslwrapper.a
    3939ALLLIBS = ../libmolecuilder.a ${GSLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    4040
    41 ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
     41TESTSOURCES = \
     42  ActOnAllUnitTest.cpp \
     43  analysisbondsunittest.cpp \
     44  AnalysisCorrelationToPointUnitTest.cpp \
     45  AnalysisCorrelationToSurfaceUnitTest.cpp  \
     46  AnalysisPairCorrelationUnitTest.cpp \
     47  bondgraphunittest.cpp \
     48  gslmatrixsymmetricunittest.cpp \
     49  gslmatrixunittest.cpp \
     50  gslvectorunittest.cpp \
     51  infounittest.cpp \
     52  linearsystemofequationsunittest.cpp \
     53  listofbondsunittest.cpp \
     54  logunittest.cpp \
     55  memoryallocatorunittest.cpp  \
     56  memoryusageobserverunittest.cpp \
     57  stackclassunittest.cpp \
     58  tesselationunittest.cpp \
     59  tesselation_boundarytriangleunittest.cpp \
     60  tesselation_insideoutsideunittest.cpp \
     61  vectorunittest.cpp \
     62  ActionSequenceTest.cpp \
     63  ObserverTest.cpp \
     64  CacheableTest.cpp \
     65  DescriptorUnittest.cpp
     66
     67TESTHEADERS = \
     68  analysis_correlation.hpp
     69
     70ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    4271ActOnAllUnitTest_LDADD = ${ALLLIBS}
    4372
    44 AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
     73AnalysisBondsUnitTests_SOURCES = UnitTestMain.cpp analysisbondsunittest.cpp analysisbondsunittest.hpp
    4574AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
    4675
    47 AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
     76AnalysisCorrelationToPointUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
    4877AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
    4978
    50 AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
     79AnalysisCorrelationToSurfaceUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
    5180AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
    5281
    53 AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
     82AnalysisPairCorrelationUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
    5483AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
    5584
    56 BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
     85BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
    5786BondGraphUnitTest_LDADD = ${ALLLIBS}
    5887
    59 GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
     88GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
    6089GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
    6190
    62 GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
     91GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
    6392GSLMatrixUnitTest_LDADD = ${GSLLIBS}
    6493
    65 GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
     94GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
    6695GSLVectorUnitTest_LDADD = ${GSLLIBS}
    6796
    68 InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
     97InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
    6998InfoUnitTest_LDADD = ${ALLLIBS}
    7099
    71 LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
     100LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
    72101LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
    73102
    74 ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
     103ListOfBondsUnitTest_SOURCES = UnitTestMain.cpp listofbondsunittest.cpp listofbondsunittest.hpp
    75104ListOfBondsUnitTest_LDADD = ${ALLLIBS}
    76105
    77 LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp
     106LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
    78107LogUnitTest_LDADD = ${ALLLIBS}
    79108
    80 MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp
     109MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    81110MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
    82111
    83 MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
     112MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    84113MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
    85114
    86 StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
     115StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
    87116StackClassUnitTest_LDADD = ${ALLLIBS}
    88117
    89 TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
     118TesselationUnitTest_SOURCES = UnitTestMain.cpp tesselationunittest.cpp tesselationunittest.hpp
    90119TesselationUnitTest_LDADD = ${ALLLIBS}
    91120
    92 Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
     121Tesselation_BoundaryTriangleUnitTest_SOURCES = UnitTestMain.cpp tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
    93122Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
    94123
    95 Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
     124Tesselation_InOutsideUnitTest_SOURCES = UnitTestMain.cpp tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
    96125Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    97126
    98 VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp
     127VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
    99128VectorUnitTest_LDADD = ${ALLLIBS}
    100129
    101 ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
     130ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
    102131ActionSequenceTest_LDADD = ${ALLLIBS}
    103132
    104 ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp
     133ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
    105134ObserverTest_LDADD = ${ALLLIBS}
    106135
    107 CacheableTest_SOURCES = CacheableTest.cpp CacheableTest.hpp
     136CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
    108137CacheableTest_LDADD = ${ALLLIBS}
    109138
    110 DescriptorUnittest_SOURCES = DescriptorUnittest.cpp DescriptorUnittest.hpp
    111 DescriptorUnittest_LDADD = ${ALLLIBS}
     139DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
     140DescriptorUnittest_LDADD = ${ALLLIBS}
     141
     142TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
     143TestRunner_LDADD = ${ALLLIBS}
    112144
    113145#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.