Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/unittests/Makefile.am

    r63c1f6 r9fe36b  
    44AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    55
    6 MENUTESTS = ActionSequenceTest
     6MENUTESTS = ActionSequenceTest 
    77
    8 TESTS = \
    9   ActOnAllUnitTest \
    10   AnalysisBondsUnitTests \
    11   AnalysisCorrelationToPointUnitTest \
    12   AnalysisCorrelationToSurfaceUnitTest \
    13   AnalysisPairCorrelationUnitTest \
    14   BondGraphUnitTest \
    15   GSLMatrixSymmetricUnitTest \
    16   GSLMatrixUnitTest \
    17   GSLVectorUnitTest \
    18   InfoUnitTest \
    19   LinearSystemOfEquationsUnitTest \
    20   ListOfBondsUnitTest \
    21   LogUnitTest \
    22   MemoryUsageObserverUnitTest \
    23   MemoryAllocatorUnitTest \
    24   StackClassUnitTest \
    25   TesselationUnitTest \
    26   Tesselation_BoundaryTriangleUnitTest \
    27   Tesselation_InOutsideUnitTest \
    28   VectorUnitTest \
    29   ObserverTest \
    30   ${MENUTESTS} 
    31    
    32  
     8TESTS = ActOnAllUnitTest AnalysisBondsUnitTests AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest BondGraphUnitTest ListOfBondsUnitTest LogUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest StackClassUnitTest VectorUnitTest ObserverTest $(MENUTESTS)
    339check_PROGRAMS = $(TESTS)
    3410noinst_PROGRAMS = $(TESTS)
    3511
    3612ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    37 ActOnAllUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     13ActOnAllUnitTest_LDADD = ../libmolecuilder.a
    3814
    3915AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
    40 AnalysisBondsUnitTests_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     16AnalysisBondsUnitTests_LDADD = ../libmolecuilder.a
    4117
    4218AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
    43 AnalysisCorrelationToPointUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     19AnalysisCorrelationToPointUnitTest_LDADD = ../libmolecuilder.a
    4420
    4521AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
    46 AnalysisCorrelationToSurfaceUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     22AnalysisCorrelationToSurfaceUnitTest_LDADD = ../libmolecuilder.a
    4723
    4824AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
    49 AnalysisPairCorrelationUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     25AnalysisPairCorrelationUnitTest_LDADD = ../libmolecuilder.a
    5026
    5127BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
    52 BondGraphUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
    53 
    54 GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
    55 GSLMatrixSymmetricUnitTest_LDADD = ../libgslwrapper.a
    56 
    57 GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
    58 GSLMatrixUnitTest_LDADD = ../libgslwrapper.a
    59 
    60 GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
    61 GSLVectorUnitTest_LDADD = ../libgslwrapper.a
    62 
    63 InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
    64 InfoUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
    65 
    66 LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
    67 LinearSystemOfEquationsUnitTest_LDADD = ../libgslwrapper.a ../libmolecuilder.a
     28BondGraphUnitTest_LDADD = ../libmolecuilder.a
    6829
    6930ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
    70 ListOfBondsUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     31ListOfBondsUnitTest_LDADD = ../libmolecuilder.a
    7132
    7233LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp
    73 LogUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     34LogUnitTest_LDADD = ../libmolecuilder.a
    7435
    7536MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    76 MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     37MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a
    7738
    7839MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    79 MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     40MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a
    8041
    8142StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
    82 StackClassUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
    83 
    84 TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
    85 TesselationUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
    86 
    87 Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
    88 Tesselation_BoundaryTriangleUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
    89 
    90 Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
    91 Tesselation_InOutsideUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     43StackClassUnitTest_LDADD = ../libmolecuilder.a
    9244
    9345VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp
    94 VectorUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
     46VectorUnitTest_LDADD = ../libmolecuilder.a
    9547
    9648ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
    97 ActionSequenceTest_LDADD = ../libmolecuilder.a
     49ActionSequenceTest_LDADD = ../libmolecuilder.a ../libmenu.a
    9850
    9951ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp
Note: See TracChangeset for help on using the changeset viewer.