X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FMakefile.am;h=6e703f012bf9cf165e80b193893b92c9b7c13a11;hp=224cb9cc56fbdb8d4c7b44c03003f5628e388be0;hb=f0438edcf2e34169fb0792119ac9ce10ae35a564;hpb=83ac6990ddecc54ca7f7479ba3aba95116d614bc

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 224cb9cc..6e703f01 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,54 +37,25 @@ PERLRUN = $(PERL) -I$(srcdir)
 
 check-local: test
 
-test: ../src/wget$(EXEEXT) run-unit-tests #run-px-tests
+test: ../src/wget$(EXEEXT) run-unit-tests run-px-tests
 
 ../src/wget$(EXEEXT):
 	cd ../src && $(MAKE) $(AM_MAKEFLAGS)
 
+../src/libunittest.a:
+	cd ../src && $(MAKE) $(AM_MAKEFLAGS) libunittest.a
+
+../lib/libgnu.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
+../md5/libmd5.a:
+	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
 run-unit-tests: unit-tests$(EXEEXT)
 	./unit-tests$(EXEEXT)
 
-run-px-tests: WgetTest.pm
-	$(PERLRUN) $(srcdir)/Test-proxy-auth-basic.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-auth-basic.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-c-full.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-c-partial.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-c.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-E-k-K.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-E-k.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-ftp.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-HTTP-Content-Disposition-1.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-HTTP-Content-Disposition-2.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-HTTP-Content-Disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N-current-HTTP-CD.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N-current.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N-HTTP-Content-Disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N--no-content-disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N--no-content-disposition-trivial.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--no-content-disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--no-content-disposition-trivial.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N-old.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-nonexisting-quiet.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-noop.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-np.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-N.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-O-HTTP-Content-Disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-O--no-content-disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-O--no-content-disposition-trivial.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-O-nonexisting.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-O.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-Restrict-Lowercase.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test-Restrict-Uppercase.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider-fail.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider-HTTP-Content-Disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider--no-content-disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider--no-content-disposition-trivial.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider-r-HTTP-Content-Disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider-r--no-content-disposition.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider-r--no-content-disposition-trivial.px && echo && echo
-	$(PERLRUN) $(srcdir)/Test--spider-r.px && echo && echo
+run-px-tests: WgetTest.pm ../src/wget$(EXEEXT)
+	./run-px $(top_srcdir)
 
 EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
 	     Test-auth-basic.px Test-c-full.px Test-c-partial.px \
@@ -100,6 +71,7 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
 
 check_PROGRAMS = unit-tests
 unit_tests_SOURCES = 
+#unit-tests: ../src/libunittest.a ../lib/libgnu.a
 LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
         @MD5_LDADD@