Merge branch 'upstream'

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

diff --git a/tests/test-pipe-filter-gi1.c b/tests/test-pipe-filter-gi1.c
index 95b9aa0..00cbb06 100644 (file)
--- a/tests/test-pipe-filter-gi1.c
+++ b/tests/test-pipe-filter-gi1.c
@@ -83,16 +83,19 @@ done_read (void *data_read, size_t num_bytes_read, void *private_data)
 int
 main (int argc, char *argv[])
 {
+  const char *tr_program;
   const char *input_filename;
   size_t input_size;
   char *input;
 
   set_program_name (argv[0]);
 
-  ASSERT (argc == 2);
+  ASSERT (argc == 3);
+
+  tr_program = argv[1];
 
   /* Read some text from a file.  */
-  input_filename = argv[1];
+  input_filename = argv[2];
   input = read_binary_file (input_filename, &input_size);
   ASSERT (input != NULL);
 
@@ -106,12 +109,12 @@ main (int argc, char *argv[])
     l.input = input;
     l.nread = 0;
 
-    argv[0] = "tr";
+    argv[0] = tr_program;
     argv[1] = "a-z";
     argv[2] = "A-Z";
     argv[3] = NULL;
 
-    f = pipe_filter_gi_create ("tr", "tr", argv, false, true,
+    f = pipe_filter_gi_create ("tr", tr_program, argv, false, true,
                               prepare_read, done_read, &l);
     ASSERT (f != NULL);
     result = pipe_filter_gi_write (f, input, input_size);