X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Ftest.c;h=4602314f7c51498506b2db01cfb3f826bb7cc139;hb=c9c0e4c6418350d913638d73e0a50bebdb5fd983;hp=3acfee73868eb3c31ab05bbc6711d9051a048df4;hpb=6633b74930870ffb148c46129c738af78082d934;p=wget
diff --git a/src/test.c b/src/test.c
index 3acfee73..4602314f 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1,5 +1,6 @@
/* Unit testing.
- Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+ Foundation, Inc.
This file is part of GNU Wget.
@@ -16,15 +17,18 @@ 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 .
-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. */
+
+#include "wget.h"
#include
@@ -37,11 +41,15 @@ so, delete this exception statement from your version. */
const char *test_parse_content_disposition();
const char *test_subdir_p();
const char *test_dir_matches_p();
+const char *test_commands_sorted();
const char *test_cmd_spec_restrict_file_names();
+const char *test_path_simplify ();
const char *test_append_uri_pathel();
const char *test_are_urls_equal();
const char *test_is_robots_txt_url();
+const char *program_argstring = "TEST";
+
int tests_run;
static const char *
@@ -50,31 +58,38 @@ all_tests()
mu_run_test (test_parse_content_disposition);
mu_run_test (test_subdir_p);
mu_run_test (test_dir_matches_p);
+ mu_run_test (test_commands_sorted);
mu_run_test (test_cmd_spec_restrict_file_names);
+ mu_run_test (test_path_simplify);
mu_run_test (test_append_uri_pathel);
mu_run_test (test_are_urls_equal);
mu_run_test (test_is_robots_txt_url);
-
+
return NULL;
}
+char *program_name; /* Needed by lib/error.c. */
int
-main (void)
+main (int argc, char *argv[])
{
- const char *result = all_tests();
-
- if (result != NULL)
+ const char *result;
+
+ program_name = argv[0];
+
+ result = all_tests();
+
+ if (result != NULL)
{
puts (result);
}
- else
+ else
{
printf ("ALL TESTS PASSED\n");
}
-
+
printf ("Tests run: %d\n", tests_run);
-
+
return result != 0;
}