X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=tests%2FMakefile.am;h=cd6df8d826b3fde735efca5b3b273a5c490e8df8;hb=aab7dadc9a4f55d3a7921a2844ba1bbc18f7fc10;hp=7cc5fd4c8e58218d500fe9529d4a138ce3bbd716;hpb=7543c0831d88177c00f5c2f511339f7e4c81dda0;p=wget diff --git a/tests/Makefile.am b/tests/Makefile.am index 7cc5fd4c..cd6df8d8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,6 +42,8 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests ../src/wget$(EXEEXT): cd ../src && $(MAKE) $(AM_MAKEFLAGS) +# Make libunittest "PHONY" so we're always sure we're up-to-date. +.PHONY: ../src/libunittest.a ../src/libunittest.a: cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a @@ -51,13 +53,14 @@ test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests ../md5/libmd5.a: cd ../lib && $(MAKE) $(AM_MAKEFLAGS) -run-unit-tests: unit-tests$(EXEEXT) +run-unit-tests: unit-tests$(EXEEXT) ../src/libunittest.a ./unit-tests$(EXEEXT) run-px-tests: WgetTest.pm ../src/wget$(EXEEXT) $(srcdir)/run-px $(top_srcdir) EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ + WgetFeature.pm WgetFeature.cfg \ Test-auth-basic.px \ Test-auth-no-challenge.px \ Test-auth-no-challenge-url.px \ @@ -70,6 +73,9 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ Test-E-k-K.px \ Test-E-k.px \ Test-ftp.px \ + Test-ftp-pasv-fail.px \ + Test-ftp-bad-list.px \ + Test-ftp-recursive.px \ Test-ftp-iri.px \ Test-ftp-iri-fallback.px \ Test-ftp-iri-recursive.px \ @@ -121,9 +127,8 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \ run-px certs check_PROGRAMS = unit-tests -unit_tests_SOURCES = -#unit-tests: ../src/libunittest.a ../lib/libgnu.a +unit_tests_SOURCES = LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \ - @MD5_LDADD@ + @MD5_LDADD@ CLEANFILES = *~ *.bak core core.[0-9]*