testsuite: avoid spurious failure of self checks on Solaris

This is just a quick workaround to prevent having too much noise
in the testsuite; more proper fixes have been committed into the
'testsuite-work' branch.

* tests/self-check-dir.test: Relax a test to avoid unimportant
failure on Solaris 10.
* tests/self-check-exit.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index a8a67114146c24bf63c9b81cb35d9d021df3a2e1..352371312c7b59e5125c40a34342b1ed1292cea6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       testsuite: avoid spurious failure of self checks on Solaris
+       This is just a quick workaround to prevent having too much noise
+       in the testsuite; more proper fixes have been committed into the
+       'testsuite-work' branch.
+       * tests/self-check-dir.test: Relax a test to avoid unimportant
+       failure on Solaris 10.
+       * tests/self-check-exit.test: Likewise.
+
 2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        test defs: more environment cleanup

diff --git a/tests/self-check-dir.test b/tests/self-check-dir.test
index ba9fd292df0263cc67fe3d1ec85e4a58fccd6ffe..013528ea5fcda591db8f1badf7488376c7e36d21 100755 (executable)
--- a/tests/self-check-dir.test
+++ b/tests/self-check-dir.test
@@ -31,7 +31,7 @@ rm -f $this.tmp
 $SHELL -c "
   . ./defs || Exit 1
   : > $this.tmp
-  case \`pwd\` in '`pwd`'/$this.dir);; *) Exit 1;; esac
+  case \`pwd\` in */$this.dir);; *) Exit 1;; esac
 " $this.test || outcome=false
 
 test -f $this.tmp && { rm -f $this.tmp; outcome=false; }

diff --git a/tests/self-check-exit.test b/tests/self-check-exit.test
index 73f3ea5f91806edec1b309fd6a1308c2f0ff5cd6..ca1af9b9a8e6f4837f899f16374f7369867d7c04 100755 (executable)
--- a/tests/self-check-exit.test
+++ b/tests/self-check-exit.test
@@ -39,12 +39,14 @@ for st in 1 2 3 4 5 77 99 126 127 128 129 130 255; do
 
 done
 
-echo "* Try: non-existent-program"
-$SHELL -c  ". ./defs; non-existent-program; :"
-rc=$?
-echo "* rc=$rc"
-echo
-test $rc -eq 127 || exit 1
+# Disabled: some lesser shells such as Solaris /bin/sh might fail
+# on this.
+#echo "* Try: non-existent-program"
+#$SHELL -c  ". ./defs; non-existent-program; :"
+#rc=$?
+#echo "* rc=$rc"
+#echo
+#test $rc -eq 127 || exit 1
 
 for sig in 1 2 13 15; do