[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1162-gf15d316

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

The branch, test-protocols has been updated
       via  f15d31661ef94e5d549dbdfb0f60cea1bc17683a (commit)
      from  954f7d01cae6475f752b49daabe44f471962c961 (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 f15d31661ef94e5d549dbdfb0f60cea1bc17683a
Author: Stefano Lattarini <address@hidden>
Date:   Sun Sep 18 20:42:56 2011 +0200

    parallel-tests: expose automake bug#9546
    
    * tests/test-driver-is-distributed.test: New test.
    * tests/Makefile.am (TESTS, XFAIL_TESTS): Add it.

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

Summary of changes:
 ChangeLog                                          |    6 ++++
 tests/Makefile.am                                  |    2 +
 tests/Makefile.in                                  |    4 ++-
 ...onment.test => test-driver-is-distributed.test} |   32 ++++++++++++++-----
 4 files changed, 34 insertions(+), 10 deletions(-)
 copy tests/{tests-environment.test => test-driver-is-distributed.test} (61%)

diff --git a/ChangeLog b/ChangeLog
index 8024777..856c92f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-18  Stefano Lattarini  <address@hidden>
+
+       parallel-tests: expose automake bug#9546
+       * tests/test-driver-is-distributed.test: New test.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Add it.
+
 2011-09-16  Stefano Lattarini  <address@hidden>
 
        automake: remove special handling of `ANSI2KNR' make variable
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2b19ca..2e7e17f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,7 @@ java-nobase.test \
 pr8365-remake-timing.test \
 yacc-dist-nobuild-subdir.test \
 vala-vpath.test \
+test-driver-is-distributed.test \
 txinfo5.test
 
 
@@ -773,6 +774,7 @@ test-driver-create-log-dir.test \
 test-driver-strip-vpath.test \
 test-driver-trs-suffix-registered.test \
 test-driver-fail.test \
+test-driver-is-distributed.test \
 test-harness-vpath-rewrite.test \
 test-log.test \
 test-metadata-global-log.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f118c87..8248330 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -290,7 +290,8 @@ EXTRA_DIST = ChangeLog-old gen-parallel-tests 
instspc-tests.sh \
 XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
        override-conditional-2.test java-nobase.test \
        pr8365-remake-timing.test yacc-dist-nobuild-subdir.test \
-       vala-vpath.test txinfo5.test $(instspc_xfail_tests)
+       vala-vpath.test test-driver-is-distributed.test txinfo5.test \
+       $(instspc_xfail_tests)
 parallel_tests = check-concurrency-bug9245-p.test \
        check-exported-srcdir-p.test check-fd-redirect-p.test \
        check-tests-in-builddir-p.test check-p.test check11-p.test \
@@ -1031,6 +1032,7 @@ test-driver-create-log-dir.test \
 test-driver-strip-vpath.test \
 test-driver-trs-suffix-registered.test \
 test-driver-fail.test \
+test-driver-is-distributed.test \
 test-harness-vpath-rewrite.test \
 test-log.test \
 test-metadata-global-log.test \
diff --git a/tests/tests-environment.test 
b/tests/test-driver-is-distributed.test
similarity index 61%
copy from tests/tests-environment.test
copy to tests/test-driver-is-distributed.test
index e3dc76a..09ea45a 100755
--- a/tests/tests-environment.test
+++ b/tests/test-driver-is-distributed.test
@@ -14,32 +14,46 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# "Simple Tests" testsuite driver: check TESTS_ENVIRONMENT support.
+# Check regression of parallel-tests:
+#  - `test-driver' script not correctly distributed when TESTS is
+#    defined in a subdir Makefile
 
+parallel_tests=yes
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
+AC_CONFIG_FILES([tests/Makefile])
 AC_OUTPUT
 END
 
+mkdir tests
+
 cat > Makefile.am << 'END'
+SUBDIRS = tests
+test0:
+       echo ' ' $(DIST_COMMON) ' ' | grep '[ /]test-driver '
+test1: distdir
+       ls -l $(distdir) $(distdir)/* ;: For debugging.
+       test -f $(distdir)/test-driver
+.PHONY: test0 test1
+END
+
+cat > tests/Makefile.am << 'END'
 TESTS = foo.test
 EXTRA_DIST = $(TESTS)
 END
 
-cat > foo.test << 'END'
-#! /bin/sh
-test x"$FOO" = x"ok"
+cat > tests/foo.test << 'END'
+#!/bin/sh
+exit 0
 END
-chmod a+x foo.test
+chmod a+x tests/foo.test
 
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
-
 ./configure
-
-FOO=bad TESTS_ENVIRONMENT='FOO=ok'  $MAKE check
-FOO=ok  TESTS_ENVIRONMENT='FOO=bad' $MAKE check && Exit 1
+$MAKE test0 test1
+$MAKE distcheck
 
 :


hooks/post-receive
-- 
GNU Automake