maint: update copyright

[gnulib.git] / tests / test-pipe-filter-ii2-main.c

diff --git a/tests/test-pipe-filter-ii2-main.c b/tests/test-pipe-filter-ii2-main.c
index bada07e..a6d5a1b 100644 (file)
--- 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-2014 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);