X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-pipe-filter-gi2-main.c;h=66a5211111c81bf0f232dd2c92c5586507218fc3;hb=c50edd6462eaaae00f8549f9bad99d4e68b94376;hp=7be285e08198991d540658cbc1ca4395d9c04e91;hpb=8ae6a07d62256797e8ddcc918ff3e4f10ff69417;p=gnulib.git

diff --git a/tests/test-pipe-filter-gi2-main.c b/tests/test-pipe-filter-gi2-main.c
index 7be285e08..66a521111 100644
--- a/tests/test-pipe-filter-gi2-main.c
+++ b/tests/test-pipe-filter-gi2-main.c
@@ -1,6 +1,6 @@
 /* Test harness for pipe-filter-gi.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2013 Free Software Foundation, Inc.
    Written by Paolo Bonzini <bonzini@gnu.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,28 +28,13 @@
 
 #include "full-write.h"
 #include "progname.h"
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 /* 0.1 sec pause */
 static void
 small_nap (void)
 {
-#if HAVE_USLEEP
   usleep (100000);
-#else
-  sleep (1);
-#endif
 }
 
 static char static_buf[5];
@@ -98,7 +83,7 @@ main (int argc, char **argv)
 
     path[0] = "/nonexistent/blah";
     f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, true, false,
-			       prepare_read, ignore_done_read, NULL);
+                               prepare_read, ignore_done_read, NULL);
     small_nap ();
     rc = pipe_filter_gi_write (f, "", 1);
     ASSERT (rc == 127 || rc == -1);
@@ -112,7 +97,7 @@ main (int argc, char **argv)
   {
     path[0] = argv[1];
     f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, false, false,
-			       prepare_read, ignore_done_read, NULL);
+                               prepare_read, ignore_done_read, NULL);
     pipe_filter_gi_write_string (f, "1 -1");
     ASSERT (pipe_filter_gi_close (f) == 1);
     printf ("Test 2 passed.\n");
@@ -125,7 +110,7 @@ main (int argc, char **argv)
 
     path[0] = argv[1];
     f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, false, false,
-			       prepare_read, ignore_done_read, NULL);
+                               prepare_read, ignore_done_read, NULL);
     pipe_filter_gi_write_string (f, "1 -1\n"); /* tell the child to terminate */
     small_nap (); /* let the child terminate */
     rc = pipe_filter_gi_write (f, " ", 1); /* write to a closed pipe */
@@ -142,7 +127,7 @@ main (int argc, char **argv)
   {
     path[0] = argv[1];
     f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, false, true,
-			       prepare_read, output_done_read, NULL);
+                               prepare_read, output_done_read, NULL);
     pipe_filter_gi_write_string (f, "1 50\n");
     pipe_filter_gi_write_string (f, "51\n");
     pipe_filter_gi_write_string (f, "100");