[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-779-gb90c228

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=b90c228f7227598bc5b5c5dedc4154189faa9150

The branch, master has been updated
       via  b90c228f7227598bc5b5c5dedc4154189faa9150 (commit)
       via  3b64c7d208952e94c4b6a317cf34e5e650e77fe6 (commit)
      from  eeef872d6ada65684fec203c6ce585d5872f8e27 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b90c228f7227598bc5b5c5dedc4154189faa9150
Merge: eeef872 3b64c7d
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 17 18:25:27 2011 +0200

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |    6 ++++++
 tests/defs |   15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 21acbc1..7e97a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-17  Stefano Lattarini  <address@hidden>
 
+       test defs: allow overriding of `$me'
+       * tests/defs.in ($me): Allow overriding by the including test
+       script.  Add some explicative comments.
+
+2011-04-17  Stefano Lattarini  <address@hidden>
+
        coverage: more tests on the parallel-tests driver
        * tests/parallel-tests-interrupt.test: New test.
        * tests/parallel-tests-reset-term.test: Likewise.
diff --git a/tests/defs b/tests/defs
index f67491a..ae05b82 100644
--- a/tests/defs
+++ b/tests/defs
@@ -32,12 +32,15 @@ test -f ./defs-static || {
 # Source the shell sanitization and variables' definitions.
 . ./defs-static || exit 99
 
-# The name of the current test (without the `.test' suffix.)
-# 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; }
-
+# The name of the current test (without the `.test' suffix).
+# Test scripts can override it if they need to (but this should
+# 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$//'` \
+    && test -n "$me" \
+    || { echo "$argv0: failed to define \$me" >&2; exit 99; }
+fi
 
 ## ---------------------------------------- ##
 ##  Sanity checks and environment cleanup.  ##


hooks/post-receive
-- 
GNU Automake