Updated licensing exception for OpenSSL from the SFLC.

[wget] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ad2444347c8999537ccf10bc02d427d54b2b8eac..53c40c0adae07adad7224275812280b49eb7d3b6 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
@@ -14,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@
@@ -52,7 +54,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
 
@@ -85,28 +87,44 @@ 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
-       ./Test-auth-basic.px && echo && echo
 
 WgetTest.pm: WgetTest.pm.in @top_srcdir@/config.status
        cd @top_srcdir@ && ./config.status