[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-770-geb70cea

[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=eb70ceabcc97910c61a93f6597abb4fba60c1a17

The branch, master has been updated
       via  eb70ceabcc97910c61a93f6597abb4fba60c1a17 (commit)
       via  d15f27e30da26bf6d39538b17d4a8d5560a1551d (commit)
      from  edf2c191790d31a4359b0b380bef351547719ca3 (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 eb70ceabcc97910c61a93f6597abb4fba60c1a17
Merge: edf2c19 d15f27e
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 16 14:37:03 2011 +0200

    Merge branch 'self-check-fix'

commit d15f27e30da26bf6d39538b17d4a8d5560a1551d
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 16 14:32:29 2011 +0200

    tests: fix few bugs in self checks
    
    Related to automake bug#8508.
    
    * tests/self-check-cleanup.test: Be laxer when grepping output
    from `ls -l', to account for ACLs and SELinux-only files.
    * tests/self-check-dir.test: Source `defs-static' to read in the
    correct definition for $SHELL.
    * tests/self-check-me.test: Likewise, and extend a bit.
    
    Report from Jim Meyering.

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

Summary of changes:
 ChangeLog                     |   11 +++++++++++
 tests/self-check-cleanup.test |    8 ++++----
 tests/self-check-dir.test     |    2 ++
 tests/self-check-me.test      |    5 +++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9f9968..6832fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-16  Stefano Lattarini  <address@hidden>
+
+       tests: fix few bugs in self checks
+       Related to automake bug#8508.
+       * tests/self-check-cleanup.test: Be laxer when grepping output
+       from `ls -l', to account for ACLs and SELinux-only files.
+       * tests/self-check-dir.test: Source `defs-static' to read in the
+       correct definition for $SHELL.
+       * tests/self-check-me.test: Likewise, and extend a bit.
+       Report from Jim Meyering.
+
 2011-04-16  Jim Meyering  <address@hidden>
 
        depcomp: correct invalid sed invocation
diff --git a/tests/self-check-cleanup.test b/tests/self-check-cleanup.test
index 92a203e..390d9b5 100755
--- a/tests/self-check-cleanup.test
+++ b/tests/self-check-cleanup.test
@@ -87,8 +87,8 @@ if $have_symlinks; then
   cd ..
   $SHELL -c '. ./defs' dummy.test
   ls -l # For debugging.
-  ls -l file | grep "^---------- .*file"
-  ls -ld dir | grep "^d--------- .*dir"
+  ls -l file | grep "^----------.*file"
+  ls -ld dir | grep "^d---------.*dir"
 
   $SHELL -c '
     ocwd=`pwd` || exit 1
@@ -96,8 +96,8 @@ if $have_symlinks; then
     ln -s "$ocwd/dir" "$ocwd/file" .
   ' dummy.test
   ls -l # For debugging.
-  ls -l file | grep "^---------- .*file"
-  ls -ld dir | grep "^d--------- .*dir"
+  ls -l file | grep "^----------.*file"
+  ls -ld dir | grep "^d---------.*dir"
 
   rmdir dir
   rm -f file
diff --git a/tests/self-check-dir.test b/tests/self-check-dir.test
index a8e5d88..ba9fd29 100755
--- a/tests/self-check-dir.test
+++ b/tests/self-check-dir.test
@@ -18,6 +18,8 @@
 # Check that tests using `./defs' create a proper temporary directory,
 # and run in it.
 
+. ./defs-static || exit 1
+
 set -ex
 
 this=S_dir
diff --git a/tests/self-check-me.test b/tests/self-check-me.test
index 5773e2c..141857f 100755
--- a/tests/self-check-me.test
+++ b/tests/self-check-me.test
@@ -17,13 +17,14 @@
 # Sanity check for the automake testsuite.
 # Make sure that $me gets automatically defined by `./defs'.
 
-set -ex
+. ./defs-static || exit 1
 
-: ${SHELL=/bin/sh}
+set -ex
 
 $SHELL -c '. ./defs && echo me=$me' foo-bar-.test | grep '^me=foo-bar-$'
 $SHELL -c '. ./defs && echo me=$me' _foo__bar.test | grep '^me=_foo__bar$'
 $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$'
 
 :


hooks/post-receive
-- 
GNU Automake