X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Furls%2FMakefile.am;h=fbdf792e9af80772ec10c36f903aeaacf40e47c8;hp=9bb9569dd5cdaad7943b4339eea8cd22bfad2058;hb=1b646fb733ef99b1dc1862276ae3595bdeaf355b;hpb=bf40f5fbd759241d1505c985fa02441cd6febd64

diff --git a/test/urls/Makefile.am b/test/urls/Makefile.am
index 9bb9569..fbdf792 100644
--- a/test/urls/Makefile.am
+++ b/test/urls/Makefile.am
@@ -16,16 +16,12 @@ AUTOMAKE_OPTIONS = parallel-tests
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
-	-I$(includedir) \
 	$(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
 	$(DEFAULT_CFLAGS)
 
-parse_url_SOURCES = \
-	parse-url.c \
-	../../ui/common/url.c \
-	../../ui/common/url.h
+parse_url_SOURCES = parse-url.c
 
 parse_url_LDADD = ../../lib/libpbcore.la
 
@@ -33,10 +29,19 @@ check_PROGRAMS = parse-url
 check_SCRIPTS = run-url-test
 
 TESTS = data/double-slash.test \
-	data/http-simple.test
+	data/http-simple.test \
+	data/join-full.test \
+	data/join-absolute.test \
+	data/join-relative.test \
+	data/localpath.test
+
 TEST_EXTENSIONS = .test
 TEST_LOG_COMPILER = $(builddir)/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' \
@@ -45,8 +50,14 @@ edit = sed \
 	-e 's|@abs_builddir\@|$(abs_builddir)|g' \
 	-e 's|@prefix\@|$(prefix)|g'
 
+EXTRA_DIST = $(TESTS) run-url-test.in
+
 run-url-test: Makefile $(srcdir)/run-url-test.in
 	rm -f $@ $@.tmp
 	$(edit) $(srcdir)/$@.in >$@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
+
+CLEANFILES = run-url-test
+
+MAINTAINERCLEANFILES = Makefile.in