Make use of uUnit as a submodule (dgunit renamed).

1 files changed, 49 insertions, 50 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 372b57f..2ed1fdc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,9 +25,8 @@ if ENABLE_LV2
 TESTS += lv2
 endif
 
-check_PROGRAMS = $(TESTS)
-
-resource_CXXFLAGS = -DOUTPUT=\"resource\" $(SNDFILE_CFLAGS) \
+check_PROGRAMS = $(TESTS) 
+resource_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"resource\" $(SNDFILE_CFLAGS) \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/plugingui \
@@ -39,11 +38,11 @@ resource_SOURCES = \
 	$(top_srcdir)/plugingui/resource.cc \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/src/random.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	drumkit_creator.cc \
 	resource_test.cc
 
-audiocache_CXXFLAGS = -DOUTPUT=\"audiocache\" \
+audiocache_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocache\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
@@ -57,11 +56,11 @@ audiocache_SOURCES = \
 	$(top_srcdir)/src/sem.cc \
 	$(top_srcdir)/src/audiofile.cc \
 	$(top_srcdir)/src/random.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	drumkit_creator.cc \
 	audiocachetest.cc
 
-audiocachefile_CXXFLAGS = -DOUTPUT=\"audiocachefile\" \
+audiocachefile_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocachefile\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
@@ -72,21 +71,21 @@ audiocachefile_SOURCES = \
 	$(top_srcdir)/src/sem.cc \
 	$(top_srcdir)/src/audiofile.cc \
 	$(top_srcdir)/src/random.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	drumkit_creator.cc \
 	audiocachefiletest.cc
 
-audiocacheidmanager_CXXFLAGS = -DOUTPUT=\"audiocacheidmanager\" \
+audiocacheidmanager_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocacheidmanager\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(SNDFILE_CFLAGS)
 audiocacheidmanager_LDFLAGS = $(SNDFILE_LIBS)
 audiocacheidmanager_SOURCES = \
 	$(top_srcdir)/src/audiocacheidmanager.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	audiocacheidmanagertest.cc
 
-audiocacheeventhandler_CXXFLAGS = -DOUTPUT=\"audiocacheeventhandler\" \
+audiocacheeventhandler_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"audiocacheeventhandler\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
@@ -97,10 +96,10 @@ audiocacheeventhandler_SOURCES = \
 	$(top_srcdir)/src/audiocachefile.cc \
 	$(top_srcdir)/src/thread.cc \
 	$(top_srcdir)/src/sem.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	audiocacheeventhandlertest.cc
 
-enginetest_CXXFLAGS = -DOUTPUT=\"enginetest\" \
+enginetest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"enginetest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
@@ -108,21 +107,21 @@ enginetest_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) \
 	 $(top_builddir)/src/libdg.la
 enginetest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
-	dgtest.cc \
+	uunit/uunit.cc \
 	drumkit_creator.cc \
 	enginetest.cc
 
-paintertest_CXXFLAGS = -DOUTPUT=\"paintertest\" \
+paintertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"paintertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/plugingui \
 	-I$(top_srcdir)/hugin $(PTHREAD_CFLAGS)
 paintertest_LDFLAGS = $(top_builddir)/plugingui/libdggui.la
 paintertest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
-	dgtest.cc \
+	uunit/uunit.cc \
 	paintertest.cc
 
-lv2_CXXFLAGS = -DOUTPUT=\"lv2\" \
+lv2_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"lv2\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	 `pkg-config --cflags serd-0` `pkg-config --cflags lilv-0` \
@@ -132,12 +131,12 @@ lv2_LDFLAGS = `pkg-config --libs serd-0` \
 	$(SNDFILE_LIBS)
 lv2_SOURCES = \
 	$(top_srcdir)/src/random.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	drumkit_creator.cc \
 	lv2_test_host.cc \
 	lv2.cc
 
-configfile_CXXFLAGS = -DOUTPUT=\"configfile\" \
+configfile_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"configfile\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/hugin -I$(top_srcdir)/src
 configfile_LDFLAGS =
@@ -145,10 +144,10 @@ configfile_SOURCES = \
 	$(top_srcdir)/src/configfile.cc \
 	$(top_srcdir)/src/directory.cc \
 	$(top_srcdir)/hugin/hugin.c \
-	dgtest.cc \
+	uunit/uunit.cc \
 	configtest.cc
 
-randomtest_CXXFLAGS = -DOUTPUT=\"randomtest\" \
+randomtest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"randomtest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN
@@ -156,31 +155,31 @@ randomtest_CFLAGS = -DDISABLE_HUGIN
 randomtest_LDFLAGS =
 randomtest_SOURCES = \
 	$(top_srcdir)/src/random.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	randomtest.cc
 
-atomictest_CXXFLAGS = -DOUTPUT=\"atomictest\" \
+atomictest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"atomictest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/hugin
 atomictest_LDFLAGS =
-atomictest_SOURCES = atomictest.cc dgtest.cc
+atomictest_SOURCES = atomictest.cc uunit/uunit.cc
 
-syncedsettingstest_CXXFLAGS = -DOUTPUT=\"syncedsettingstest\" \
+syncedsettingstest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"syncedsettingstest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/hugin
 syncedsettingstest_LDFLAGS =
-syncedsettingstest_SOURCES = syncedsettings.cc dgtest.cc
+syncedsettingstest_SOURCES = syncedsettings.cc uunit/uunit.cc
 
-imagecachetest_CXXFLAGS = -DOUTPUT=\"imagecachetest\" \
+imagecachetest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"imagecachetest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/plugingui  -I$(top_srcdir)/hugin
 imagecachetest_LDFLAGS = $(top_builddir)/plugingui/libdggui.la
 imagecachetest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	imagecachetest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-semaphoretest_CXXFLAGS = -DOUTPUT=\"semaphoretest\" \
+semaphoretest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"semaphoretest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/hugin $(PTHREAD_CFLAGS)
 semaphoretest_LDFLAGS = $(PTHREAD_LIBS)
@@ -188,9 +187,9 @@ semaphoretest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/src/sem.cc \
 	semaphoretest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-drumkitcreatortest_CXXFLAGS = -DOUTPUT=\"drumkitcreatortest\" \
+drumkitcreatortest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"drumkitcreatortest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(SNDFILE_CFLAGS)
@@ -198,28 +197,28 @@ drumkitcreatortest_CFLAGS = -DDISABLE_HUGIN
 drumkitcreatortest_LDFLAGS = $(SNDFILE_LIBS)
 drumkitcreatortest_SOURCES = \
 	$(top_srcdir)/src/random.cc \
-	dgtest.cc \
+	uunit/uunit.cc \
 	drumkit_creator.cc \
 	drumkitcreatortest.cc
 
-bytesizeparsertest_CXXFLAGS = -DOUTPUT=\"bytesizeparsertest\" \
+bytesizeparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"bytesizeparsertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 bytesizeparsertest_LDFLAGS =
 bytesizeparsertest_SOURCES = \
 	$(top_srcdir)/src/bytesizeparser.cc \
 	bytesizeparsertest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-notifiertest_CXXFLAGS = -DOUTPUT=\"notifiertest\" \
+notifiertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"notifiertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 notifiertest_LDFLAGS =
 notifiertest_SOURCES = \
 	notifiertest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-dgxmlparsertest_CXXFLAGS = -DOUTPUT=\"dgxmlparsertest\" \
+dgxmlparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"dgxmlparsertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
@@ -230,9 +229,9 @@ dgxmlparsertest_SOURCES = \
 	$(top_srcdir)/pugixml/src/pugixml.cpp \
 	dgxmlparsertest.cc \
 	scopedfile.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-domloadertest_CXXFLAGS = -DOUTPUT=\"domloadertest\" \
+domloadertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"domloadertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 domloadertest_LDFLAGS = \
@@ -241,9 +240,9 @@ domloadertest_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	domloadertest.cc \
 	scopedfile.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-configparsertest_CXXFLAGS = -DOUTPUT=\"configparsertest\" \
+configparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"configparsertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
@@ -253,9 +252,9 @@ configparsertest_SOURCES = \
 	$(top_srcdir)/src/configparser.cc \
 	$(top_srcdir)/pugixml/src/pugixml.cpp \
 	configparsertest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-midimapparsertest_CXXFLAGS = -DOUTPUT=\"midimapparsertest\" \
+midimapparsertest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"midimapparsertest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
@@ -266,25 +265,25 @@ midimapparsertest_SOURCES = \
 	$(top_srcdir)/pugixml/src/pugixml.cpp \
 	scopedfile.cc \
 	midimapparsertest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-eventsdstest_CXXFLAGS = -DOUTPUT=\"eventsdstest\" \
+eventsdstest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"eventsdstest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 eventsdstest_LDFLAGS =
 eventsdstest_SOURCES = \
 	$(top_srcdir)/src/events_ds.cc \
 	eventsdstest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
-powermaptest_CXXFLAGS = -DOUTPUT=\"powermaptest\" \
+powermaptest_CXXFLAGS = -I$(top_srcdir)/test/uunit -DOUTPUT=\"powermaptest\" \
 	$(DEBUG_FLAGS) \
 	-I$(top_srcdir)/src
 powermaptest_LDFLAGS =
 powermaptest_SOURCES = \
 	$(top_srcdir)/src/powermap.cc \
 	powermaptest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
 RES = \
 	$(top_srcdir)/test/locale/da.mo
@@ -296,7 +295,7 @@ rcgen_verbose_0 = @echo "  RCGEN    "$@;
 translationtest_resource_data.cc: $(top_builddir)/plugingui/rcgen $(RES)
 	$(rcgen_verbose)$(top_builddir)/plugingui/rcgen$(EXEEXT) -s $(top_srcdir)/test/ -o $@ $(RES)
 
-translationtest_CXXFLAGS = \
+translationtest_CXXFLAGS = -I$(top_srcdir)/test/uunit \
 	-DOUTPUT=\"translationtest\" \
 	-I$(top_srcdir)/plugingui \
 	-I$(top_srcdir)/src \
@@ -312,7 +311,7 @@ translationtest_SOURCES = \
 	$(top_srcdir)/src/translation.cc \
 	$(top_srcdir)/plugingui/uitranslation.cc \
 	translationtest.cc \
-	dgtest.cc
+	uunit/uunit.cc
 
 BUILT_SOURCES = translationtest_resource_data.cc
 CLEANFILES = translationtest_resource_data.cc