From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 15 Jan 2011 11:40:02 +0000 (+0100)
Subject: tests: explain MSYS setup failure issue, improve test.
X-Git-Tag: ng-0.5a~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c62bac667b522af9bf8b05175278e67e9b073d09;p=thirdparty%2Fautomake.git

tests: explain MSYS setup failure issue, improve test.

* tests/defs: Add comment and failure message, improve fail
logic.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 17a064c02..b70b607a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	    Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: explain MSYS setup failure issue, improve test.
+	* tests/defs: Add comment and failure message, improve fail
+	logic.
+
 2011-01-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix libobj2.test failure with non-GNU make: define $(AR).
diff --git a/tests/defs b/tests/defs
index 0f84d0a63..b357df63e 100644
--- a/tests/defs
+++ b/tests/defs
@@ -31,8 +31,10 @@ test -f ./defs-static || {
 . ./defs-static || exit 99
 
 # The name of the current test (without the `.test' suffix.)
-me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'`
-test -n "$me" || exit 99
+# Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
+me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'` \
+  && test -n "$me" \
+  || { echo "$argv0: failed to define \$me" >&2; exit 99; }
 
 
 ## ---------------------------------------- ##