X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Furls%2FMakefile.am;h=ad670b87cb6f2ff992bdee22b04e2032e3e264d8;hp=9bb9569dd5cdaad7943b4339eea8cd22bfad2058;hb=4c03332555b2d87029be525f854a42bb90bc4e4b;hpb=bf40f5fbd759241d1505c985fa02441cd6febd64

diff --git a/test/urls/Makefile.am b/test/urls/Makefile.am
index 9bb9569..ad670b8 100644
--- a/test/urls/Makefile.am
+++ b/test/urls/Makefile.am
@@ -11,42 +11,43 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-AUTOMAKE_OPTIONS = parallel-tests
+check_PROGRAMS += test/urls/parse-url
+check_SCRIPTS += test/urls/run-url-test
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	-I$(includedir) \
-	$(DEFAULT_CPPFLAGS)
+test_urls_parse_url_SOURCES = test/urls/parse-url.c
+test_urls_parse_url_LDADD = $(core_lib)
 
-AM_CFLAGS = \
-	$(DEFAULT_CFLAGS)
+url_TESTS = \
+	test/urls/data/double-slash.test \
+	test/urls/data/http-simple.test \
+	test/urls/data/join-full.test \
+	test/urls/data/join-absolute.test \
+	test/urls/data/join-relative.test \
+	test/urls/data/localpath.test
 
-parse_url_SOURCES = \
-	parse-url.c \
-	../../ui/common/url.c \
-	../../ui/common/url.h
+TESTS += $(url_TESTS)
 
-parse_url_LDADD = ../../lib/libpbcore.la
-
-check_PROGRAMS = parse-url
-check_SCRIPTS = run-url-test
-
-TESTS = data/double-slash.test \
-	data/http-simple.test
 TEST_EXTENSIONS = .test
-TEST_LOG_COMPILER = $(builddir)/run-url-test
+TEST_LOG_COMPILER = $(builddir)/test/urls/run-url-test
+
+if ENABLE_TEST_VALGRIND
+TEST_LOG_FLAGS = --valgrind
+endif
 
 edit = sed \
 	-e 's|@PACKAGE_NAME\@|$(PACKAGE_NAME)|g' \
 	-e 's|@PACKAGE_VERSION\@|$(PACKAGE_VERSION)|g' \
 	-e 's|@PACKAGE_BUGREPORT\@|$(PACKAGE_BUGREPORT)|g' \
-	-e 's|@abs_srcdir\@|$(abs_srcdir)|g' \
-	-e 's|@abs_builddir\@|$(abs_builddir)|g' \
+	-e 's|@abs_srcdir\@|$(abs_srcdir)/test/urls|g' \
+	-e 's|@abs_builddir\@|$(abs_builddir)/test/urls|g' \
 	-e 's|@prefix\@|$(prefix)|g'
 
-run-url-test: Makefile $(srcdir)/run-url-test.in
-	rm -f $@ $@.tmp
-	$(edit) $(srcdir)/$@.in >$@.tmp
-	chmod +x $@.tmp
-	mv $@.tmp $@
+EXTRA_DIST += $(url_TESTS) test/urls/run-url-test.in
+
+test/urls/run-url-test: $(srcdir)/test/urls/run-url-test.in
+	$(AM_V_GEN)$(edit) $(srcdir)/$@.in > $@.tmp && \
+		chmod +x $@.tmp && \
+		mv $@.tmp $@
+
+CLEANFILES += test/urls/run-url-test
+