Skip MSVC oriented tests if the shell is not capable.

* tests/defs.in: New required entry 'xsi-shell'.
* tests/ar-lib.test, tests/compile3.test, tests/compile6.test:
Require a XSI capable shell.
Reported by Ralf Wildenhues.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>

diff --git a/ChangeLog b/ChangeLog
index f43214a06086e2e6673eb54d9fd01f7de624fe65..7594302fb76b5286ae577042a0f0503046db0407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-16  Peter Rosin  <peda@lysator.liu.se>
+
+       Skip MSVC oriented tests if the shell is not capable.
+       * tests/defs: New required entry 'xsi-shell'.
+       * tests/ar-lib.test, tests/compile3.test, tests/compile6.test:
+       Require a XSI capable shell.
+       Reported by Ralf Wildenhues.
+
 2010-11-15  Peter Rosin  <peda@lysator.liu.se>
 
        compile: clear the `eat' variable earlier.

diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index 31d87eddabfd88aae4cbf0d556098b58daced304..a929ea4d62b94c6999a8c64534aa4027a2eb16dc 100755 (executable)
--- a/tests/ar-lib.test
+++ b/tests/ar-lib.test
@@ -16,6 +16,7 @@
 
 # Make sure `ar-lib' wraps the Microsoft Library Manager (lib) correctly
 
+required=xsi-shell
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/compile3.test b/tests/compile3.test
index 5a5be7e55b7b655af51404fd77a53103c8f79c5d..15064a6fdb6f8690aebac54bf7ca6482a5eb298b 100755 (executable)
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -16,6 +16,7 @@
 
 # Make sure `compile' wraps the Microsoft C/C++ compiler (cl) correctly
 
+required=xsi-shell
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/compile6.test b/tests/compile6.test
index 0f09e84db4eec8f5e35eecb35b250e64b83b0f67..f45a5342fa8445707cf074a54b816e2b09fe2358 100755 (executable)
--- a/tests/compile6.test
+++ b/tests/compile6.test
@@ -16,6 +16,7 @@
 
 # Make sure `compile' searches libraries correctly
 
+required=xsi-shell
 . ./defs || Exit 1
 
 set -e

diff --git a/tests/defs.in b/tests/defs.in
index af4a3cd9ade76b6be35a6f1857c7d83e6586b717..da744c3b42fcdcde373116ce85089f417bcd80eb 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -219,6 +219,15 @@ do
       echo "$me: running texi2dvi -o /dev/null --version"
       ( texi2dvi -o /dev/null --version ) || exit 77
       ;;
+    xsi-shell)
+      # Try some XSI features.
+      echo "$me: trying some XSI constructs"
+      ( _am_dummy="a/b/c"
+       test "${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \
+               = c,a/b,b/c, \
+       && eval 'test $(( 1 + 1 )) -eq 2 \
+       && test "${#_am_dummy}" -eq 5' ) || exit 77
+      ;;
     # Generic case: the tool must support --version.
     *)
       echo "$me: running $tool --version"