X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Ftest.h;h=91baf589ac6651d3638885406f5f702d73b4bf4c;hp=60e03c791be4e2db9e1bc718453dbf5677590e1c;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=74415a75857646de20a57b5a68f3acb02011fd0e

diff --git a/src/test.h b/src/test.h
index 60e03c79..91baf589 100644
--- a/src/test.h
+++ b/src/test.h
@@ -1,11 +1,11 @@
 /* Unit testing declarations.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget 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.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,26 +14,33 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.
-
-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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+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
 
 /* from MinUnit */
 #define mu_assert(message, test) do { if (!(test)) return message; } while (0)
-#define mu_run_test(test) do { char *message = test(); tests_run++; \
-                               if (message) return message; } while (0)
+#define mu_run_test(test) \
+do { \
+  const char *message; \
+  puts("RUNNING TEST " #test "..."); \
+  message = test(); \
+  tests_run++; \
+  if (message) return message; \
+  puts("PASSED\n"); \
+} while (0)
 
 extern int tests_run;