bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: fnmatch: remove incompatibility between fnmatch-posix and fnmatch-gn


From: Simon Josefsson
Subject: Re: fnmatch: remove incompatibility between fnmatch-posix and fnmatch-gnu
Date: Mon, 04 May 2009 09:16:02 +0200
User-agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.93 (gnu/linux)

Simon Josefsson <address@hidden> writes:

> Bruno Haible <address@hidden> writes:
>
>> Simon Josefsson wrote:
>>> Please install as far as I'm concerned.
>>
>> Done. Thanks also for your fnmatch.m4 fix.
>
> I also noticed there were no self-test for fnmatch.  Pushed.

Same for glob.  Also pushed.

/Simon

>From e30d02286081804e8eeeac42c17973446fc5aa07 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Mon, 4 May 2009 09:15:34 +0200
Subject: [PATCH] New module glob-tests.

---
 ChangeLog          |    5 +++
 modules/glob-tests |    6 ++++
 tests/test-glob.c  |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 0 deletions(-)
 create mode 100644 modules/glob-tests
 create mode 100644 tests/test-glob.c

diff --git a/ChangeLog b/ChangeLog
index cd32b23..02062fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-04  Simon Josefsson  <address@hidden>
 
+       * modules/glob-tests: New module.
+       * tests/test-glob.c: Add.
+
+2009-05-04  Simon Josefsson  <address@hidden>
+
        * modules/fnmatch-tests: New module.
        * tests/test-fnmatch.c: Add.
 
diff --git a/modules/glob-tests b/modules/glob-tests
new file mode 100644
index 0000000..f1b5c38
--- /dev/null
+++ b/modules/glob-tests
@@ -0,0 +1,6 @@
+Files:
+tests/test-glob.c
+
+Makefile.am:
+TESTS += test-glob
+check_PROGRAMS += test-glob
diff --git a/tests/test-glob.c b/tests/test-glob.c
new file mode 100644
index 0000000..cd1ea4d
--- /dev/null
+++ b/tests/test-glob.c
@@ -0,0 +1,84 @@
+/* Test of glob/globfree functions.
+   Copyright (C) 2009 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 Simon Josefsson <address@hidden>, 2009.  */
+
+#include <config.h>
+
+#include <glob.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ASSERT(expr)                                                   \
+  do                                                                   \
+    {                                                                  \
+      if (!(expr))                                                     \
+       {                                                               \
+         fprintf (stderr, "%s:%d: assertion failed\n",                 \
+                  __FILE__, __LINE__);                                 \
+         fflush (stderr);                                              \
+         abort ();                                                     \
+       }                                                               \
+    }                                                                  \
+  while (0)
+
+#define GL_NO_SUCH_FILE "/gnulib-magic-does-not-exist"
+
+int
+main ()
+{
+  int res;
+  glob_t g;
+
+  /* Make sure glob_t struct members exists. */
+  ASSERT (sizeof (g.gl_pathc));
+  ASSERT (sizeof (g.gl_pathv));
+  ASSERT (sizeof (g.gl_offs));
+
+  res = glob (".", 0, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc == 1);
+  globfree (&g);
+
+  res = glob (".", GLOB_NOSORT, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc == 1);
+  globfree (&g);
+
+  res = glob (".", GLOB_MARK, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc == 1);
+
+  res = glob (".", GLOB_APPEND, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc == 2);
+  globfree (&g);
+
+  res = glob (".", GLOB_NOESCAPE, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc == 1);
+  globfree (&g);
+
+  res = glob ("./*", 0, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc >= 1);
+  globfree (&g);
+
+  res = glob (GL_NO_SUCH_FILE, 0, NULL, &g);
+  ASSERT (res == GLOB_NOMATCH);
+
+  res = glob (GL_NO_SUCH_FILE, GLOB_NOCHECK, NULL, &g);
+  ASSERT (res == 0 && g.gl_pathc == 1);
+  ASSERT (strcmp (g.gl_pathv[0], GL_NO_SUCH_FILE) == 0);
+  globfree (&g);
+
+  return 0;
+}
-- 
1.6.2.4





reply via email to

[Prev in Thread] Current Thread [Next in Thread]