From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 7 Aug 2011 13:54:26 +0000 (+0200)
Subject: test defs: get name of TAP-using tests correctly
X-Git-Tag: ng-0.5a~89^2~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f5b225a674cde633e42bb3ca3f767ca95ffe6a7;p=thirdparty%2Fautomake.git

test defs: get name of TAP-using tests correctly

This change fixes the names of the temporary directories used
by the TAP-based tests (e.g., test `foo.tap' now uses `foo.dir'
rather than `foo.tap.dir'); more importantly, this make the
variable `$destdir' defined in `tests/defs' usable also in the
TAP tests.

($me): Also strip the any `.tap' suffix from the name of the
test.
---

diff --git a/ChangeLog b/ChangeLog
index 01ff2a59a..4bff03b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	test defs: get name of TAP-using tests correctly
+	This change fixes the names of the temporary directories used
+	by the TAP-based tests (e.g., test `foo.tap' now uses `foo.dir'
+	rather than `foo.tap.dir'); more importantly, this make the
+	variable `$destdir' defined in `tests/defs' usable also in the
+	TAP tests.
+	($me): Also strip the any `.tap' suffix from the name of the
+	test.
+
 2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	testsuite: TAP tests properly decide when to remove tempdirs
diff --git a/tests/defs b/tests/defs
index bfe7fa451..25cfb9394 100644
--- a/tests/defs
+++ b/tests/defs
@@ -43,7 +43,7 @@ test -f ./defs-static || {
 # be done carefully, and *before* including ./defs).
 if test -z "$me"; then
   # Guard against failure to spawn sed (seen on MSYS), or empty $argv0.
-  me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//'` \
+  me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.test$//;s/\.tap$//;'` \
     && test -n "$me" \
     || { echo "$argv0: failed to define \$me" >&2; exit 99; }
 fi