[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-116-g3992692

[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=3992692e8a505a4600dab66c4c0e5ce0dba30e57

The branch, ng/master has been updated
       via  3992692e8a505a4600dab66c4c0e5ce0dba30e57 (commit)
      from  61ca9234e980b282d99e420f29949bf0314b161c (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 3992692e8a505a4600dab66c4c0e5ce0dba30e57
Author: Stefano Lattarini <address@hidden>
Date:   Thu Apr 19 15:15:52 2012 +0200

    [ng] parallel-tests: minor optimizations
    
    * lib/am/check.am (am__check_pre): Shave off a couple of forks in
    the case the test script is placed in a subdirectory.
    * t/spy-autovars.sh: New "spy" test, verifying that our expectations
    on the behaviour of (some) GNU make automatic variables are correct.
    * t/list-of-tests.mk: Add it.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 lib/am/check.am                     |    3 +-
 t/list-of-tests.mk                  |    1 +
 t/{spy-phony.sh => spy-autovars.sh} |   65 ++++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 34 deletions(-)
 copy t/{spy-phony.sh => spy-autovars.sh} (52%)

diff --git a/lib/am/check.am b/lib/am/check.am
index 395f8d2..d470437 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -79,8 +79,7 @@ am__check_pre =                                               
\
 $(am__sh_e_setup);                                     \
 $(am__tty_colors);                                     \
 srcdir=$(srcdir); export srcdir;                       \
-am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;           \
-test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;        \
+test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?; \
 f='$(patsubst $(srcdir)/%,%,$<)';                      \
 ## We need to invoke the test in way that won't cause a PATH search.
 case $< in */*) tst=$<;; *) tst=./$<;; esac;           \
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 4ee9c24..e97140e 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -979,6 +979,7 @@ t/spell.sh \
 t/spell2.sh \
 t/spell3.sh \
 t/spelling.sh \
+t/spy-autovars.sh \
 t/spy-double-colon.sh \
 t/spy-phony.sh \
 t/spy-rm.tap \
diff --git a/t/spy-phony.sh b/t/spy-autovars.sh
similarity index 52%
copy from t/spy-phony.sh
copy to t/spy-autovars.sh
index 4e42819..4326745 100755
--- a/t/spy-phony.sh
+++ b/t/spy-autovars.sh
@@ -14,44 +14,45 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that the '.PHONY' semantics we expect truly hold.
+# Verify that our expectations on the behaviour of (some) GNU make
+# automatic variables are correct.
+# This test is quite incomplete, and should be filled out whenever
+# we want to start assuming and using a further behaviour of
+# automatic variables of GNU make.
 
 am_create_testdir=empty
 . ./defs || Exit 1
 
 cat > Makefile <<'END'
-.PHONY: pdir pfile
-pdir rdir:
-       echo foo > $@/foo
-pfile rfile:
-       echo bar >$@
-.PHONY: other
-other:
-       echo baz >> dummy
-indirect: other
-       echo run > $@
+foo:
+       test $@ = foo
+       test $(@D) = .
+       test $(@F) = foo
+./bar:
+       test $@ = ./bar || test $@ = bar
+       test $(@D) = .
+       test $(@F) = bar
+../baz:
+       test $@ = ../baz
+       test $(@D) = ..
+       test $(@F) = baz
+1/2/3:
+       test $@ = 1/2/3
+       test $(@D) = 1/2
+       test $(@F) = 3
+/abs/path:
+       test $@ = /abs/path
+       test $(@D) = /abs
+       test $(@F) = path
 END
 
-: > rfile
-mkdir rdir
-$MAKE rdir rfile
-test ! -s rfile
-test ! -f rdir/foo
-
-: > pfile
-mkdir pdir
-$MAKE pdir pfile
-test "`cat pfile`" = bar
-test "`cat pdir/foo`" = foo
-
-$MAKE other
-test "`cat dummy`" = baz
-$MAKE other
-test "`cat dummy`" = "baz${nl}baz"
-
-echo not run > indirect
-$MAKE indirect
-test "`cat indirect`" = run
-test "`cat dummy`" = "baz${nl}baz${nl}baz"
+$MAKE foo
+$MAKE ./foo
+$MAKE bar
+$MAKE ./bar
+$MAKE ../baz
+$MAKE 1/2/3
+$MAKE ./1/2/3
+$MAKE /abs/path
 
 :


hooks/post-receive
-- 
GNU Automake