X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-stdlib.c;h=7eeb410d339e33a7d2194ec0219215ce28112485;hb=5b1ef1fd0197758898074b20a052b7bfee9a1b25;hp=8066b0525ddecf0ea64552a541e77b190102db5c;hpb=91935a638321ad61c876153d149ee09fc701c2db;p=gnulib.git

diff --git a/tests/test-stdlib.c b/tests/test-stdlib.c
index 8066b0525..7eeb410d3 100644
--- a/tests/test-stdlib.c
+++ b/tests/test-stdlib.c
@@ -1,5 +1,5 @@
 /* Test of <stdlib.h> substitute.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,26 +38,17 @@ static int exitcode = EXIT_SUCCESS;
    per POSIX 2008.  */
 verify (sizeof NULL == sizeof (void *));
 
+#if GNULIB_TEST_SYSTEM_POSIX
+# include "test-sys_wait.h"
+#else
+# define test_sys_wait_macros() 0
+#endif
+
 int
 main (void)
 {
-  /* Check subset of <sys/wait.h> macros that must be visible here.
-     Note that some of these macros are only portable when operating
-     on an lvalue.  */
-  int i;
-  for (i = 0; i < 0x10000; i = (i ? i << 1 : 1))
-    if (!!WIFSIGNALED (i) + !!WIFEXITED (i) + !!WIFSTOPPED (i) != 1)
-      return 1;
-  i = WEXITSTATUS (i) + WSTOPSIG (i) + WTERMSIG (i);
-
-  switch (i)
-    {
-#if 0
-  /* Gnulib doesn't guarantee these, yet.  */
-    case WNOHANG:
-    case WUNTRACED:
-#endif
-      break;
-    }
-  return 0;
+  if (test_sys_wait_macros ())
+    return 1;
+
+  return exitcode;
 }