Changeset 2ed1a0 for src/Helpers/unittests

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:

• src/Helpers/unittests/Makefile.am (modified) (2 diffs)

src/Helpers/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
+# NOTE that all paths are relative to ./src (because we get included there!)
 
-AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS) 
-AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
-AM_CPPFLAGS = ${BOOST_CPPFLAGS}
-
-TESTS = \
+TESTS += \
         AssertUnitTest \
         ChronosUnitTest \
@@ -16 +12 @@
   RangeUnitTest
 
-check_PROGRAMS = $(TESTS) 
-noinst_PROGRAMS = $(TESTS)
+check_PROGRAMS += $(TESTS) 
+noinst_PROGRAMS += $(TESTS)
 
-AssertUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        AssertUnitTest.cpp \
-        AssertUnitTest.hpp 
+AssertUnitTest_SOURCES = unittests/UnitTestMain.cpp \
+        Helpers/unittests/AssertUnitTest.cpp \
+        Helpers/unittests/AssertUnitTest.hpp 
 nodist_AssertUnitTest_SOURCES = \
-        ../Assert.cpp \
-        ../Assert.hpp
+        Helpers/Assert.cpp \
+        Helpers/Assert.hpp
 AssertUnitTest_LDADD = \
         $(BOOST_THREAD_LIB)
 
-ChronosUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ChronosUnitTest.cpp \
-        ChronosUnitTest.hpp \
-        stubs/InfoStub.cpp
+ChronosUnitTest_SOURCES = unittests/UnitTestMain.cpp \
+        Helpers/unittests/ChronosUnitTest.cpp \
+        Helpers/unittests/ChronosUnitTest.hpp \
+        Helpers/unittests/stubs/InfoStub.cpp
 nodist_ChronosUnitTest_SOURCES = \
-        ../Assert.cpp \
-        ../Assert.hpp \
-        ../MemDebug.cpp \
-        ../MemDebug.hpp \
-        ../Chronos.cpp \
-        ../Chronos.hpp \
-        ../Info.hpp
+        Helpers/Assert.cpp \
+        Helpers/Assert.hpp \
+        Helpers/MemDebug.cpp \
+        Helpers/MemDebug.hpp \
+        Helpers/Chronos.cpp \
+        Helpers/Chronos.hpp \
+        Helpers/Info.hpp
 ChronosUnitTest_LDADD = \
         $(BOOST_THREAD_LIBS)
 
-InfoUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        InfoUnitTest.cpp \
-        InfoUnitTest.hpp \
-        stubs/ChronosStub.cpp \
-        stubs/errorloggerStub.cpp \
-        stubs/LogStub.cpp \
-        stubs/loggerStub.cpp
+InfoUnitTest_SOURCES = unittests/UnitTestMain.cpp \
+        Helpers/unittests/InfoUnitTest.cpp \
+        Helpers/unittests/InfoUnitTest.hpp \
+        Helpers/unittests/stubs/ChronosStub.cpp \
+        Helpers/unittests/stubs/errorloggerStub.cpp \
+        Helpers/unittests/stubs/LogStub.cpp \
+        Helpers/unittests/stubs/loggerStub.cpp
 nodist_InfoUnitTest_SOURCES = \
-        ../Assert.cpp \
-        ../Assert.hpp \
-        ../Chronos.hpp \
-        ../errorlogger.hpp \
-        ../Info.cpp \
-        ../Info.hpp \
-        ../Log.hpp \
-        ../logger.hpp \
-        ../MemDebug.cpp \
-        ../MemDebug.hpp
+        Helpers/Assert.cpp \
+        Helpers/Assert.hpp \
+        Helpers/Chronos.hpp \
+        Helpers/errorlogger.hpp \
+        Helpers/Info.cpp \
+        Helpers/Info.hpp \
+        Helpers/Log.hpp \
+        Helpers/logger.hpp \
+        Helpers/MemDebug.cpp \
+        Helpers/MemDebug.hpp
 InfoUnitTest_LDADD = \
         $(BOOST_THREAD_LIBS)
 
-IteratorAdaptorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        IteratorAdaptorsUnitTest.cpp \
-        IteratorAdaptorsUnitTest.hpp
+IteratorAdaptorsUnitTest_SOURCES = unittests/UnitTestMain.cpp \
+        Helpers/unittests/IteratorAdaptorsUnitTest.cpp \
+        Helpers/unittests/IteratorAdaptorsUnitTest.hpp
 nodist_IteratorAdaptorsUnitTest_SOURCES = \
         $(top_srcdir)/src/Helpers/IteratorAdaptors.hpp
 IteratorAdaptorsUnitTest_LDADD = 
 
-LogUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        LogUnitTest.cpp \
-        LogUnitTest.hpp \
-        stubs/errorloggerStub.cpp \
-        stubs/loggerStub.cpp
+LogUnitTest_SOURCES = unittests/UnitTestMain.cpp \
+        Helpers/unittests/LogUnitTest.cpp \
+        Helpers/unittests/LogUnitTest.hpp \
+        Helpers/unittests/stubs/errorloggerStub.cpp \
+        Helpers/unittests/stubs/loggerStub.cpp
 nodist_LogUnitTest_SOURCES = \
-        ../Assert.cpp \
-        ../Assert.hpp \
-        ../errorlogger.hpp \
-        ../Log.cpp \
-        ../Log.hpp \
-        ../logger.hpp \
-        ../MemDebug.cpp \
-        ../MemDebug.hpp
+        Helpers/Assert.cpp \
+        Helpers/Assert.hpp \
+        Helpers/errorlogger.hpp \
+        Helpers/Log.cpp \
+        Helpers/Log.hpp \
+        Helpers/logger.hpp \
+        Helpers/MemDebug.cpp \
+        Helpers/MemDebug.hpp
 LogUnitTest_LDADD = \
         $(BOOST_THREAD_LIBS)
 
-RangeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        RangeUnitTest.cpp \
-        RangeUnitTest.hpp
+RangeUnitTest_SOURCES = unittests/UnitTestMain.cpp \
+        Helpers/unittests/RangeUnitTest.cpp \
+        Helpers/unittests/RangeUnitTest.hpp
 nodist_RangeUnitTest_SOURCES = \
-        ../Range.hpp
+        Helpers/Range.hpp
 RangeUnitTest_LDADD =