Merge with mainline

[wget] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b038664070bb40ee69ff1a1f6a5778925ac98b17..920186cec4c91eef4de0eb57ce9fc0c80b9ff863 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,5 +1,6 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # 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
@@ -52,7 +53,7 @@ DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(local
 CFLAGS   = @CFLAGS@
 LDFLAGS  = @LDFLAGS@ 
 LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
-exeext   = @exeext@
+exeext   = @EXEEXT@
 
 INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../src
 
@@ -76,32 +77,52 @@ all:
 
 .PHONY: test
 
-test: run-unit-tests run-px-tests
+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-auth-basic.px && echo && echo
        ./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-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-HTTP-Content-Disposition-1.px && echo && echo
+       ./Test-HTTP-Content-Disposition-2.px && echo && echo
+       ./Test-HTTP-Content-Disposition.px && echo && echo
+       ./Test-N-current-HTTP-CD.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-N-HTTP-Content-Disposition.px && echo && echo
+       ./Test-N--no-content-disposition.px && echo && echo
+       ./Test-N--no-content-disposition-trivial.px && echo && echo
+       ./Test--no-content-disposition.px && echo && echo
+       ./Test--no-content-disposition-trivial.px && echo && echo
+       ./Test-N-old.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-HTTP-Content-Disposition.px && echo && echo
+       ./Test-O--no-content-disposition.px && echo && echo
+       ./Test-O--no-content-disposition-trivial.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-Restrict-Lowercase.px && echo && echo
+       ./Test-Restrict-Uppercase.px && echo && echo
        ./Test--spider-fail.px && echo && echo
+       ./Test--spider-HTTP-Content-Disposition.px && echo && echo
+       ./Test--spider--no-content-disposition.px && echo && echo
+       ./Test--spider--no-content-disposition-trivial.px && echo && echo
        ./Test--spider.px && echo && echo
+       ./Test--spider-r-HTTP-Content-Disposition.px && echo && echo
+       ./Test--spider-r--no-content-disposition.px && echo && echo
+       ./Test--spider-r--no-content-disposition-trivial.px && echo && echo
        ./Test--spider-r.px && echo && echo
 
 WgetTest.pm: WgetTest.pm.in @top_srcdir@/config.status