Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    rc39cc4 r0eb2dc  
     1# PLEASE adhere to the alphabetical ordering in this Makefile!
     2# Also indentation by a single tab
     3
    14INCLUDES = -I$(top_srcdir)/src
    25
    … …  
    2831  LogUnitTest \
    2932  manipulateAtomsTest \
    30   MemoryUsageObserverUnitTest \
    31   MemoryAllocatorUnitTest \
     33  MatrixUnittest \
    3234  MoleculeDescriptorTest \
     35  ObserverTest \
     36  ParserUnitTest \
     37  periodentafelTest \
    3338  PlaneUnittest \
    34   ObserverTest \
     39  ShapeUnittest \
    3540  SingletonTest \
    3641  StackClassUnitTest \
    … …  
    4752GSLLIBS = ../libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
    4853ALLLIBS = ../libmolecuilder.a ${GSLLIBS}
     54PARSERLIBS = ../libparser.a ${ALLLIBS}
    4955
    5056TESTSOURCES = \
    … …  
    6975  listofbondsunittest.cpp \
    7076  logunittest.cpp \
     77  MatrixUnittest.cpp \
    7178  manipulateAtomsTest.cpp \
    72   memoryallocatorunittest.cpp  \
    73   memoryusageobserverunittest.cpp \
    7479  MoleculeDescriptorTest.cpp \
     80  ObserverTest.cpp \
     81  ParserUnitTest.cpp \
     82  periodentafelTest.cpp \
    7583  PlaneUnittest.cpp \
    76   ObserverTest.cpp \
     84  ShapeUnittest.cpp \
    7785  SingletonTest.cpp \
    7886  stackclassunittest.cpp \
    … …  
    104112  logunittest.hpp \
    105113  manipulateAtomsTest.hpp \
    106   memoryallocatorunittest.hpp  \
    107   memoryusageobserverunittest.hpp \
     114  MatrixUnittest.hpp \
    108115  MoleculeDescriptorTest.hpp \
     116  periodentafelTest.hpp \
    109117  PlaneUnittest.hpp \
    110118  ObserverTest.hpp \
    … …  
    117125 
    118126
     127ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
     128ActionSequenceTest_LDADD = ${ALLLIBS}
     129
    119130ActOnAllUnitTest_SOURCES = UnitTestMain.cpp ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
    120131ActOnAllUnitTest_LDADD = ${ALLLIBS}
    … …  
    135146atomsCalculationTest_LDADD = ${ALLLIBS}
    136147
     148AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
     149AtomDescriptorTest_LDADD = ${ALLLIBS}
     150
    137151BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
    138152BondGraphUnitTest_LDADD = ${ALLLIBS}
    139153
     154CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
     155CacheableTest_LDADD = ${ALLLIBS}
     156
    140157CountBondsUnitTest_SOURCES = UnitTestMain.cpp CountBondsUnitTest.cpp CountBondsUnitTest.hpp
    141158CountBondsUnitTest_LDADD = ${ALLLIBS}
    … …  
    168185LogUnitTest_LDADD = ${ALLLIBS}
    169186
    170 MemoryAllocatorUnitTest_SOURCES = UnitTestMain.cpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp
    171 MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
    172 
    173 MemoryUsageObserverUnitTest_SOURCES = UnitTestMain.cpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp
    174 MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
     187manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
     188manipulateAtomsTest_LDADD = ${ALLLIBS}
     189
     190MatrixUnittest_SOURCES = UnitTestMain.cpp MatrixUnittest.cpp MatrixUnittest.hpp
     191MatrixUnittest_LDADD = ${ALLLIBS}
    175192
    176193MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
    177194MoleculeDescriptorTest_LDADD = ${ALLLIBS}
    178195
     196ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
     197ObserverTest_LDADD = ${ALLLIBS}
     198
     199ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
     200ParserUnitTest_LDADD = ${PARSERLIBS}
     201
     202periodentafelTest_SOURCES = UnitTestMain.cpp periodentafelTest.cpp periodentafelTest.hpp
     203periodentafelTest_LDADD = ${ALLLIBS}
     204
    179205PlaneUnittest_SOURCES = UnitTestMain.cpp PlaneUnittest.cpp PlaneUnittest.hpp
    180206PlaneUnittest_LDADD = ${ALLLIBS}
    181207
     208ShapeUnittest_SOURCES = UnitTestMain.cpp ShapeUnittest.cpp ShapeUnittest.hpp
     209ShapeUnittest_LDADD = ${ALLLIBS}
     210
    182211SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
    183 SingletonTest_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB}
     212SingletonTest_LDADD = ${ALLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
    184213
    185214StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
    … …  
    195224Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
    196225
     226TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
     227TestRunner_LDADD = ${ALLLIBS}
     228
    197229VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp
    198230VectorUnitTest_LDADD = ${ALLLIBS}
    199231
    200 ActionSequenceTest_SOURCES = UnitTestMain.cpp ../../../TestRunnerClient.hpp ActionSequenceTest.cpp ActionSequenceTest.hpp
    201 ActionSequenceTest_LDADD = ${ALLLIBS}
    202 
    203 ObserverTest_SOURCES = UnitTestMain.cpp ObserverTest.cpp ObserverTest.hpp
    204 ObserverTest_LDADD = ${ALLLIBS}
    205 
    206 CacheableTest_SOURCES = UnitTestMain.cpp CacheableTest.cpp CacheableTest.hpp
    207 CacheableTest_LDADD = ${ALLLIBS}
    208 
    209 AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
    210 AtomDescriptorTest_LDADD = ${ALLLIBS}
    211 
    212 manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
    213 manipulateAtomsTest_LDADD = ${ALLLIBS}
    214 
    215 TestRunner_SOURCES = UnitTestMain.cpp $(TESTSOURCES) $(TESTHEADERS)
    216 TestRunner_LDADD = ${ALLLIBS}
    217 
    218232#AUTOMAKE_OPTIONS = parallel-tests
    219 
Note: See TracChangeset for help on using the changeset viewer.