From ed0c006e81c69fbed16181c512c55190d998892e Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Tue, 9 Dec 2008 00:06:13 +0000
Subject: Simplify "make check" makefile rules and remove most of the obsolete
 utest-based tests.

(bzr r6976)
---
 src/Makefile_insert | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

(limited to 'src/Makefile_insert')

diff --git a/src/Makefile_insert b/src/Makefile_insert
index ac4100862..3fc319c92 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -393,39 +393,40 @@ inkscape_LDFLAGS = --export-dynamic $(kdeldflags)
 inkview_SOURCES = inkview.cpp $(win32_sources)
 inkview_LDADD = $(all_libs)
 
+# old utest-based test - convert to cxxtest and remove
 style_test_SOURCES = style-test.cpp
 style_test_LDADD = $(all_libs)
 
 inkscape_version.h: ../configure.ac
 	echo '#define INKSCAPE_VERSION "$(VERSION)"' > inkscape_version.h
 
-test_src_includes =				\
-		$(srcdir)/MultiPrinter.h	\
-		$(srcdir)/TRPIFormatter.h	\
-		$(srcdir)/PylogFormatter.h	\
-		$(srcdir)/attributes-test.h	\
-		$(srcdir)/color-profile-test.h	\
-		$(srcdir)/dir-util-test.h	\
-		$(srcdir)/extract-uri-test.h	\
-		$(srcdir)/mod360-test.h		\
-		$(srcdir)/round-test.h		\
-		$(srcdir)/preferences-test.h	\
-		$(srcdir)/sp-gradient-test.h	\
-		$(srcdir)/sp-style-elem-test.h	\
-		$(srcdir)/style-test.h		\
-		$(srcdir)/test-helpers.h	\
-		$(srcdir)/verbs-test.h
-
-test-src.cpp: \
-		$(test_src_includes)
-		$(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh --template=$(srcdir)/selfname.tpl -root -o test-src.cpp	\
-		$(test_src_includes)
+# ######################
+# ### CxxTest stuff ####
+# ######################
+inkscape_testsuites =			\
+	$(srcdir)/MultiPrinter.h	\
+	$(srcdir)/TRPIFormatter.h	\
+	$(srcdir)/PylogFormatter.h	\
+	$(srcdir)/attributes-test.h	\
+	$(srcdir)/color-profile-test.h	\
+	$(srcdir)/dir-util-test.h	\
+	$(srcdir)/extract-uri-test.h	\
+	$(srcdir)/mod360-test.h		\
+	$(srcdir)/round-test.h		\
+	$(srcdir)/preferences-test.h	\
+	$(srcdir)/sp-gradient-test.h	\
+	$(srcdir)/sp-style-elem-test.h	\
+	$(srcdir)/style-test.h		\
+	$(srcdir)/test-helpers.h	\
+	$(srcdir)/verbs-test.h
 
 test_src_SOURCES =		\
 	test-src.cpp		\
-	$(test_src_includes)
-
+	$(inkscape_testsuites)
 
 test_src_LDADD =	\
 	$(all_libs)	\
 	io/libio.a
+
+test-src.cpp: $(inkscape_testsuites) Makefile_insert $(CXXTEST_TEMPLATE)
+	$(CXXTESTGEN) -o test-src.cpp $(inkscape_testsuites)
-- 
cgit v1.2.3