canonicalize: allow cross-testing from cygwin to mingw

* modules/canonicalize-tests (configure.ac): Define HAVE_SYMLINK.
(Makefile.am): Pass it through TESTS_ENVIRONMENT.
* modules/canonicalize-lgpl-tests (configure.ac, Makefile.am):
Likewise.
* tests/test-canonicalize.sh: Also skip test if 'ln -s' works, but
target does not support symlinks.
* tests/test-canonicalize-lgpl.sh: Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 2998bb7c7151077729450a70f795567853b57ea5..f8745fea13458d813bee3a37d026ecdbc736d2d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-08-31  Eric Blake  <ebb9@byu.net>
 
+       canonicalize: allow cross-testing from cygwin to mingw
+       * modules/canonicalize-tests (configure.ac): Define HAVE_SYMLINK.
+       (Makefile.am): Pass it through TESTS_ENVIRONMENT.
+       * modules/canonicalize-lgpl-tests (configure.ac, Makefile.am):
+       Likewise.
+       * tests/test-canonicalize.sh: Also skip test if 'ln -s' works, but
+       target does not support symlinks.
+       * tests/test-canonicalize-lgpl.sh: Likewise.
+
        chown: avoid compilation warning on mingw
        * m4/chown.m4 (gl_FUNC_CHOWN): Recognize missing chown.
        * lib/chown.c (rpl_chown) [!HAVE_CHOWN]: Always return failure on

diff --git a/modules/canonicalize-lgpl-tests b/modules/canonicalize-lgpl-tests
index 5028ee7e6b907185f308f59912ec188e5f1ee35b..ac40166d45f139ac394bfd43f27c503ef02b39b7 100644 (file)
--- a/modules/canonicalize-lgpl-tests
+++ b/modules/canonicalize-lgpl-tests
@@ -5,9 +5,12 @@ tests/test-canonicalize-lgpl.c
 Depends-on:
 
 configure.ac:
+AC_CHECK_FUNCS_ONCE([symlink])
+HAVE_SYMLINK=$ac_cv_func_symlink
+AC_SUBST([HAVE_SYMLINK])
 
 Makefile.am:
 TESTS += test-canonicalize-lgpl.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
+TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' HAVE_SYMLINK='$(HAVE_SYMLINK)'
 check_PROGRAMS += test-canonicalize-lgpl
 test_canonicalize_lgpl_LDADD = $(LDADD)

diff --git a/modules/canonicalize-tests b/modules/canonicalize-tests
index 875984e1083906593cfa8d7597c352153a59631d..e8dfec72042d8210636333ed6c809acf1d99d14d 100644 (file)
--- a/modules/canonicalize-tests
+++ b/modules/canonicalize-tests
@@ -5,9 +5,12 @@ tests/test-canonicalize.c
 Depends-on:
 
 configure.ac:
+AC_CHECK_FUNCS_ONCE([symlink])
+HAVE_SYMLINK=$ac_cv_func_symlink
+AC_SUBST([HAVE_SYMLINK])
 
 Makefile.am:
 TESTS += test-canonicalize.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
+TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' HAVE_SYMLINK='$(HAVE_SYMLINK)'
 check_PROGRAMS += test-canonicalize
 test_canonicalize_LDADD = $(LDADD) @LIBINTL@

diff --git a/tests/test-canonicalize-lgpl.sh b/tests/test-canonicalize-lgpl.sh
index 54d30b737ce5a1034a1fadcd71abe10be7041ab6..e439b7a151dda81fcdea80e57ef89bb4fedc6ffd 100755 (executable)
--- a/tests/test-canonicalize-lgpl.sh
+++ b/tests/test-canonicalize-lgpl.sh
@@ -5,7 +5,8 @@ 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 \
+test "x$HAVE_SYMLINK" = xyes \
+  && ln -s t-can-lgpl.tmp/ket ise \
   || { echo "Skipping test: symbolic links not supported on this filesystem"
        rm -fr $tmpfiles
        exit 77

diff --git a/tests/test-canonicalize.sh b/tests/test-canonicalize.sh
index 0ef91f308ea05ba433cc46a9f2b33c7253182bab..a4ab9626f478c8ed42087e51ddd5805d225c8012 100755 (executable)
--- a/tests/test-canonicalize.sh
+++ b/tests/test-canonicalize.sh
@@ -5,7 +5,8 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles t-can.tmp ise"
 mkdir t-can.tmp
-ln -s t-can.tmp/ket ise \
+test "x$HAVE_SYMLINK" = xyes \
+  && ln -s t-can.tmp/ket ise \
   || { echo "Skipping test: symbolic links not supported on this filesystem"
        rm -fr $tmpfiles
        exit 77