* modules/dirname-tests: New test module.

* tests/test-dirname.c: New file, replacing dirname.c
TEST_DIRNAME section that was recently deleted.

diff --git a/ChangeLog b/ChangeLog
index c55c673..d79d830 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-04  Eric Blake  <ebb9@byu.net>
+
+       * modules/dirname-tests: New test module.
+       * tests/test-dirname.c: New file, replacing dirname.c
+       TEST_DIRNAME section that was recently deleted.
+
 2006-07-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/cycle-check (lib_SOURCES): Add same-inode.h.

diff --git a/modules/dirname-tests b/modules/dirname-tests
new file mode 100644 (file)
index 0000000..e539246
--- /dev/null
+++ b/modules/dirname-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-dirname.c
+
+Depends-on:
+strdup
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-dirname
+noinst_PROGRAMS += test-dirname
+test_dirname_SOURCES = test-dirname.c

diff --git a/tests/test-dirname.c b/tests/test-dirname.c
new file mode 100644 (file)
index 0000000..20279d2
--- /dev/null
+++ b/tests/test-dirname.c
@@ -0,0 +1,196 @@
+/* Test the gnulib dirname module.
+   Copyright (C) 2005, 2006 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 2, 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "dirname.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "strdup.h"
+
+const char *program_name = "test-dirname";
+
+struct test {
+  const char *name;    /* Name under test.  */
+  const char *dir;     /* dir_name (name).  */
+  const char *last;    /* last_component (name).  */
+  const char *base;    /* base_name (name).  */
+  const char *stripped;        /* name after strip_trailing_slashes (name).  */
+  bool modified;        /* result of strip_trailing_slashes (name).  */
+  bool absolute;       /* IS_ABSOLUTE_FILE_NAME (name).  */
+};
+
+static struct test tests[] = {
+  {"d/f",      "d",    "f",    "f",    "d/f",  false,  false},
+  {"/d/f",     "/d",   "f",    "f",    "/d/f", false,  true},
+  {"d/f/",     "d",    "f/",   "f/",   "d/f",  true,   false},
+  {"d/f//",    "d",    "f//",  "f/",   "d/f",  true,   false},
+  {"f",                ".",    "f",    "f",    "f",    false,  false},
+  {"/",                "/",    "",     "/",    "/",    false,  true},
+#if DOUBLE_SLASH_IS_DISTINCT_ROOT
+  {"//",       "//",   "",     "//",   "//",   false,  true},
+  {"//d",      "//",   "d",    "d",    "//d",  false,  true},
+#else
+  {"//",       "/",    "",     "/",    "/",    true,   true},
+  {"//d",      "/",    "d",    "d",    "//d",  false,  true},
+#endif
+  {"///",      "/",    "",     "/",    "/",    true,   true},
+  {"///a///",  "/",    "a///", "a/",   "///a", true,   true},
+  /* POSIX requires dirname("") and basename("") to both return ".",
+     but dir_name and base_name are defined differently.  */
+  {"",         ".",    "",     "",     "",     false,  false},
+  {".",                ".",    ".",    ".",    ".",    false,  false},
+  {"..",       ".",    "..",   "..",   "..",   false,  false},
+#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+  {"a\\",      ".",    "a\\",  "a\\",  "a",    true,   false},
+  {"a\\b",     "a",    "b",    "b",    "a\\b", false,  false},
+  {"\\",       "\\",   "",     "\\",   "\\",   false,  true},
+  {"\\/\\",    "\\",   "",     "\\",   "\\",   true,   true},
+  {"\\\\/",    "\\",   "",     "\\",   "\\",   true,   true},
+  {"\\//",     "\\",   "",     "\\",   "\\",   true,   true},
+  {"//\\",     "/",    "",     "/",    "/",    true,   true},
+#else
+  {"a\\",      ".",    "a\\",  "a\\",  "a\\",  false,  false},
+  {"a\\b",     ".",    "a\\b", "a\\b", "a\\b", false,  false},
+  {"\\",       ".",    "\\",   "\\",   "\\",   false,  false},
+  {"\\/\\",    "\\",   "\\",   "\\",   "\\/\\",false,  false},
+  {"\\\\/",    ".",    "\\\\/","\\\\/","\\\\", true,   false},
+  {"\\//",     ".",    "\\//", "\\/",  "\\",   true,   false},
+# if DOUBLE_SLASH_IS_DISTINCT_ROOT
+  {"//\\",     "//",   "\\",   "\\",   "//\\", false,  true},
+# else
+  {"//\\",     "/",    "\\",   "\\",   "//\\", false,  true},
+# endif
+#endif
+#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+# if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+  {"c:",       "c:",   "",     "c:",   "c:",   false,  false},
+  {"c:/",      "c:/",  "",     "c:/",  "c:/",  false,  true},
+  {"c://",     "c:/",  "",     "c:/",  "c:/",  true,   true},
+  {"c:/d",     "c:/",  "d",    "d",    "c:/d", false,  true},
+  {"c://d",    "c:/",  "d",    "d",    "c://d",false,  true},
+  {"c:/d/",    "c:/",  "d/",   "d/",   "c:/d", true,   true},
+  {"c:/d/f",   "c:/d", "f",    "f",    "c:/d/f",false, true},
+  {"c:d",      "c:.",  "d",    "d",    "c:d",  false,  false},
+  {"c:d/",     "c:.",  "d/",   "d/",   "c:d",  true,   false},
+  {"c:d/f",    "c:d",  "f",    "f",    "c:d/f",false,  false},
+  {"a:b:c",    "a:.",  "b:c",  "./b:c","a:b:c",false,  false},
+  {"a/b:c",    "a",    "b:c",  "./b:c","a/b:c",false,  false},
+  {"a/b:c/",   "a",    "b:c/", "./b:c/","a/b:c",true,  false},
+# else /* ! FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE */
+  {"c:",       "c:",   "",     "c:",   "c:",   false,  true},
+  {"c:/",      "c:",   "",     "c:",   "c:",   true,   true},
+  {"c://",     "c:",   "",     "c:",   "c:",   true,   true},
+  {"c:/d",     "c:",   "d",    "d",    "c:/d", false,  true},
+  {"c://d",    "c:",   "d",    "d",    "c://d",false,  true},
+  {"c:/d/",    "c:",   "d/",   "d/",   "c:/d", true,   true},
+  {"c:/d/f",   "c:/d", "f",    "f",    "c:/d/f",false, true},
+  {"c:d",      "c:",   "d",    "d",    "c:d",  false,  true},
+  {"c:d/",     "c:",   "d/",   "d/",   "c:d",  true,   true},
+  {"c:d/f",    "c:d",  "f",    "f",    "c:d/f",false,  true},
+  {"a:b:c",    "a:",   "b:c",  "./b:c","a:b:c",false,  true},
+  {"a/b:c",    "a",    "b:c",  "./b:c","a/b:c",false,  false},
+  {"a/b:c/",   "a",    "b:c/", "./b:c/","a/b:c",true,  false},
+# endif
+#else /* ! FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX */
+  {"c:",       ".",    "c:",   "c:",   "c:",   false,  false},
+  {"c:/",      ".",    "c:/",  "c:/",  "c:",   true,   false},
+  {"c://",     ".",    "c://", "c:/",  "c:",   true,   false},
+  {"c:/d",     "c:",   "d",    "d",    "c:/d", false,  false},
+  {"c://d",    "c:",   "d",    "d",    "c://d",false,  false},
+  {"c:/d/",    "c:",   "d/",   "d/",   "c:/d", true,   false},
+  {"c:/d/f",   "c:/d", "f",    "f",    "c:/d/f",false, false},
+  {"c:d",      ".",    "c:d",  "c:d",  "c:d",  false,  false},
+  {"c:d/",     ".",    "c:d/", "c:d/", "c:d",  true,   false},
+  {"c:d/f",    "c:d",  "f",    "f",    "c:d/f",false,  false},
+  {"a:b:c",    ".",    "a:b:c","a:b:c","a:b:c",false,  false},
+  {"a/b:c",    "a",    "b:c",  "b:c",  "a/b:c",false,  false},
+  {"a/b:c/",   "a",    "b:c/", "b:c/", "a/b:c",true,   false},
+#endif
+  {"1:",       ".",    "1:",   "1:",   "1:",   false,  false},
+  {"1:/",      ".",    "1:/",  "1:/",  "1:",   true,   false},
+  {"/:",       "/",    ":",    ":",    "/:",   false,  true},
+  {"/:/",      "/",    ":/",   ":/",   "/:",   true,   true},
+  /* End sentinel.  */
+  {NULL,       NULL,   NULL,   NULL,   NULL,   false,  false}
+};
+
+int
+main ()
+{
+  struct test *t;
+  bool ok = true;
+
+  for (t = tests; t->name; t++)
+    {
+      char *dir = dir_name (t->name);
+      int dirlen = dir_len (t->name);
+      char *last = last_component (t->name);
+      char *base = base_name (t->name);
+      int baselen = base_len (base);
+      char *stripped = strdup (t->name);
+      bool modified = strip_trailing_slashes (stripped);
+      bool absolute = IS_ABSOLUTE_FILE_NAME (t->name);
+      if (! (strcmp (dir, t->dir) == 0
+            && (dirlen == strlen (dir)
+                || (dirlen + 1 == strlen (dir) && dir[dirlen] == '.'))))
+       {
+         ok = false;
+         printf ("dir_name `%s': got `%s' len %d, expected `%s' len %d\n",
+                 t->name, dir, dirlen, t->dir, strlen (t->dir));
+       }
+      if (strcmp (last, t->last))
+       {
+         ok = false;
+         printf ("last_component `%s': got `%s', expected `%s'\n",
+                 t->name, last, t->last);
+       }
+      if (! (strcmp (base, t->base) == 0
+            && (baselen == strlen (base)
+                || (baselen + 1 == strlen (base)
+                    && ISSLASH (base[baselen])))))
+       {
+         ok = false;
+         printf ("base_name `%s': got `%s' len %d, expected `%s' len %d\n",
+                 t->name, base, baselen, t->base, strlen (t->base));
+       }
+      if (strcmp (stripped, t->stripped) || modified != t->modified)
+       {
+         ok = false;
+         printf ("strip_trailing_slashes `%s': got %s %s, expected %s %s\n",
+                 t->name, stripped, modified ? "changed" : "unchanged",
+                 t->stripped, t->modified ? "changed" : "unchanged");
+       }
+      if (t->absolute != absolute)
+       {
+         ok = false;
+         printf ("`%s': got %s, expected %s\n", t->name,
+                 absolute ? "absolute" : "relative",
+                 t->absolute ? "absolute" : "relative");
+       }
+      free (dir);
+      free (base);
+      free (stripped);
+    }
+  return ok ? 0 : 1;
+}