Changeset 3324cf for src/unittests

Timestamp:

Dec 13, 2011, 1:06:33 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

9b8fa4

Parents:

b760ac5

git-author:

Frederik Heber <heber@…> (12/05/11 23:45:18)

git-committer:

Frederik Heber <heber@…> (12/13/11 13:06:33)

Message:

Added convenience libraries for Patterns and Helpers.

• this way we may place Observer stuff (own convenience lib) into own subfolder.
• unit tests depend only on these two libs now.

File:

• src/unittests/Makefile.am (modified) (1 diff)

src/unittests/Makefile.am

@@ -4 +4 @@
 # NOTE that all paths are relative to ./src (because we get included there!)
 
+check_PROGRAMS =
+noinst_PROGRAMS =
+TESTS =
+TESTSOURCES =
+TESTHEADERS =
+
+INCLUDES = -I$(top_srcdir)/src/Helpers -I$(top_srcdir)/src/Patterns
+
+AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
+AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
+
+include ../Helpers/unittests/Makefile.am
+include ../Patterns/unittests/Makefile.am
+include ../Patterns/Observer/unittests/Makefile.am
+
 check_PROGRAMS +=  
 noinst_PROGRAMS += TestRunner
 
-TESTSOURCES = \
-  Helpers/unittests/AssertUnitTest.cpp \
-  Helpers/unittests/ChronosUnitTest.cpp \
-  Helpers/unittests/InfoUnitTest.cpp \
-  Helpers/unittests/LogUnitTest.cpp \
-  Helpers/unittests/RangeUnitTest.cpp \
-  Patterns/Observer/unittests/ObserverUnitTest.cpp \
-  Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
-  Patterns/Observer/unittests/stubs/ObserverStub.cpp \
-  Patterns/unittests/CacheableUnitTest.cpp \
-  Patterns/unittests/CloneUnitTest.cpp \
-  Patterns/unittests/CreatorUnitTest.cpp \
-  Patterns/unittests/FactoryUnitTest.cpp \
-  Patterns/unittests/ManipulableCloneUnitTest.cpp \
-  Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
-  Patterns/unittests/PrototypeFactoryUnitTest.cpp \
-  Patterns/unittests/RegistryUnitTest.cpp \
-  Patterns/unittests/SingletonUnitTest.cpp \
-  Patterns/unittests/stubs/CloneStub.cpp \
-  Patterns/unittests/stubs/CommonStub.cpp \
-  Patterns/unittests/stubs/CommonNamedStub.cpp \
-  Patterns/unittests/stubs/FactoryStub.cpp \
-  Patterns/unittests/stubs/ManipulableCloneStub.cpp \
-  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
-  Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
-  Patterns/unittests/stubs/RegistryStub.cpp
-
-TESTHEADERS = \
-  Helpers/unittests/AssertUnitTest.hpp \
-  Helpers/unittests/ChronosUnitTest.hpp \
-  Helpers/unittests/InfoUnitTest.hpp \
-  Helpers/unittests/LogUnitTest.hpp \
-  Helpers/unittests/RangeUnitTest.hpp \
-  Patterns/unittests/Observer/ObserverUnitTest.hpp \
-  Patterns/unittests/Observer/ObservedContainerUnitTest.hpp \
-  Patterns/unittests/stubs/Observer/ObserverStub.hpp \
-  Patterns/unittests/CacheableUnitTest.hpp \
-  Patterns/unittests/CloneUnitTest.hpp \
-  Patterns/unittests/CreatorUnitTest.hpp \
-  Patterns/unittests/FactoryUnitTest.hpp \
-  Patterns/unittests/ManipulableCloneUnitTest.hpp \
-  Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
-  Patterns/unittests/PrototypeFactoryUnitTest.hpp \
-  Patterns/unittests/RegistryUnitTest.hpp \
-  Patterns/unittests/SingletonUnitTest.hpp \
-  Patterns/unittests/stubs/CloneStub.hpp \
-  Patterns/unittests/stubs/CommonStub.hpp \
-  Patterns/unittests/stubs/CommonNamedStub.hpp \
-  Patterns/unittests/stubs/CommonParametersStub.hpp \
-  Patterns/unittests/stubs/CreatorStub.hpp \
-  Patterns/unittests/stubs/FactoryStub.hpp \
-  Patterns/unittests/stubs/ManipulableCloneStub.hpp \
-  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
-  Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
-  Patterns/unittests/stubs/FactoryStub.def \
-  Patterns/unittests/stubs/FactoryStub.undef \
-  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
-  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
-  Patterns/unittests/stubs/PrototypeFactoryStub.def \
-  Patterns/unittests/stubs/PrototypeFactoryStub.undef \
-  Patterns/unittests/stubs/RegistryStub.hpp
-        
 TestRunner_SOURCES = \
-        unittests/TestRunnerMain.cpp \
+        TestRunnerMain.cpp \
         $(TESTSOURCES) \
+nodist_TestRunner_SOURCES = \
         $(TESTHEADERS)
-nodist_TestRunner_SOURCES = \
-        Patterns/Observer/Channels.hpp \
-        Patterns/Observer/defs.hpp \
-        Patterns/Observer/Notification.hpp \
-        Patterns/Observer/Observable.hpp \
-        Patterns/Observer/Observer.hpp \
-        Patterns/Observer/ObserverLog.hpp \
-        Patterns/Observer/ObservedContainer_impl.hpp \
-        Patterns/Observer/ObservedContainer.hpp \
-        Patterns/Observer/ObserverIterator.hpp \
-        Patterns/Cachable.hpp \
-        Patterns/Clone.hpp \
-        Patterns/Creator.hpp \
-        Patterns/Factory_impl.hpp \
-        Patterns/Factory.hpp \
-        Patterns/FactoryTypeList.hpp \
-        Patterns/ManipulableClone.hpp \
-        Patterns/ManipulablePrototypeFactory_impl.hpp \
-        Patterns/ManipulablePrototypeFactory.hpp \
-        Patterns/PrototypeFactory_impl.hpp \
-        Patterns/PrototypeFactory.hpp \
-        Patterns/Registry_impl.hpp \
-        Patterns/Registry.hpp \
-        Patterns/Singleton_impl.hpp \
-        Patterns/Singleton.hpp
 TestRunner_LDADD = \
-        libCodePatterns-debug.la \
+        ../Patterns/libCodePatterns-Patterns-debug.la \
+        ../Helpers/libCodePatterns-Helpers-debug.la \
         $(BOOST_THREAD_LIBS)