X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FMakefile.in;h=ad2444347c8999537ccf10bc02d427d54b2b8eac;hp=57acc6c7b797e74a65aa8588c106dbf5a35306ed;hb=19f0a05e9135c570b871804b7b88724e9746c005;hpb=b285d8070b072f2ccab1b1ff53cd8e41e4d95e7f

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 57acc6c7..ad244434 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -3,7 +3,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with Wget; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
 # In addition, as a special exception, the Free Software Foundation
 # gives permission to link the code of its release of Wget with the
@@ -75,7 +74,42 @@ GETOPT_OBJ = @GETOPT_OBJ@
 
 all:
 
-unittest: test$(exeext)
+.PHONY: test
+
+test: @top_srcdir@/src/wget run-unit-tests run-px-tests
+
+@top_srcdir@/src/wget:
+	cd @top_srcdir@ && $(MAKE)
+
+run-unit-tests: unit-tests$(exeext)
+	./unit-tests$(exeext)
+
+run-px-tests: WgetTest.pm
+	./Test-c-full.px && echo && echo
+	./Test-c-partial.px && echo && echo
+	./Test-c.px && echo && echo
+#	./Test-E-k-K.px && echo && echo
+#	./Test-E-k.px && echo && echo
+	./Test-ftp.px && echo && echo
+#	./Test-HTTP-Content-Disposition.px && echo && echo
+#	./Test-HTTP-Content-Disposition-1.px && echo && echo
+#	./Test-HTTP-Content-Disposition-2.px && echo && echo
+	./Test-N-current.px && echo && echo
+#	./Test-nonexisting-quiet.px && echo && echo
+#	./Test-noop.px && echo && echo
+#	./Test-np.px && echo && echo
+#	./Test-N.px && echo && echo
+	./Test-O-nonexisting.px && echo && echo
+	./Test-O.px && echo && echo
+#	./Test-Restrict-Lowercase.px && echo && echo
+#	./Test-Restrict-Uppercase.px && echo && echo
+	./Test--spider-fail.px && echo && echo
+	./Test--spider.px && echo && echo
+	./Test--spider-r.px && echo && echo
+	./Test-auth-basic.px && echo && echo
+
+WgetTest.pm: WgetTest.pm.in @top_srcdir@/config.status
+	cd @top_srcdir@ && ./config.status
 
 #
 # Dependencies for test binary
@@ -86,7 +120,7 @@ TESTOBJ = $(ALLOCA) cmpt.o connect.o convert.o cookies.o              \
           host.o html-parse.o html-url.o http.o $(NTLM_OBJ) init.o    \
           log.o main.o $(MD5_OBJ) netrc.o progress.o                  \
           ptimer.o recur.o res.o retr.o safe-ctype.o snprintf.o       \
-          $(SSL_OBJ) test.o url.o utils.o version.o xmalloc.o
+          spider.o $(SSL_OBJ) test.o url.o utils.o version.o xmalloc.o
 
 # We make object files depend on every header.  Rather than attempt to
 # track dependencies, everything gets recompiled when a header
@@ -102,9 +136,10 @@ HEADERS = ../src/config-post.h ../src/config.h                 \
 	  ../src/log.h ../src/mswindows.h ../src/netrc.h       \
 	  ../src/options.h ../src/progress.h                   \
 	  ../src/ptimer.h ../src/recur.h ../src/res.h          \
-	  ../src/retr.h ../src/safe-ctype.h ../src/ssl.h       \
-	  ../src/sysdep.h ../src/test.h ../src/url.h           \
-	  ../src/utils.h ../src/wget.h ../src/xmalloc.h
+	  ../src/retr.h ../src/safe-ctype.h ../src/spider.h    \
+	  ../src/ssl.h ../src/sysdep.h ../src/test.h           \
+	  ../src/url.h ../src/utils.h ../src/wget.h            \
+	  ../src/xmalloc.h
 
 alloca.o: ../src/alloca.c $(HEADERS)
 	$(COMPILE) -DTESTING -c $<
@@ -208,6 +243,9 @@ safe-ctype.o: ../src/safe-ctype.c $(HEADERS)
 snprintf.o: ../src/snprintf.c $(HEADERS)
 	$(COMPILE) -DTESTING -c $<
 
+spider.o: ../src/spider.c $(HEADERS)
+	$(COMPILE) -DTESTING -c $<
+
 test.o: ../src/test.c $(HEADERS)
 	$(COMPILE) -DTESTING -c $<
 
@@ -224,7 +262,7 @@ xmalloc.o: ../src/xmalloc.c $(HEADERS)
 	$(COMPILE) -DTESTING -c $<
 
 	
-test$(exeext): $(TESTOBJ)
+unit-tests$(exeext): $(TESTOBJ)
 	$(LINK) $(TESTOBJ) $(LIBS)
 
 #
@@ -232,7 +270,7 @@ test$(exeext): $(TESTOBJ)
 #
 
 clean:
-	$(RM) *.o test$(exeext) *~ *.bak core core.[0-9]*
+	$(RM) *.o unit-tests$(exeext) *~ *.bak core core.[0-9]*
 
 distclean: clean
 	$(RM) Makefile