Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    rcbc5fb r706f9b  
    3030  CacheableTest \
    3131  DescriptorUnittest \
    32   manipulateAtomsTest \
    33   atomsCalculationTest \
    34   ${MENUTESTS}
    35  
    36 
    37      
     32  MatrixUnitTest \
     33  ${MENUTESTS} 
     34   
    3835 
    3936check_PROGRAMS = $(TESTS)
    40 noinst_PROGRAMS = $(TESTS)
     37noinst_PROGRAMS = $(TESTS) TestRunner
    4138
    4239GSLLIBS = ../libgslwrapper.a
    4340ALLLIBS = ../libmolecuilder.a ${GSLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    4441
    45 ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
     42TESTSOURCES = \
     43  ActOnAllUnitTest.cpp \
     44  analysisbondsunittest.cpp \
     45  AnalysisCorrelationToPointUnitTest.cpp \
     46  AnalysisCorrelationToSurfaceUnitTest.cpp  \
     47  AnalysisPairCorrelationUnitTest.cpp \
     48  bondgraphunittest.cpp \
     49  gslmatrixsymmetricunittest.cpp \
     50  gslmatrixunittest.cpp \
     51  gslvectorunittest.cpp \
     52  infounittest.cpp \
     53  linearsystemofequationsunittest.cpp \
     54  listofbondsunittest.cpp \
     55  logunittest.cpp \
     56  memoryallocatorunittest.cpp  \
     57  memoryusageobserverunittest.cpp \
     58  stackclassunittest.cpp \
     59  tesselationunittest.cpp \
     60  tesselation_boundarytriangleunittest.cpp \
     61  tesselation_insideoutsideunittest.cpp \
     62  vectorunittest.cpp \
     63  ActionSequenceTest.cpp \
     64  ObserverTest.cpp \
     65  CacheableTest.cpp \
     66  DescriptorUnittest.cpp \
     67  MatrixUnitTest.cpp   
     68
     69TESTHEADERS = \
     70  analysis_correlation.hpp
     71
     72ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    4673ActOnAllUnitTest_LDADD = ${ALLLIBS}
    4774
    48 AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
     75AnalysisBondsUnitTests_SOURCES = UnitTestMain.cpp analysisbondsunittest.cpp analysisbondsunittest.hpp
    4976AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
    5077
    51 AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
     78AnalysisCorrelationToPointUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
    5279AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
    5380
    54 AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
     81AnalysisCorrelationToSurfaceUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
    5582AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
    5683
    57 AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
     84AnalysisPairCorrelationUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
    5885AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
    5986
    60 BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
     87BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
    6188BondGraphUnitTest_LDADD = ${ALLLIBS}
    6289
    63 GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
     90GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
    6491GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
    6592
    66 GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
     93GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
    6794GSLMatrixUnitTest_LDADD = ${GSLLIBS}
    6895
    69 GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
     96GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
    7097GSLVectorUnitTest_LDADD = ${GSLLIBS}
    7198
    72 InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
     99InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
    73100InfoUnitTest_LDADD = ${ALLLIBS}
    74101
    75 LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
     102LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
    76103LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
    77104
    78 ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
     105ListOfBondsUnitTest_SOURCES = UnitTestMain.cpp listofbondsunittest.cpp listofbondsunittest.hpp
    79106ListOfBondsUnitTest_LDADD = ${ALLLIBS}
    80107
    81 LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp
     108LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
    82109LogUnitTest_LDADD = ${ALLLIBS}
    83110
    84 MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp
     111MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    85112MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
    86113
    87 MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
     114MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    88115MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
    89116
    90 StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
     117StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
    91118StackClassUnitTest_LDADD = ${ALLLIBS}
    92119
    93 TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
     120TesselationUnitTest_SOURCES = UnitTestMain.cpp tesselationunittest.cpp tesselationunittest.hpp
    94121TesselationUnitTest_LDADD = ${ALLLIBS}
    95122
    96 Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
     123Tesselation_BoundaryTriangleUnitTest_SOURCES = UnitTestMain.cpp tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
    97124Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
    98125
    99 Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
     126Tesselation_InOutsideUnitTest_SOURCES = UnitTestMain.cpp tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
    100127Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    101128
    102 VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp
     129VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
    103130VectorUnitTest_LDADD = ${ALLLIBS}
    104131
    105 ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
     132ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
    106133ActionSequenceTest_LDADD = ${ALLLIBS}
    107134
    108 ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp
     135ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
    109136ObserverTest_LDADD = ${ALLLIBS}
    110137
    111 CacheableTest_SOURCES = CacheableTest.cpp CacheableTest.hpp
     138CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
    112139CacheableTest_LDADD = ${ALLLIBS}
    113140
    114 DescriptorUnittest_SOURCES = DescriptorUnittest.cpp DescriptorUnittest.hpp
     141DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
    115142DescriptorUnittest_LDADD = ${ALLLIBS}
    116143
    117 manipulateAtomsTest_SOURCES = manipulateAtomsTest.cpp manipulateAtomsTest.hpp
    118 manipulateAtomsTest_LDADD = ${ALLLIBS}
     144MatrixUnitTest_SOURCES = UnitTestMain.cpp MatrixUnitTest.cpp MatrixUnitTest.hpp
     145MatrixUnitTest_LDADD = ${ALLLIBS}
    119146
    120 atomsCalculationTest_SOURCES = atomsCalculationTest.cpp atomsCalculationTest.hpp
    121 atomsCalculationTest_LDADD = ${ALLLIBS}
     147TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
     148TestRunner_LDADD = ${ALLLIBS}
    122149
    123150#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.