- 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

3 files changed, 1 insertions, 20 deletions

diff --git a/tests/minicheck.c b/tests/minicheck.c
index 25fbf85..c059f63 100644
--- a/tests/minicheck.c
+++ b/tests/minicheck.c
@@ -82,12 +82,6 @@ srunner_create(Suite *suite)
     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;
diff --git a/tests/minicheck.h b/tests/minicheck.h
index 33ce396..f846bea 100644
--- a/tests/minicheck.h
+++ b/tests/minicheck.h
@@ -42,7 +42,6 @@ typedef struct TCase TCase;
 
 struct SRunner {
     Suite *suite;
-    int forking;
     int nchecks;
     int nfailures;
 };
@@ -81,7 +80,6 @@ void tcase_add_checked_fixture(TCase *,
                                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);
diff --git a/tests/runtests.c b/tests/runtests.c
index a57f89b..68ccdcc 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -362,7 +362,7 @@ END_TEST
 
 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 @@ main(int argc, char *argv[])
 #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 @@ main(int argc, char *argv[])
             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);