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 01ff2a59a80aa977ae7921f7c68b2b1fae04388e..4bff03b7ec28f1940a92eb492329d99249dd2cac 100644 (file)
--- 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 bfe7fa4510ef8ea84f6d88f11e0ca625806b66e8..25cfb939409ae2ee18293b572422603a8de8de6c 100644 (file)
--- 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