Changeset 2ed1a0 for src/unittests


Ignore:
Timestamp:
Apr 6, 2011, 4:05:13 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
17eaa5
Parents:
a0ddcf
git-author:
Frederik Heber <heber@…> (04/06/11 15:33:06)
git-committer:
Frederik Heber <heber@…> (04/06/11 16:05:13)
Message:

Replaced SUBDIRS directive in Makefile.am by inclusion of respective Makefile.ams.

  • this has the advantage that compilation is faster and dependencies are resolved automatically.
  • the included folder concern the unittests.
  • all paths in now included Makefile.ams had to be changed to be relative to ./src.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    ra0ddcf r2ed1a0  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
     4# NOTE that all paths are relative to ./src (because we get included there!)
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    7 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    9 
    10 check_PROGRAMS = 
    11 noinst_PROGRAMS = TestRunner
    12 
    13 TESTLIBS = \
    14         ../libCodePatterns-debug.la \
    15         $(BOOST_THREAD_LIBS)
     6check_PROGRAMS += 
     7noinst_PROGRAMS += TestRunner
    168
    179TESTSOURCES = \
    18   $(top_srcdir)/src/Helpers/unittests/AssertUnitTest.cpp \
    19   $(top_srcdir)/src/Helpers/unittests/ChronosUnitTest.cpp \
    20   $(top_srcdir)/src/Helpers/unittests/InfoUnitTest.cpp \
    21   $(top_srcdir)/src/Helpers/unittests/LogUnitTest.cpp \
    22   $(top_srcdir)/src/Helpers/unittests/RangeUnitTest.cpp \
    23   $(top_srcdir)/src/Patterns/unittests/CacheableUnitTest.cpp \
    24   $(top_srcdir)/src/Patterns/unittests/CloneUnitTest.cpp \
    25   $(top_srcdir)/src/Patterns/unittests/CreatorUnitTest.cpp \
    26   $(top_srcdir)/src/Patterns/unittests/FactoryUnitTest.cpp \
    27   $(top_srcdir)/src/Patterns/unittests/ManipulableCloneUnitTest.cpp \
    28   $(top_srcdir)/src/Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
    29   $(top_srcdir)/src/Patterns/unittests/ObserverUnitTest.cpp \
    30   $(top_srcdir)/src/Patterns/unittests/PrototypeFactoryUnitTest.cpp \
    31   $(top_srcdir)/src/Patterns/unittests/RegistryUnitTest.cpp \
    32   $(top_srcdir)/src/Patterns/unittests/SingletonUnitTest.cpp \
    33   $(top_srcdir)/src/Patterns/unittests/stubs/CloneStub.cpp \
    34   $(top_srcdir)/src/Patterns/unittests/stubs/CommonStub.cpp \
    35   $(top_srcdir)/src/Patterns/unittests/stubs/CommonNamedStub.cpp \
    36   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.cpp \
    37   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulableCloneStub.cpp \
    38   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
    39   $(top_srcdir)/src/Patterns/unittests/stubs/ObserverStub.cpp \
    40   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
    41   $(top_srcdir)/src/Patterns/unittests/stubs/RegistryStub.cpp
     10  Helpers/unittests/AssertUnitTest.cpp \
     11  Helpers/unittests/ChronosUnitTest.cpp \
     12  Helpers/unittests/InfoUnitTest.cpp \
     13  Helpers/unittests/LogUnitTest.cpp \
     14  Helpers/unittests/RangeUnitTest.cpp \
     15  Patterns/unittests/CacheableUnitTest.cpp \
     16  Patterns/unittests/CloneUnitTest.cpp \
     17  Patterns/unittests/CreatorUnitTest.cpp \
     18  Patterns/unittests/FactoryUnitTest.cpp \
     19  Patterns/unittests/ManipulableCloneUnitTest.cpp \
     20  Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
     21  Patterns/unittests/ObserverUnitTest.cpp \
     22  Patterns/unittests/PrototypeFactoryUnitTest.cpp \
     23  Patterns/unittests/RegistryUnitTest.cpp \
     24  Patterns/unittests/SingletonUnitTest.cpp \
     25  Patterns/unittests/stubs/CloneStub.cpp \
     26  Patterns/unittests/stubs/CommonStub.cpp \
     27  Patterns/unittests/stubs/CommonNamedStub.cpp \
     28  Patterns/unittests/stubs/FactoryStub.cpp \
     29  Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     30  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
     31  Patterns/unittests/stubs/ObserverStub.cpp \
     32  Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
     33  Patterns/unittests/stubs/RegistryStub.cpp
    4234
    4335TESTHEADERS = \
    44   $(top_srcdir)/src/Helpers/unittests/AssertUnitTest.hpp \
    45   $(top_srcdir)/src/Helpers/unittests/ChronosUnitTest.hpp \
    46   $(top_srcdir)/src/Helpers/unittests/InfoUnitTest.hpp \
    47   $(top_srcdir)/src/Helpers/unittests/LogUnitTest.hpp \
    48   $(top_srcdir)/src/Helpers/unittests/RangeUnitTest.hpp \
    49   $(top_srcdir)/src/Patterns/unittests/CacheableUnitTest.hpp \
    50   $(top_srcdir)/src/Patterns/unittests/CloneUnitTest.hpp \
    51   $(top_srcdir)/src/Patterns/unittests/CreatorUnitTest.hpp \
    52   $(top_srcdir)/src/Patterns/unittests/FactoryUnitTest.hpp \
    53   $(top_srcdir)/src/Patterns/unittests/ManipulableCloneUnitTest.hpp \
    54   $(top_srcdir)/src/Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
    55   $(top_srcdir)/src/Patterns/unittests/ObserverUnitTest.hpp \
    56   $(top_srcdir)/src/Patterns/unittests/PrototypeFactoryUnitTest.hpp \
    57   $(top_srcdir)/src/Patterns/unittests/RegistryUnitTest.hpp \
    58   $(top_srcdir)/src/Patterns/unittests/SingletonUnitTest.hpp \
    59   $(top_srcdir)/src/Patterns/unittests/stubs/CloneStub.hpp \
    60   $(top_srcdir)/src/Patterns/unittests/stubs/CommonStub.hpp \
    61   $(top_srcdir)/src/Patterns/unittests/stubs/CommonNamedStub.hpp \
    62   $(top_srcdir)/src/Patterns/unittests/stubs/CommonParametersStub.hpp \
    63   $(top_srcdir)/src/Patterns/unittests/stubs/CreatorStub.hpp \
    64   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.hpp \
    65   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulableCloneStub.hpp \
    66   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
    67   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
    68   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.def \
    69   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.undef \
    70   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
    71   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
    72   $(top_srcdir)/src/Patterns/unittests/stubs/ObserverStub.hpp \
    73   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.def \
    74   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.undef \
    75   $(top_srcdir)/src/Patterns/unittests/stubs/RegistryStub.hpp
     36  Helpers/unittests/AssertUnitTest.hpp \
     37  Helpers/unittests/ChronosUnitTest.hpp \
     38  Helpers/unittests/InfoUnitTest.hpp \
     39  Helpers/unittests/LogUnitTest.hpp \
     40  Helpers/unittests/RangeUnitTest.hpp \
     41  Patterns/unittests/CacheableUnitTest.hpp \
     42  Patterns/unittests/CloneUnitTest.hpp \
     43  Patterns/unittests/CreatorUnitTest.hpp \
     44  Patterns/unittests/FactoryUnitTest.hpp \
     45  Patterns/unittests/ManipulableCloneUnitTest.hpp \
     46  Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
     47  Patterns/unittests/ObserverUnitTest.hpp \
     48  Patterns/unittests/PrototypeFactoryUnitTest.hpp \
     49  Patterns/unittests/RegistryUnitTest.hpp \
     50  Patterns/unittests/SingletonUnitTest.hpp \
     51  Patterns/unittests/stubs/CloneStub.hpp \
     52  Patterns/unittests/stubs/CommonStub.hpp \
     53  Patterns/unittests/stubs/CommonNamedStub.hpp \
     54  Patterns/unittests/stubs/CommonParametersStub.hpp \
     55  Patterns/unittests/stubs/CreatorStub.hpp \
     56  Patterns/unittests/stubs/FactoryStub.hpp \
     57  Patterns/unittests/stubs/ManipulableCloneStub.hpp \
     58  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
     59  Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
     60  Patterns/unittests/stubs/FactoryStub.def \
     61  Patterns/unittests/stubs/FactoryStub.undef \
     62  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
     63  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
     64  Patterns/unittests/stubs/ObserverStub.hpp \
     65  Patterns/unittests/stubs/PrototypeFactoryStub.def \
     66  Patterns/unittests/stubs/PrototypeFactoryStub.undef \
     67  Patterns/unittests/stubs/RegistryStub.hpp
    7668       
    77 TestRunner_SOURCES = TestRunnerMain.cpp \
     69TestRunner_SOURCES = \
     70        unittests/TestRunnerMain.cpp \
    7871        $(TESTSOURCES) \
    7972        $(TESTHEADERS)
    8073nodist_TestRunner_SOURCES = \
    81         $(top_srcdir)/src/Patterns/Cachable.hpp \
    82         $(top_srcdir)/src/Patterns/Clone.hpp \
    83         $(top_srcdir)/src/Patterns/Creator.hpp \
    84         $(top_srcdir)/src/Patterns/Factory_impl.hpp \
    85         $(top_srcdir)/src/Patterns/Factory.hpp \
    86         $(top_srcdir)/src/Patterns/FactoryTypeList.hpp \
    87         $(top_srcdir)/src/Patterns/ManipulableClone.hpp \
    88         $(top_srcdir)/src/Patterns/ManipulablePrototypeFactory_impl.hpp \
    89         $(top_srcdir)/src/Patterns/ManipulablePrototypeFactory.hpp \
    90         $(top_srcdir)/src/Patterns/ObservedContainer_impl.hpp \
    91         $(top_srcdir)/src/Patterns/ObservedContainer.hpp \
    92         $(top_srcdir)/src/Patterns/Observer.hpp \
    93         $(top_srcdir)/src/Patterns/ObserverIterator.hpp \
    94         $(top_srcdir)/src/Patterns/PrototypeFactory_impl.hpp \
    95         $(top_srcdir)/src/Patterns/PrototypeFactory.hpp \
    96         $(top_srcdir)/src/Patterns/Registry_impl.hpp \
    97         $(top_srcdir)/src/Patterns/Registry.hpp \
    98         $(top_srcdir)/src/Patterns/Singleton_impl.hpp \
    99         $(top_srcdir)/src/Patterns/Singleton.hpp
    100 TestRunner_LDADD = ${TESTLIBS}
     74        Patterns/Cachable.hpp \
     75        Patterns/Clone.hpp \
     76        Patterns/Creator.hpp \
     77        Patterns/Factory_impl.hpp \
     78        Patterns/Factory.hpp \
     79        Patterns/FactoryTypeList.hpp \
     80        Patterns/ManipulableClone.hpp \
     81        Patterns/ManipulablePrototypeFactory_impl.hpp \
     82        Patterns/ManipulablePrototypeFactory.hpp \
     83        Patterns/ObservedContainer_impl.hpp \
     84        Patterns/ObservedContainer.hpp \
     85        Patterns/Observer.hpp \
     86        Patterns/ObserverIterator.hpp \
     87        Patterns/PrototypeFactory_impl.hpp \
     88        Patterns/PrototypeFactory.hpp \
     89        Patterns/Registry_impl.hpp \
     90        Patterns/Registry.hpp \
     91        Patterns/Singleton_impl.hpp \
     92        Patterns/Singleton.hpp
     93TestRunner_LDADD = \
     94        libCodePatterns-debug.la \
     95        $(BOOST_THREAD_LIBS)
    10196
    10297#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.