From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 19 Apr 2012 13:15:52 +0000 (+0200)
Subject: [ng] parallel-tests: minor optimizations
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3992692e8a505a4600dab66c4c0e5ce0dba30e57;p=thirdparty%2Fautomake.git

[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 <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/check.am b/lib/am/check.am
index 395f8d2bf..d47043733 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 4ee9c2406..e97140ec5 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-autovars.sh b/t/spy-autovars.sh
new file mode 100755
index 000000000..4326745d6
--- /dev/null
+++ b/t/spy-autovars.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# 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'
+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
+
+$MAKE foo
+$MAKE ./foo
+$MAKE bar
+$MAKE ./bar
+$MAKE ../baz
+$MAKE 1/2/3
+$MAKE ./1/2/3
+$MAKE /abs/path
+
+: