--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-03-10  Bruno Haible  <bruno@clisp.org>
 
+	* modules/canonicalize-lgpl-tests: New file.
+	* tests/test-canonicalize-lgpl.sh: New file.
+	* tests/test-canonicalize-lgpl.c: New file.
+
 	* modules/c-strcase-tests: New file.
 	* tests/test-c-strcase.sh: New file.
 	* tests/test-c-strcasecmp.c: New file.

new file mode 100644
--- /dev/null
+++ b/modules/canonicalize-lgpl-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-canonicalize-lgpl.sh
+tests/test-canonicalize-lgpl.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-canonicalize-lgpl.sh
+TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
+check_PROGRAMS += test-canonicalize-lgpl
+EXTRA_DIST += test-canonicalize-lgpl.sh
+

new file mode 100644
--- /dev/null
+++ b/tests/test-canonicalize-lgpl.c
@@ -0,0 +1,75 @@
+/* Test of execution of program termination handlers.
+   Copyright (C) 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 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.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "canonicalize.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) if (!(expr)) abort ();
+
+int
+main ()
+{
+  /* Check that the symbolic link to a file can be resolved.  */
+  {
+    char *result1 = canonicalize_file_name ("t-can-lgpl.tmp/huk");
+    char *result2 = canonicalize_file_name ("t-can-lgpl.tmp/tra");
+    ASSERT (result1 != NULL);
+    ASSERT (result2 != NULL);
+    ASSERT (strcmp (result1, result2) == 0);
+    ASSERT (strcmp (result1 + strlen (result1) - 19, "/t-can-lgpl.tmp/tra") == 0);
+    free (result1);
+    free (result2);
+  }
+
+  /* Check that the symbolic link to a directory can be resolved.  */
+  {
+    char *result1 = canonicalize_file_name ("t-can-lgpl.tmp/plo");
+    char *result2 = canonicalize_file_name ("t-can-lgpl.tmp/bef");
+    char *result3 = canonicalize_file_name ("t-can-lgpl.tmp/lum");
+    ASSERT (result1 != NULL);
+    ASSERT (result2 != NULL);
+    ASSERT (result3 != NULL);
+    ASSERT (strcmp (result1, result2) == 0);
+    ASSERT (strcmp (result2, result3) == 0);
+    ASSERT (strcmp (result1 + strlen (result1) - 19, "/t-can-lgpl.tmp/lum") == 0);
+    free (result1);
+    free (result2);
+    free (result3);
+  }
+
+  /* Check that a symbolic link to a nonexistent file yields NULL.  */
+  {
+    char *result = canonicalize_file_name ("t-can-lgpl.tmp/ouk");
+    ASSERT (result == NULL);
+  }
+
+  /* Check that a loop of symbolic links is detected.  */
+  {
+    char *result = canonicalize_file_name ("ise");
+    ASSERT (result == NULL);
+  }
+
+  return 0;
+}

new file mode 100755
--- /dev/null
+++ b/tests/test-canonicalize-lgpl.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles t-can-lgpl.tmp ise"
+mkdir t-can-lgpl.tmp
+ln -s t-can-lgpl.tmp/ket ise \
+  || { echo "Skipping test: symbolic links not supported on this filesystem"
+       rm -fr $tmpfiles
+       exit 77
+     }
+(cd t-can-lgpl.tmp \
+ && ln -s bef plo \
+ && ln -s tra huk \
+ && ln -s lum bef \
+ && ln -s wum ouk \
+ && ln -s ../ise ket \
+ && echo > tra \
+ && mkdir lum
+) || exit 1
+
+./test-canonicalize-lgpl${EXEEXT}
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result