Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    r706f9b rcbc5fb  
    3030  CacheableTest \
    3131  DescriptorUnittest \
    32   MatrixUnitTest \
    33   ${MENUTESTS} 
    34    
     32  manipulateAtomsTest \
     33  atomsCalculationTest \
     34  ${MENUTESTS}
     35 
     36
     37     
    3538 
    3639check_PROGRAMS = $(TESTS)
    37 noinst_PROGRAMS = $(TESTS) TestRunner
     40noinst_PROGRAMS = $(TESTS)
    3841
    3942GSLLIBS = ../libgslwrapper.a
    4043ALLLIBS = ../libmolecuilder.a ${GSLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    4144
    42 TESTSOURCES = \
    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 
    69 TESTHEADERS = \
    70   analysis_correlation.hpp
    71 
    72 ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
     45ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    7346ActOnAllUnitTest_LDADD = ${ALLLIBS}
    7447
    75 AnalysisBondsUnitTests_SOURCES = UnitTestMain.cpp analysisbondsunittest.cpp analysisbondsunittest.hpp
     48AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
    7649AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
    7750
    78 AnalysisCorrelationToPointUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
     51AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
    7952AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
    8053
    81 AnalysisCorrelationToSurfaceUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
     54AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
    8255AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
    8356
    84 AnalysisPairCorrelationUnitTest_SOURCES = UnitTestMain.cpp analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
     57AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
    8558AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
    8659
    87 BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
     60BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
    8861BondGraphUnitTest_LDADD = ${ALLLIBS}
    8962
    90 GSLMatrixSymmetricUnitTest_SOURCES = UnitTestMain.cpp gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
     63GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
    9164GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
    9265
    93 GSLMatrixUnitTest_SOURCES = UnitTestMain.cpp gslmatrixunittest.cpp gslmatrixunittest.hpp
     66GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
    9467GSLMatrixUnitTest_LDADD = ${GSLLIBS}
    9568
    96 GSLVectorUnitTest_SOURCES = UnitTestMain.cpp gslvectorunittest.cpp gslvectorunittest.hpp
     69GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
    9770GSLVectorUnitTest_LDADD = ${GSLLIBS}
    9871
    99 InfoUnitTest_SOURCES = UnitTestMain.cpp infounittest.cpp infounittest.hpp
     72InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
    10073InfoUnitTest_LDADD = ${ALLLIBS}
    10174
    102 LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
     75LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
    10376LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
    10477
    105 ListOfBondsUnitTest_SOURCES = UnitTestMain.cpp listofbondsunittest.cpp listofbondsunittest.hpp
     78ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
    10679ListOfBondsUnitTest_LDADD = ${ALLLIBS}
    10780
    108 LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
     81LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp
    10982LogUnitTest_LDADD = ${ALLLIBS}
    11083
    111 MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
     84MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    11285MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
    11386
    114 MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
     87MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    11588MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
    11689
    117 StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
     90StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
    11891StackClassUnitTest_LDADD = ${ALLLIBS}
    11992
    120 TesselationUnitTest_SOURCES = UnitTestMain.cpp tesselationunittest.cpp tesselationunittest.hpp
     93TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
    12194TesselationUnitTest_LDADD = ${ALLLIBS}
    12295
    123 Tesselation_BoundaryTriangleUnitTest_SOURCES = UnitTestMain.cpp tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
     96Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
    12497Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
    12598
    126 Tesselation_InOutsideUnitTest_SOURCES = UnitTestMain.cpp tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
     99Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
    127100Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    128101
    129 VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
     102VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp
    130103VectorUnitTest_LDADD = ${ALLLIBS}
    131104
    132 ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
     105ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
    133106ActionSequenceTest_LDADD = ${ALLLIBS}
    134107
    135 ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
     108ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp
    136109ObserverTest_LDADD = ${ALLLIBS}
    137110
    138 CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
     111CacheableTest_SOURCES = CacheableTest.cpp CacheableTest.hpp
    139112CacheableTest_LDADD = ${ALLLIBS}
    140113
    141 DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
     114DescriptorUnittest_SOURCES = DescriptorUnittest.cpp DescriptorUnittest.hpp
    142115DescriptorUnittest_LDADD = ${ALLLIBS}
    143116
    144 MatrixUnitTest_SOURCES = UnitTestMain.cpp MatrixUnitTest.cpp MatrixUnitTest.hpp
    145 MatrixUnitTest_LDADD = ${ALLLIBS}
     117manipulateAtomsTest_SOURCES = manipulateAtomsTest.cpp manipulateAtomsTest.hpp
     118manipulateAtomsTest_LDADD = ${ALLLIBS}
    146119
    147 TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
    148 TestRunner_LDADD = ${ALLLIBS}
     120atomsCalculationTest_SOURCES = atomsCalculationTest.cpp atomsCalculationTest.hpp
     121atomsCalculationTest_LDADD = ${ALLLIBS}
    149122
    150123#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.