* add CK_FORK_GETENV to enum fork_status and delete CK_FORK_UNSPECIFIED

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@433 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/src/check.c b/src/check.c
index 869bfefdd9f6628aedc8cfb8137a77a832ebbb5a..b86e9fa16687dfecd38908ac3fafebdef03dea01 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -270,7 +270,7 @@ SRunner *srunner_create (Suite *s)
   sr->log_fname = NULL;
   sr->xml_fname = NULL;
   sr->loglst = NULL;
-  sr->fstat = CK_FORK_UNSPECIFIED;
+  sr->fstat = CK_FORK_GETENV;
   return sr;
 }
 
@@ -412,7 +412,7 @@ static int _fstat = CK_FORK;
 
 void set_fork_status (enum fork_status fstat)
 {
-  if (fstat == CK_FORK || fstat == CK_NOFORK)
+  if (fstat == CK_FORK || fstat == CK_NOFORK || fstat == CK_FORK_GETENV)
     _fstat = fstat;
   else
     eprintf ("Bad status in set_fork_status", __FILE__, __LINE__);

diff --git a/src/check.h.in b/src/check.h.in
index f7683bdc4cce022a66ceaa083071b2e695cb5f08..a055802b4886737dddfed54adb5de4c6e6333991 100644 (file)
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -269,7 +269,7 @@ typedef struct TestResult TestResult;
 
 /* accessors for tr fields */
 enum ck_result_ctx {
-  CK_CTX_INVALID,
+  CK_CTX_INVALID, /* Default value; should not encounter this */
   CK_CTX_SETUP,
   CK_CTX_TEST,
   CK_CTX_TEARDOWN
@@ -369,8 +369,9 @@ const char * CK_EXPORT srunner_xml_fname (SRunner *sr);
 
 /* Control forking */
 enum fork_status {
-  CK_FORK,
-  CK_NOFORK
+  CK_FORK_GETENV, /* look in the environment for CK_FORK */
+  CK_FORK,        /* call fork to run tests */
+  CK_NOFORK       /* don't call fork */
 };
  
 /* Get the current fork status */

diff --git a/src/check_impl.h b/src/check_impl.h
index 2a0dde9fb560522edd7926e13e7658d39b23b48d..c8293b56f4c7cc3ac23e0b1280480d5bbece1d4f 100644 (file)
--- a/src/check_impl.h
+++ b/src/check_impl.h
@@ -27,12 +27,6 @@
    Include stdio.h & list.h before this header
 */
 
-/* magic values */
-
-/* Unspecified fork status, used only internally */
-#define  CK_FORK_UNSPECIFIED -1
-
-
 typedef struct TF {
   TFun fn;
   int loop_start;

diff --git a/src/check_run.c b/src/check_run.c
index 611e8d0958b9784215f52f3c9915aa2821c73e39..c540c7bbc4b2d77836cbaa7e3b859355e02f4aa4 100644 (file)
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -497,7 +497,7 @@ static char *pass_msg (void)
 
 enum fork_status srunner_fork_status (SRunner *sr)
 {
-  if (sr->fstat == CK_FORK_UNSPECIFIED) {
+  if (sr->fstat == CK_FORK_GETENV) {
     char *env = getenv ("CK_FORK");
     if (env == NULL)
       return CK_FORK;