Mercurial > hg > octave-lyh > gnulib-hg
changeset 9322:ff1decf016ff
Put unit test for filenamecat module into a normal test module.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Thu, 11 Oct 2007 23:44:32 +0200 |
parents | c25260956dfa |
children | 1fe2e97a1130 |
files | ChangeLog lib/filenamecat.c modules/filenamecat-tests tests/test-filenamecat.c |
diffstat | 4 files changed, 78 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-11 Bruno Haible <bruno@clisp.org> + + * modules/filenamecat-tests: New file. + * tests/test-filenamecat.c: New file, extracted from lib/filenamecat.c. + * lib/filenamecat.c: Remove test code. + 2007-10-11 Paul Eggert <eggert@cs.ucla.edu> Simplify and modernize strerror substitute, partly to fix Solaris 8 bug.
--- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -100,41 +100,3 @@ xalloc_die (); return p; } - -#ifdef TEST_FILE_NAME_CONCAT -# include <stdlib.h> -# include <stdio.h> -int -main () -{ - static char const *const tests[][3] = - { - {"a", "b", "a/b"}, - {"a/", "b", "a/b"}, - {"a/", "/b", "a/b"}, - {"a", "/b", "a/b"}, - - {"/", "b", "/b"}, - {"/", "/b", "/b"}, - {"/", "/", "/"}, - {"a", "/", "a/"}, /* this might deserve a diagnostic */ - {"/a", "/", "/a/"}, /* this might deserve a diagnostic */ - {"a", "//b", "a/b"}, - {"", "a", "a"}, /* this might deserve a diagnostic */ - }; - size_t i; - bool fail = false; - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) - { - char *base_in_result; - char const *const *t = tests[i]; - char *res = file_name_concat (t[0], t[1], &base_in_result); - if (strcmp (res, t[2]) != 0) - { - printf ("got %s, expected %s\n", res, t[2]); - fail = true; - } - } - exit (fail ? EXIT_FAILURE : EXIT_SUCCESS); -} -#endif
new file mode 100644 --- /dev/null +++ b/modules/filenamecat-tests @@ -0,0 +1,11 @@ +Files: +tests/test-filenamecat.c + +Depends-on: +stdbool + +configure.ac: + +Makefile.am: +TESTS += test-filenamecat +check_PROGRAMS += test-filenamecat
new file mode 100644 --- /dev/null +++ b/tests/test-filenamecat.c @@ -0,0 +1,61 @@ +/* Test of concatenation of two arbitrary file names. + + Copyright (C) 1996-2007 Free Software Foundation, Inc. + + 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/>. */ + +/* Written by Jim Meyering. */ + +#include <config.h> + +#include "filenamecat.h" + +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +int +main () +{ + static char const *const tests[][3] = + { + {"a", "b", "a/b"}, + {"a/", "b", "a/b"}, + {"a/", "/b", "a/b"}, + {"a", "/b", "a/b"}, + + {"/", "b", "/b"}, + {"/", "/b", "/b"}, + {"/", "/", "/"}, + {"a", "/", "a/"}, /* this might deserve a diagnostic */ + {"/a", "/", "/a/"}, /* this might deserve a diagnostic */ + {"a", "//b", "a/b"}, + {"", "a", "a"}, /* this might deserve a diagnostic */ + }; + unsigned int i; + bool fail = false; + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) + { + char *base_in_result; + char const *const *t = tests[i]; + char *res = file_name_concat (t[0], t[1], &base_in_result); + if (strcmp (res, t[2]) != 0) + { + fprintf (stderr, "test #%u: got %s, expected %s\n", i, res, t[2]); + fail = true; + } + } + exit (fail ? EXIT_FAILURE : EXIT_SUCCESS); +}