[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-908-g145b591

[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=145b591c8f676257685faf9cd8faffd92e1a9e5d

The branch, testsuite-work has been updated
       via  145b591c8f676257685faf9cd8faffd92e1a9e5d (commit)
      from  9986bd92a59f662ea21a7e734c0556e9756eaa2b (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 145b591c8f676257685faf9cd8faffd92e1a9e5d
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jun 5 20:58:21 2011 +0200

    self tests: check that `$me' can be overridden
    
    * tests/self-check-me.test: Check that `$me' can be overridden
    before sourcing ./defs, with or without sourcing ./defs-static
    beforehand, and that this override is honored.  Update heading
    comments.

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

Summary of changes:
 ChangeLog                |    8 ++++++++
 tests/self-check-me.test |   15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 569f44a..c57e2c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-05  Stefano Lattarini  <address@hidden>
+
+       self tests: check that `$me' can be overridden
+       * tests/self-check-me.test: Check that `$me' can be overridden
+       before sourcing ./defs, with or without sourcing ./defs-static
+       beforehand, and that this override is honored.  Update heading
+       comments.
+
 2011-06-02  Stefano Lattarini  <address@hidden>
 
        self tests: fix another spurious failure
diff --git a/tests/self-check-me.test b/tests/self-check-me.test
index 8fd2bc0..e8b1361 100755
--- a/tests/self-check-me.test
+++ b/tests/self-check-me.test
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Sanity check for the automake testsuite.
-# Make sure that $me gets automatically defined by `./defs'.
+# Make sure that $me gets automatically defined by `./defs', and that it
+# can be overridden by the test script.
 
 . ./defs-static || exit 1
 
@@ -29,4 +30,16 @@ $SHELL -c '. ./defs && echo me=$me' 012.test | grep 
'^me=012$'
 $SHELL -c '. ./defs && echo me=$me' foo.bar | grep '^me=foo\.bar$'
 $SHELL -c '. ./defs && echo me=$me' a.b.c.test | grep '^me=a\.b\.c$'
 
+# Overriding $me after sourcing ./defs-static should work.
+s=`$SHELL -c '. ./defs-static && me=zardoz && . ./defs && echo me=$me' \
+             bad.test` || exit 1
+printf '%s\n' "$s" | grep '^me=zardoz$'
+printf '%s\n' "$s" | grep 'me=bad' && exit 1
+
+# If we override $me, ./defs should not modify it.
+s=`$SHELL -c 'me=foo.test && . ./defs && echo me=$me' \
+             bad.test` || exit 1
+printf '%s\n' "$s" | grep '^me=foo\.test$'
+printf '%s\n' "$s" | grep 'me=bad' && exit 1
+
 :


hooks/post-receive
-- 
GNU Automake