X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Ftest.h;h=91baf589ac6651d3638885406f5f702d73b4bf4c;hp=7587177a858b8d9443c033d839fcab61eb2d48c6;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=53d0aff795316dc1a4b785632f0d4d93c861e9cb

diff --git a/src/test.h b/src/test.h
index 7587177a..91baf589 100644
--- a/src/test.h
+++ b/src/test.h
@@ -1,5 +1,5 @@
 /* Unit testing declarations.
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -16,15 +16,16 @@ GNU General Public License for more details.
 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.  */
 
 #ifndef TEST_H
 #define TEST_H
@@ -33,8 +34,9 @@ so, delete this exception statement from your version.  */
 #define mu_assert(message, test) do { if (!(test)) return message; } while (0)
 #define mu_run_test(test) \
 do { \
+  const char *message; \
   puts("RUNNING TEST " #test "..."); \
-  const char *message = test(); \
+  message = test(); \
   tests_run++; \
   if (message) return message; \
   puts("PASSED\n"); \