X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-pipe-filter-ii2-main.c;h=38cb01d3832749eeb232652c7804b9f5787b0725;hb=e73b278d326a9707a8d167fd48a78093051e964d;hp=bada07e9422c6c0af4f24fa2a64585c3d8732e70;hpb=948b2bc1363ece53b0a9df2742ddd03d37308f69;p=gnulib.git

diff --git a/tests/test-pipe-filter-ii2-main.c b/tests/test-pipe-filter-ii2-main.c
index bada07e94..38cb01d38 100644
--- a/tests/test-pipe-filter-ii2-main.c
+++ b/tests/test-pipe-filter-ii2-main.c
@@ -1,6 +1,6 @@
 /* Test harness for pipe-filter-ii.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2011 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,18 +28,7 @@
 
 #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"
 
 struct locals
 {
@@ -113,9 +102,9 @@ main (int argc, char **argv)
     l.nread = 0;
     path[0] = "/nonexistent/blah";
     rc = pipe_filter_ii_execute ("pipe-filter-test", path[0], path, true, false,
-				 prepare_write, done_write,
-				 prepare_read, ignore_done_read,
-				 &l);
+                                 prepare_write, done_write,
+                                 prepare_read, ignore_done_read,
+                                 &l);
     ASSERT (rc == 127 || rc == -1);
     printf ("Test 1 passed.\n");
     fflush (stdout);
@@ -132,9 +121,9 @@ main (int argc, char **argv)
     l.nread = 0;
     path[0] = argv[1];
     rc = pipe_filter_ii_execute ("pipe-filter-test", path[0], path, false, false,
-				 prepare_write, done_write,
-				 prepare_read, ignore_done_read,
-				 &l);
+                                 prepare_write, done_write,
+                                 prepare_read, ignore_done_read,
+                                 &l);
     ASSERT (rc == 1);
     printf ("Test 2 passed.\n");
     fflush (stdout);
@@ -151,9 +140,9 @@ main (int argc, char **argv)
     l.nread = 0;
     path[0] = argv[1];
     rc = pipe_filter_ii_execute ("pipe-filter-test", path[0], path, false, true,
-				 prepare_write, done_write,
-				 prepare_read, output_done_read,
-				 &l);
+                                 prepare_write, done_write,
+                                 prepare_read, output_done_read,
+                                 &l);
     ASSERT (rc == 0);
     printf ("Test 3 passed.\n");
     fflush (stdout);