* tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
instead of respectively `test -e FILE' and `test ! -e FILE',
since Solaris Sh doesn't grok the latter. Do not SKIP the test
if the shell doesn't support `test -e'.
Regards,
Stefano
From d294e89fcdbfc7b5abf92ee9031647460eec490d Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Thu, 6 May 2010 18:12:25 +0200
Subject: [PATCH] Fix conflnk3.test to work with Solaris/Heirloom Sh.
* tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
instead of respectively `test -e FILE' and `test ! -e FILE',
since Solaris Sh doesn't grok the latter. Do not SKIP the test
if the shell doesn't support `test -e'.
---
ChangeLog | 7 +++++++
tests/conflnk3.test | 39 +++++++++++++++++----------------------
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71b0d9b..320f0a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-06 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
+ instead of respectively `test -e FILE' and `test ! -e FILE',
+ since Solaris Sh doesn't grok the latter. Do not SKIP the test
+ if the shell doesn't support `test -e'.
+
2010-04-25 Ralf Wildenhues <ralf.wildenh...@gmx.de>
Warning and error message formatting cleanups.
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
index 6dfbe1b..00e9da2 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2010 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
@@ -21,22 +21,17 @@
set -e
-# Skip platforms where `test -e' does not work. (Note that Changing
-# all `test -e' into `test -h' will not work when AC_CONFIG_LINKS
-# copies or hardlinks files.)
-(test -e configure.in) >/dev/null 2>&1 || Exit 77
-
cat > Makefile.am << 'END'
SUBDIRS = sdir
test: distdir
- test ! -e $(distdir)/sdir/dest3
- test ! -e $(distdir)/sdir/dest2
- test ! -e $(distdir)/dest3
- test ! -e $(distdir)/dest2
+ test ! -r $(distdir)/sdir/dest3
+ test ! -r $(distdir)/sdir/dest2
+ test ! -r $(distdir)/dest3
+ test ! -r $(distdir)/dest2
test -f $(distdir)/src2
## src3 cannot be distributed, Automake knows nothing about it
- test ! -e $(distdir)/sdir/src3
- test ! -e $(distdir)/src3
+ test ! -r $(distdir)/sdir/src3
+ test ! -r $(distdir)/src3
END
: > src
@@ -69,20 +64,20 @@ grep my_src_dir Makefile.in && Exit 1
grep my_dest Makefile.in && Exit 1
./configure
-test -e sdir/dest2
-test -e sdir/dest3
-test -e dest
-test -e dest4
-test -e dest5
+test -r sdir/dest2
+test -r sdir/dest3
+test -r dest
+test -r dest4
+test -r dest5
$MAKE test
$MAKE distclean
-test ! -e sdir/dest2
-test ! -e sdir/dest3
-test -e dest # Should still exist, Automake knows nothing about it.
-test -e dest5 # ditto
+test ! -r sdir/dest2
+test ! -r sdir/dest3
+test -r dest # Should still exist, Automake knows nothing about it.
+test -r dest5 # ditto
rm -f dest dest5
-test ! -e dest4
+test ! -r dest4
## Cannot do the following, because at the time of writing Autoconf
## (2.59) does not support AC_CONFIG_LINKS source in the build tree.
--
1.6.5
