Automated merge.

[wget] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51d3f870f42f073765cc75025c3264d94d0f7bc4..27f9adaa01ba761f616bc4a184a7282c969bb52d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for `wget' utility
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008 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
@@ -15,15 +15,16 @@
 # You should have received a copy of the GNU General Public License
 # 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
-# OpenSSL project's "OpenSSL" library (or with modified versions of it
-# that use the same license as the "OpenSSL" library), and distribute
-# the linked executables.  You must obey the GNU General Public License
-# in all respects for all of the code used other than "OpenSSL".  If you
-# modify this file, you may extend this exception to your version of the
-# file, but you are not obligated to do so.  If you do not wish to do
-# so, delete this exception statement from your version.
+# Additional permission under GNU GPL version 3 section 7
+
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+# grants you additional permission to convey the resulting work.
+# Corresponding Source for a non-source form of such a combination
+# shall include the source code for the parts of OpenSSL used as well
+# as that of the covered work.
 
 #
 # Version: @VERSION@
@@ -36,7 +37,7 @@ 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)
@@ -45,44 +46,7 @@ run-unit-tests: unit-tests$(EXEEXT)
        ./unit-tests$(EXEEXT)
 
 run-px-tests: WgetTest.pm
-       $(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 $(top_srcdir)
 
 EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
             Test-auth-basic.px Test-c-full.px Test-c-partial.px \
@@ -98,6 +62,7 @@ EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
 
 check_PROGRAMS = unit-tests
 unit_tests_SOURCES = 
-LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@
+LDADD = ../src/libunittest.a ../lib/libgnu.a @LIBSSL@ @LIBGNUTLS@ \
+        @MD5_LDADD@
 
 CLEANFILES = *~ *.bak core core.[0-9]*