diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules/pipe-filter-gi-tests | 23 | ||||
| -rw-r--r-- | tests/test-pipe-filter-gi1.c | 125 | ||||
| -rwxr-xr-x | tests/test-pipe-filter-gi1.sh | 7 | ||||
| -rw-r--r-- | tests/test-pipe-filter-gi2-child.c | 43 | ||||
| -rw-r--r-- | tests/test-pipe-filter-gi2-main.c | 155 | ||||
| -rwxr-xr-x | tests/test-pipe-filter-gi2.sh | 32 |
7 files changed, 393 insertions, 0 deletions
@@ -1,6 +1,14 @@ 2009-08-02 Paolo Bonzini <bonzini@gnu.org> Bruno Haible <bruno@clisp.org> + Tests for module 'pipe-filter-gi'. + * modules/pipe-filter-gi-tests: New file. + * tests/test-pipe-filter-gi1.sh: New file. + * tests/test-pipe-filter-gi1.c: New file. + * tests/test-pipe-filter-gi2.sh: New file. + * tests/test-pipe-filter-gi2-main.c: New file. + * tests/test-pipe-filter-gi2-child.c: New file. + New module 'pipe-filter-gi'. * lib/pipe-filter-gi.c: New file. * modules/pipe-filter-gi: New file. diff --git a/modules/pipe-filter-gi-tests b/modules/pipe-filter-gi-tests new file mode 100644 index 0000000000..9b16033e62 --- /dev/null +++ b/modules/pipe-filter-gi-tests @@ -0,0 +1,23 @@ +Files: +tests/test-pipe-filter-gi1.sh +tests/test-pipe-filter-gi1.c +tests/test-vasnprintf-posix.c +tests/test-pipe-filter-gi2.sh +tests/test-pipe-filter-gi2-main.c +tests/test-pipe-filter-gi2-child.c + +Depends-on: +binary-io +c-ctype +read-file +full-write +sleep +progname + +configure.ac: +AC_CHECK_FUNCS_ONCE([usleep]) + +Makefile.am: +TESTS += test-pipe-filter-gi1.sh test-pipe-filter-gi2.sh +TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' +check_PROGRAMS += test-pipe-filter-gi1 test-pipe-filter-gi2-main test-pipe-filter-gi2-child diff --git a/tests/test-pipe-filter-gi1.c b/tests/test-pipe-filter-gi1.c new file mode 100644 index 0000000000..95b9aa0cd9 --- /dev/null +++ b/tests/test-pipe-filter-gi1.c @@ -0,0 +1,125 @@ +/* Test of filtering of data through a subprocess. + Copyright (C) 2009 Free Software Foundation, Inc. + Written by Bruno Haible <haible@clisp.cons.org>, 2009. + + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include "pipe-filter.h" + +#include <stdio.h> +#include <stdlib.h> + +#include "binary-io.h" +#include "c-ctype.h" +#include "read-file.h" +#include "progname.h" + +#define ASSERT(expr) \ + do \ + { \ + if (!(expr)) \ + { \ + fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ + fflush (stderr); \ + abort (); \ + } \ + } \ + while (0) + + +/* Pipe a text file through 'tr a-z A-Z', which converts ASCII characters from + lower case to upper case. */ + +struct locals +{ + const char *input; + size_t nread; + char buf[19]; +}; + +static void * +prepare_read (size_t *num_bytes_p, void *private_data) +{ + struct locals *l = (struct locals *) private_data; + *num_bytes_p = sizeof (l->buf); + return l->buf; +} + +static void +done_read (void *data_read, size_t num_bytes_read, void *private_data) +{ + struct locals *l = (struct locals *) private_data; + const char *p = l->input + l->nread; + const char *q = (const char *) data_read; + size_t i; + + for (i = 0; i < num_bytes_read; i++, q++) + { + /* Handle conversion NL -> CRLF possibly done by the child process. */ + if (!(O_BINARY && *q == '\r')) + { + char orig = *p; + char expected = c_toupper (orig); + ASSERT (*q == expected); + p++; + } + } + l->nread = p - l->input; +} + +int +main (int argc, char *argv[]) +{ + const char *input_filename; + size_t input_size; + char *input; + + set_program_name (argv[0]); + + ASSERT (argc == 2); + + /* Read some text from a file. */ + input_filename = argv[1]; + input = read_binary_file (input_filename, &input_size); + ASSERT (input != NULL); + + /* Convert it to uppercase, line by line. */ + { + const char *argv[4]; + struct locals l; + struct pipe_filter_gi *f; + int result; + + l.input = input; + l.nread = 0; + + argv[0] = "tr"; + argv[1] = "a-z"; + argv[2] = "A-Z"; + argv[3] = NULL; + + f = pipe_filter_gi_create ("tr", "tr", argv, false, true, + prepare_read, done_read, &l); + ASSERT (f != NULL); + result = pipe_filter_gi_write (f, input, input_size); + ASSERT (result == 0); + result = pipe_filter_gi_close (f); + ASSERT (result == 0); + ASSERT (l.nread == input_size); + } + + return 0; +} diff --git a/tests/test-pipe-filter-gi1.sh b/tests/test-pipe-filter-gi1.sh new file mode 100755 index 0000000000..dfd3eee295 --- /dev/null +++ b/tests/test-pipe-filter-gi1.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# A small file. +./test-pipe-filter-gi1${EXEEXT} "${srcdir}/test-pipe-filter-gi1.sh" || exit 1 +# A medium-sized file. +./test-pipe-filter-gi1${EXEEXT} "${srcdir}/test-pipe-filter-gi1.c" || exit 1 +# A large file. +./test-pipe-filter-gi1${EXEEXT} "${srcdir}/test-vasnprintf-posix.c" || exit 1 diff --git a/tests/test-pipe-filter-gi2-child.c b/tests/test-pipe-filter-gi2-child.c new file mode 100644 index 0000000000..858ac26076 --- /dev/null +++ b/tests/test-pipe-filter-gi2-child.c @@ -0,0 +1,43 @@ +/* Child program invoked by test-pipe-filter-gi2-main. + + Copyright (C) 2009 Free Software Foundation, Inc. + Written by Paolo Bonzini <bonzini@gnu.org>, 2009. + + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> + +int +main () +{ + /* Repeatedly: Read two integers i and j, then output all integers in the + range i..j, one per line. */ + for (;;) + { + int i, j; + + if (scanf (" %d", &i) != 1) + break; + if (scanf (" %d", &j) != 1) + break; + if (j == -1) + exit (i); + while (i <= j) + printf ("abcdefghijklmnopqrstuvwxyz%d\n", i++); + } + exit (0); +} diff --git a/tests/test-pipe-filter-gi2-main.c b/tests/test-pipe-filter-gi2-main.c new file mode 100644 index 0000000000..7be285e081 --- /dev/null +++ b/tests/test-pipe-filter-gi2-main.c @@ -0,0 +1,155 @@ +/* Test harness for pipe-filter-gi. + + Copyright (C) 2009 Free Software Foundation, Inc. + Written by Paolo Bonzini <bonzini@gnu.org>, 2009. + + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include "pipe-filter.h" + +#include <stdio.h> +#include <errno.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> + +#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) + +/* 0.1 sec pause */ +static void +small_nap (void) +{ +#if HAVE_USLEEP + usleep (100000); +#else + sleep (1); +#endif +} + +static char static_buf[5]; + +static void * +prepare_read (size_t *num_bytes_p, void *private_data) +{ + *num_bytes_p = sizeof (static_buf); + return static_buf; +} + +/* Callback that ignores the data that has been read. */ + +static void +ignore_done_read (void *data_read, size_t num_bytes_read, void *private_data) +{ +} + +/* Callback that outputs the data that has been read. */ + +static void +output_done_read (void *data_read, size_t num_bytes_read, void *private_data) +{ + full_write (STDOUT_FILENO, data_read, num_bytes_read); +} + +static void +pipe_filter_gi_write_string (struct pipe_filter_gi *f, const char *string) +{ + pipe_filter_gi_write (f, string, strlen (string)); +} + +int +main (int argc, char **argv) +{ + struct pipe_filter_gi *f; + const char *path[] = { NULL, NULL }; + + set_program_name (argv[0]); + + ASSERT (argc == 2); + + /* Test writing to a nonexistent program traps sooner or later. */ + { + int rc; + + path[0] = "/nonexistent/blah"; + f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, true, false, + prepare_read, ignore_done_read, NULL); + small_nap (); + rc = pipe_filter_gi_write (f, "", 1); + ASSERT (rc == 127 || rc == -1); + rc = pipe_filter_gi_close (f); + ASSERT (rc == 127 || rc == -1); + printf ("Test 1 passed.\n"); + fflush (stdout); + } + + /* Test returning the exit status. */ + { + path[0] = argv[1]; + f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, false, false, + 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"); + fflush (stdout); + } + + /* Same, but test returning the status in pipe_filter_gi_write. */ + { + int rc; + + path[0] = argv[1]; + f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, false, false, + 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 */ + ASSERT (rc == -1 && errno == EPIPE); + /* Closing the filter must report same error again, for consistency with + pipe_filter_ii_execute. The subprocess' exit status is not returned. */ + rc = pipe_filter_gi_close (f); + ASSERT (rc == -1 && errno == EPIPE); + printf ("Test 3 passed.\n"); + fflush (stdout); + } + + /* Now test asynchronous I/O. */ + { + path[0] = argv[1]; + f = pipe_filter_gi_create ("pipe-filter-test", path[0], path, false, true, + 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"); + ASSERT (pipe_filter_gi_close (f) == 0); + printf ("Test 4 passed.\n"); + fflush (stdout); + } + + return 0; +} diff --git a/tests/test-pipe-filter-gi2.sh b/tests/test-pipe-filter-gi2.sh new file mode 100755 index 0000000000..31d2c7e73a --- /dev/null +++ b/tests/test-pipe-filter-gi2.sh @@ -0,0 +1,32 @@ +#! /bin/sh + +# pipe-filter test driver. +# +# Copyright (C) 2009 Free Software Foundation, Inc. +# Written by Paolo Bonzini <bonzini@gnu.org>, 2009. +# +# 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +./test-pipe-filter-gi2-main${EXEEXT} ./test-pipe-filter-gi2-child${EXEEXT} | { + set -e + read a && test "$a" = "Test 1 passed." + read a && test "$a" = "Test 2 passed." + read a && test "$a" = "Test 3 passed." + i=1 + while test $i -le 100; do + read a && test "$a" = "abcdefghijklmnopqrstuvwxyz$i" + i=`expr $i + 1` + done + read a && test "$a" = "Test 4 passed." +} |