Merge with mainline

[wget] / src / test.c

diff --git a/src/test.c b/src/test.c
index a124eeaa27e522ac21ba95ca8188d1266b39a886..3acfee73868eb3c31ab05bbc6711d9051a048df4 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1,11 +1,11 @@
 /* Unit testing.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 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,8 +14,7 @@ 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.
+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
@@ -35,14 +34,26 @@ so, delete this exception statement from your version.  */
 #error "TESTING not set!!!"
 #endif
 
-int tests_run;
+const char *test_parse_content_disposition();
+const char *test_subdir_p();
+const char *test_dir_matches_p();
+const char *test_cmd_spec_restrict_file_names();
+const char *test_append_uri_pathel();
+const char *test_are_urls_equal();
+const char *test_is_robots_txt_url();
 
-// char *test_ccache();
+int tests_run;
 
-static char *
+static const char *
 all_tests()
 {
-  // mu_run_test (test_ccache);
+  mu_run_test (test_parse_content_disposition);
+  mu_run_test (test_subdir_p);
+  mu_run_test (test_dir_matches_p);
+  mu_run_test (test_cmd_spec_restrict_file_names);
+  mu_run_test (test_append_uri_pathel);
+  mu_run_test (test_are_urls_equal);
+  mu_run_test (test_is_robots_txt_url);
   
   return NULL;
 }
@@ -51,7 +62,7 @@ all_tests()
 int
 main (void) 
 {
-  char *result = all_tests();
+  const char *result = all_tests();
   
   if (result != NULL) 
     {