[Expat-checkins] expat/tests minicheck.c, 1.4, 1.5 minicheck.h, 1.5, 1.6 runtests.c, 1.63, 1.64

[Fred L. Drake]

Update of /cvsroot/expat/expat/tests
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16272

Modified Files:
	minicheck.c minicheck.h runtests.c 
Log Message:
- suppress compiler warning when the tests are built with C++
- remove non-implemented forking API from minicheck; it is not used, and
  we always use minicheck instead of check


Index: minicheck.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- minicheck.c	28 Jan 2005 16:16:14 -0000	1.4
+++ minicheck.c	1 Jul 2006 02:34:50 -0000	1.5
@@ -82,12 +82,6 @@
     return runner;
 }
 
-void
-srunner_set_fork_status(SRunner *runner, int status)
-{
-    /* We ignore this. */
-}
-
 static jmp_buf env;
 
 static char const *_check_current_function = NULL;

Index: minicheck.h
===================================================================
RCS file: /cvsroot/expat/expat/tests/minicheck.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- minicheck.h	6 Mar 2006 14:24:36 -0000	1.5
+++ minicheck.h	1 Jul 2006 02:34:50 -0000	1.6
@@ -42,7 +42,6 @@
 
 struct SRunner {
     Suite *suite;
-    int forking;
     int nchecks;
     int nfailures;
 };
@@ -81,7 +80,6 @@
                                tcase_teardown_function);
 void tcase_add_test(TCase *tc, tcase_test_function test);
 SRunner *srunner_create(Suite *suite);
-void srunner_set_fork_status(SRunner *runner, int forking);
 void srunner_run_all(SRunner *runner, int verbosity);
 int srunner_ntests_failed(SRunner *runner);
 void srunner_free(SRunner *runner);

Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- runtests.c	6 Mar 2006 14:24:36 -0000	1.63
+++ runtests.c	1 Jul 2006 02:34:50 -0000	1.64
@@ -362,7 +362,7 @@
 
 START_TEST(test_utf16_le_epilog_newline)
 {
-    int first_chunk_bytes = 17;
+    unsigned int first_chunk_bytes = 17;
     char text[] = 
         "\xFF\xFE"                      /* BOM */
         "<\000e\000/\000>\000"          /* document element */
@@ -1411,7 +1411,6 @@
 #endif
 {
     int i, nf;
-    int forking = 0, forking_set = 0;
     int verbosity = CK_NORMAL;
     Suite *s = make_suite();
     SRunner *sr = srunner_create(s);
@@ -1425,21 +1424,11 @@
             verbosity = CK_VERBOSE;
         else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0)
             verbosity = CK_SILENT;
-        else if (strcmp(opt, "-f") == 0 || strcmp(opt, "--fork") == 0) {
-            forking = 1;
-            forking_set = 1;
-        }
-        else if (strcmp(opt, "-n") == 0 || strcmp(opt, "--no-fork") == 0) {
-            forking = 0;
-            forking_set = 1;
-        }
         else {
             fprintf(stderr, "runtests: unknown option '%s'\n", opt);
             return 2;
         }
     }
-    if (forking_set)
-        srunner_set_fork_status(sr, forking ? CK_FORK : CK_NOFORK);
     if (verbosity != CK_SILENT)
         printf("Expat version: %s\n", XML_ExpatVersion());
     srunner_run_all(sr, verbosity);