Re: Testsuite failures on Tru64 OSF 5.1

[Peter Rosin]

Den 2010-11-15 01:39 skrev Stefano Lattarini:
> On Monday 15 November 2010, Peter Rosin wrote:
>> Running MSVC on osfX.Y is not interesting.  I'd write a patch to skip
>> the test
> Yeah, I agree this is the best option.
>> but I can't then test the result.
> Me neither (I don't have access to a True64/OSF system).
>> So I won't...
> Neither will I  ;-)

But I did it anyway.

This is based off of master (but I guess it also applies to tests-init)
but the backport to the msvc branch is trivial. I "stole" the xsi-test
from libtool.

Would be good if someone tested on that Alpha before pushing I suppose.

Cheers,
Peter

>From 59c0f13b3fd1316cdfa138def0d2964d07ba38ec Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Mon, 15 Nov 2010 09:12:03 +0100
Subject: [PATCH] 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.

Signed-off-by: Peter Rosin <address@hidden>
---
 ChangeLog           |    8 ++++++++
 tests/ar-lib.test   |    1 +
 tests/compile3.test |    1 +
 tests/compile6.test |    1 +
 tests/defs          |    9 +++++++++
 5 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 009190a..1860083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-15  Peter Rosin  <address@hidden>
+
+       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-14  Ralf Wildenhues  <address@hidden>
 
        More stable configure output from sanity check.
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index c788778..652aaf1 100755
--- 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 d8c7d3b..a8be421 100755
--- 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 0f09e84..f45a534 100755
--- 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 b/tests/defs
index 82c3b5b..e37bb96 100644
--- a/tests/defs
+++ b/tests/defs
@@ -290,6 +290,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' ) >/dev/null 2>&1 || exit 77
+      ;;
     *)
       # Generic case: the tool must support --version.
       echo "$me: running $tool --version"
-- 
1.7.2.3