Ignore:
Timestamp:
Feb 26, 2010, 2:11:14 PM (15 years ago)
Author:
Tillmann Crueger <crueger@…>
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:
6a661c
Parents:
cbf01e (diff), a28a83 (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.
Message:

Merge branch 'MenuRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/unittests/Makefile.am
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    rcbf01e r2561df  
    3737 
    3838check_PROGRAMS = $(TESTS)
    39 noinst_PROGRAMS = $(TESTS)
     39noinst_PROGRAMS = $(TESTS) TestRunner
    4040
    4141GSLLIBS = ../libgslwrapper.a
    4242ALLLIBS = ../libmolecuilder.a ${GSLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    4343
    44 ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
     44TESTSOURCES = \
     45  ActOnAllUnitTest.cpp \
     46  analysisbondsunittest.cpp \
     47  AnalysisCorrelationToPointUnitTest.cpp \
     48  AnalysisCorrelationToSurfaceUnitTest.cpp  \
     49  AnalysisPairCorrelationUnitTest.cpp \
     50  bondgraphunittest.cpp \
     51  gslmatrixsymmetricunittest.cpp \
     52  gslmatrixunittest.cpp \
     53  gslvectorunittest.cpp \
     54  infounittest.cpp \
     55  linearsystemofequationsunittest.cpp \
     56  listofbondsunittest.cpp \
     57  logunittest.cpp \
     58  memoryallocatorunittest.cpp  \
     59  memoryusageobserverunittest.cpp \
     60  stackclassunittest.cpp \
     61  tesselationunittest.cpp \
     62  tesselation_boundarytriangleunittest.cpp \
     63  tesselation_insideoutsideunittest.cpp \
     64  vectorunittest.cpp \
     65  ObserverTest.cpp \
     66  CacheableTest.cpp \
     67  DescriptorUnittest.cpp \
     68  manipulateAtomsTest.cpp \
     69  atomsCalculationTest.cpp \
     70  ActionSequenceTest.cpp
     71
     72TESTHEADERS = \
     73  analysis_correlation.hpp
     74
     75ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    4576ActOnAllUnitTest_LDADD = ${ALLLIBS}
    4677
    47 AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
     78AnalysisBondsUnitTests_SOURCES = UnitTestMain.cpp analysisbondsunittest.cpp analysisbondsunittest.hpp
    4879AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
    4980
    50 AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
     81AnalysisCorrelationToPointUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
    5182AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
    5283
    53 AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
     84AnalysisCorrelationToSurfaceUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
    5485AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
    5586
    56 AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
     87AnalysisPairCorrelationUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
    5788AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
    5889
    59 BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
     90BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
    6091BondGraphUnitTest_LDADD = ${ALLLIBS}
    6192
    62 GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
     93GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
    6394GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
    6495
    65 GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
     96GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
    6697GSLMatrixUnitTest_LDADD = ${GSLLIBS}
    6798
    68 GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
     99GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
    69100GSLVectorUnitTest_LDADD = ${GSLLIBS}
    70101
    71 InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
     102InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
    72103InfoUnitTest_LDADD = ${ALLLIBS}
    73104
    74 LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
     105LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
    75106LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
    76107
    77 ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
     108ListOfBondsUnitTest_SOURCES = UnitTestMain.cpp listofbondsunittest.cpp listofbondsunittest.hpp
    78109ListOfBondsUnitTest_LDADD = ${ALLLIBS}
    79110
    80 LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp
     111LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
    81112LogUnitTest_LDADD = ${ALLLIBS}
    82113
    83 MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp
     114MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    84115MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
    85116
    86 MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
     117MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    87118MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
    88119
    89 StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
     120StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
    90121StackClassUnitTest_LDADD = ${ALLLIBS}
    91122
    92 TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
     123TesselationUnitTest_SOURCES = UnitTestMain.cpp tesselationunittest.cpp tesselationunittest.hpp
    93124TesselationUnitTest_LDADD = ${ALLLIBS}
    94125
    95 Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
     126Tesselation_BoundaryTriangleUnitTest_SOURCES = UnitTestMain.cpp tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
    96127Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
    97128
    98 Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
     129Tesselation_InOutsideUnitTest_SOURCES = UnitTestMain.cpp tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
    99130Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    100131
    101 VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp
     132VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
    102133VectorUnitTest_LDADD = ${ALLLIBS}
    103134
    104 ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
    105 ActionSequenceTest_LDADD = ${ALLLIBS} ../libmenu.a
     135ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
     136ActionSequenceTest_LDADD = ${ALLLIBS}
    106137
    107 ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp
     138ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
    108139ObserverTest_LDADD = ${ALLLIBS}
    109140
    110 CacheableTest_SOURCES = CacheableTest.cpp CacheableTest.hpp
     141CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
    111142CacheableTest_LDADD = ${ALLLIBS}
    112143
    113 DescriptorUnittest_SOURCES = DescriptorUnittest.cpp DescriptorUnittest.hpp
     144DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
    114145DescriptorUnittest_LDADD = ${ALLLIBS}
    115146
    116 manipulateAtomsTest_SOURCES = manipulateAtomsTest.cpp manipulateAtomsTest.hpp
     147manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
    117148manipulateAtomsTest_LDADD = ${ALLLIBS}
    118149
    119 atomsCalculationTest_SOURCES = atomsCalculationTest.cpp atomsCalculationTest.hpp
     150atomsCalculationTest_SOURCES = UnitTestMain.cpp atomsCalculationTest.cpp atomsCalculationTest.hpp
    120151atomsCalculationTest_LDADD = ${ALLLIBS}
     152
     153TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
     154TestRunner_LDADD = ${ALLLIBS}
    121155
    122156#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.