[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-34-gaa3a21f |
|
Date: |
Fri, 05 Mar 2010 20:37:08 +0000 |
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=aa3a21f95d8a9ef30f47f14e91fd285e1a174fc2
The branch, branch-1.11 has been updated
via aa3a21f95d8a9ef30f47f14e91fd285e1a174fc2 (commit)
via 03449117fa0f9c749708845a89dbc48a84673202 (commit)
via f923b46e12d2c8553e00bf311e5544711f85b7d7 (commit)
via 5a67f3a506555c722fa2e179639ac9b435db6616 (commit)
from 87dbc44b048a9bcbc0862e972a4ce2a27904b1af (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 aa3a21f95d8a9ef30f47f14e91fd285e1a174fc2
Merge: 87dbc44b048a9bcbc0862e972a4ce2a27904b1af
03449117fa0f9c749708845a89dbc48a84673202
Author: Ralf Wildenhues <address@hidden>
Date: Fri Mar 5 21:25:38 2010 +0100
Merge branch 'maint' into branch-1.11
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 49 ++++++++++++++++++++++++++++++++++++++++++-
tests/.gitignore | 1 -
tests/Makefile.am | 9 ++-----
tests/Makefile.in | 9 ++-----
tests/README | 13 +++++++----
tests/check10.test | 4 +--
tests/check11.test | 4 +--
tests/check5.test | 4 +-
tests/check8.test | 4 +--
tests/check9.test | 4 +--
tests/color.test | 4 +--
tests/defs.in | 14 ++++++++----
tests/gen-parallel-tests | 18 +++++++++++++++-
tests/parallel-tests.test | 7 ++---
tests/parallel-tests10.test | 5 ++-
tests/parallel-tests2.test | 5 ++-
tests/parallel-tests3.test | 7 ++---
tests/parallel-tests4.test | 7 ++---
tests/parallel-tests5.test | 7 ++---
tests/parallel-tests6.test | 7 ++---
tests/parallel-tests7.test | 7 ++---
tests/parallel-tests8.test | 5 ++-
tests/parallel-tests9.test | 5 ++-
23 files changed, 125 insertions(+), 74 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 080e558..b4cda6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2010-03-03 Stefano Lattarini <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ Avoid generation of `tests/defs-p' file.
+ * tests/defs.in: In the generated `configure.in' snippet: call
+ `AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell
+ variable `parallel_tests' is set to `yes'.
+ * tests/Makefile.am (defs-p): Target removed.
+ (check_SCRIPTS): Removed `defs-p'.
+ (clean-local-check): Do not unlink `defs-p' anymore.
+ ($(parallel_tests)): Transformation rules for the test scripts
+ adjusted.
+ * tests/gen-parallel-tests: Selection rules for the test
+ scripts adjusted.
+ * tests/parallel-tests.test: Set `$parallel_tests' to `yes'
+ then include `./defs' (rather than simply including `./defs-p').
+ * tests/parallel-tests2.test: Likewise.
+ * tests/parallel-tests3.test: Likewise.
+ * tests/parallel-tests4.test: Likewise.
+ * tests/parallel-tests5.test: Likewise.
+ * tests/parallel-tests6.test: Likewise.
+ * tests/parallel-tests7.test: Likewise.
+ * tests/parallel-tests8.test: Likewise.
+ * tests/parallel-tests9.test: Likewise.
+ * tests/parallel-tests10.test: Likewise.
+ * tests/README (Section "Writing Test Cases" subsection "Do"):
+ Adjusted the parts referring to tests checking `parallel-tests'
+ behaviour. Some other minor related improvements.
+ * tests/.gitignore (defs-p): Removed.
+
+2010-03-04 Stefano Lattarini <address@hidden>
+
+ Remove redundant unset of variable TESTS from some test scripts.
+ * tests/color.test: Do not unset the `TESTS' variable, as it's
+ already unset in the `defs' file.
+ * tests/check5.test: Likewise.
+ * tests/check8.test: Likewise.
+ * tests/check9.test: Likewise.
+ * tests/check10.test: Likewise.
+ * tests/check11.test: Likewise.
+ * tests/parallel-tests.test: Likewise.
+ * tests/parallel-tests3.test: Likewise.
+ * tests/parallel-tests4.test: Likewise.
+ * tests/parallel-tests5.test: Likewise.
+ * tests/parallel-tests6.test: Likewise.
+ * tests/parallel-tests7.test: Likewise.
+
2010-02-22 Karl Berry <address@hidden>
Improve help message of mdate-sh.
@@ -18,7 +65,7 @@
in EXTRA_DIST.
* tests/extra11.test: New test, check more complex usage of
wildcards in EXTRA_DIST.
- * tests/extra11.test: New test, check usage of wildcards in
+ * tests/extra12.test: New test, check usage of wildcards in
EXTRA_DIST when $builddir != $srcdir.
* tests/Makefile.am (TESTS): Updated accordingly.
Necessity of these new tests suggested by Braden McDaniel
diff --git a/tests/.gitignore b/tests/.gitignore
index cfd4565..3c1f990 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,6 @@
aclocal-*
automake-*
defs
-defs-p
parallel-tests.am
*.dir
*.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7a34626..60bbc02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,14 +30,12 @@ $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
- sed 's,^\. \./defs,. ./defs-p,' < $(srcdir)/$$input > $@
+ sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
+ < $(srcdir)/$$input >$@
chmod a+rx $@
MAINTAINERCLEANFILES = $(parallel_tests)
-defs-p: defs Makefile.am
- sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@
-
TESTS = \
aclibobj.test \
aclocal.test \
@@ -766,7 +764,7 @@ $(parallel_tests)
EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
# Each test case depends on defs, aclocal, and automake.
-check_SCRIPTS = defs defs-p aclocal-$(APIVERSION) automake-$(APIVERSION)
+check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
clean-local: clean-local-check
.PHONY: clean-local-check
@@ -778,4 +776,3 @@ clean-local-check:
find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
rm -rf "$$@"; \
fi;
- -rm -f defs-p
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 260ebec..657c00d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1001,7 +1001,7 @@ $(parallel_tests)
EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
# Each test case depends on defs, aclocal, and automake.
-check_SCRIPTS = defs defs-p aclocal-$(APIVERSION) automake-$(APIVERSION)
+check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
all: all-am
.SUFFIXES:
@@ -1356,12 +1356,10 @@ $(srcdir)/parallel-tests.am: gen-parallel-tests
Makefile.am
$(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
- sed 's,^\. \./defs,. ./defs-p,' < $(srcdir)/$$input > $@
+ sed 's|^\. \./defs.*|parallel_tests=yes; &|' \
+ < $(srcdir)/$$input >$@
chmod a+rx $@
-defs-p: defs Makefile.am
- sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@
-
clean-local: clean-local-check
.PHONY: clean-local-check
clean-local-check:
@@ -1372,7 +1370,6 @@ clean-local-check:
find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
rm -rf "$$@"; \
fi;
- -rm -f defs-p
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/README b/tests/README
index 4068ad6..095d176 100644
--- a/tests/README
+++ b/tests/README
@@ -95,12 +95,13 @@ Do
Use `required=...' for required tools.
- Include ./defs (see other tests) for normal tests, ./defs-p for tests
- that use the `parallel-tests' option. For the latter, use a name that
- ends in `-p.test' and does not clash with any generated tests in the
- suite.
+ Include ./defs in every test script (see existing tests for examples
+ of how to do this).
- Use `set -e' to catch failures you might not have thought of.
+ For tests that use the `parallel-tests' Automake option, set the shell
+ variable `parallel_tests' to "yes" before including ./defs. Also,
+ use for them a name that ends in `-p.test' and does not clash with any
+ generated tests in the suite.
./defs sets a skeleton configure.in. If possible, append to this
file. In some cases you'll have to overwrite it, but this should
@@ -108,6 +109,8 @@ Do
but do not output anything by default. If you need ./configure
to create Makefile, append AC_OUTPUT to configure.in.
+ Use `set -e' to catch failures you might not have thought of.
+
Use $ACLOCAL, $AUTOMAKE, $AUTOCONF, $AUTOUPDATE, $AUTOHEADER,
$PERL, $MAKE, $EGREP, and $FGREP, instead of the corresponding
commands.
diff --git a/tests/check10.test b/tests/check10.test
index 76af452..ab9b529 100755
--- a/tests/check10.test
+++ b/tests/check10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 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
@@ -54,8 +54,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE
-unset TESTS || :
-
./configure
(
# Do not check for failure in this subshell
diff --git a/tests/check11.test b/tests/check11.test
index d3118a7..1fe6a4d 100755
--- a/tests/check11.test
+++ b/tests/check11.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -39,8 +39,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
env TESTS=skip $MAKE -e check >stdout
cat stdout
diff --git a/tests/check5.test b/tests/check5.test
index 857432b..7113e1b 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 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
@@ -46,7 +47,6 @@ END
cp one.c two.c
./configure
-unset TESTS || :
$MAKE check
test -f ok
EXEEXT=.bin $MAKE -e print-tests >output
diff --git a/tests/check8.test b/tests/check8.test
index 7936582..dc8d3dd 100755
--- a/tests/check8.test
+++ b/tests/check8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 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
@@ -64,8 +64,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
AM_COLOR_TESTS=always $MAKE -e check >stdout 2>stderr &&
{ cat stdout; cat stderr >&2; Exit 1; }
diff --git a/tests/check9.test b/tests/check9.test
index ed88690..c80d780 100755
--- a/tests/check9.test
+++ b/tests/check9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 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
@@ -64,8 +64,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
$MAKE all
$MAKE check
diff --git a/tests/color.test b/tests/color.test
index a5bd063..6fa686d 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2010 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
@@ -99,8 +99,6 @@ spawn $env(MAKE) -e check
expect eof
END
-unset TESTS || :
-
AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; }
cat stdout
test_color
diff --git a/tests/defs.in b/tests/defs.in
index ecdf069..18f2aeb 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -287,11 +287,15 @@ cd ./$testSubDir
# Don't use AC_OUTPUT, but AC_CONFIG_FILES so that appending
# still produces a valid configure.ac. But then, tests running
# config.status really need to append AC_OUTPUT.
-cat > configure.in << END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-END
+{
+ echo "AC_INIT([$me], [1.0])"
+ if test x"$parallel_tests" = x"yes"; then
+ echo "AM_INIT_AUTOMAKE([parallel-tests])"
+ else
+ echo "AM_INIT_AUTOMAKE"
+ fi
+ echo "AC_CONFIG_FILES([Makefile])"
+} >configure.in
# Unset some MAKE... variables that may cause $MAKE to act like a
# recursively invoked sub-make. Any $MAKE invocation in a test is
diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
index 4a71a73..39f5d1e 100755
--- a/tests/gen-parallel-tests
+++ b/tests/gen-parallel-tests
@@ -1,6 +1,21 @@
#! /bin/sh
# Generate parallel-tests.am.
#
+# Copyright (C) 2009, 2010 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/>.
+
# For each test in the TESTS list in this Makefile.am file, that itself
# tests features of the TESTS automake interface, generate a sibling
# test that does likewise, but with the option `parallel-tests' enabled.
@@ -16,7 +31,8 @@ grep -v '.-p\.test' |
LC_ALL=C sort -u |
while read tst; do
if grep '^[^#]*parallel-tests' $tst >/dev/null \
- || grep '^\. \./defs-p' $tst >/dev/null
+ || grep "parallel_tests=yes" $tst >/dev/null \
+ || grep "parallel_tests=['\"]yes" $tst >/dev/null
then :; else echo $tst; fi;
done |
{
diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index 385cef3..29111c2 100755
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -24,7 +24,8 @@
# - TEST_LOGS
# - RECHECK_LOGS
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
@@ -61,8 +62,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
# No hard errors: all tests should be run, there should be one failure.
env DISABLE_HARD_ERRORS=yes $MAKE -e check >stdout && { cat stdout; Exit 1; }
diff --git a/tests/parallel-tests10.test b/tests/parallel-tests10.test
index 2642c7a..5cd3310 100755
--- a/tests/parallel-tests10.test
+++ b/tests/parallel-tests10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -18,7 +18,8 @@
# - trailing whitespace in TESTS
# GNU make 3.80 may expand trailing white space to `.log'.
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index 5101e47..9cfe14f 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -18,8 +18,9 @@
# - check-html
# - recheck-html
+parallel_tests=yes
required=rst2html
-. ./defs-p || Exit 1
+. ./defs || Exit 1
set -e
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index d631d67..a138f90 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -17,8 +17,9 @@
# Check parallel-tests features:
# - concurrent parallel execution
+parallel_tests=yes
required=GNUmake
-. ./defs-p || Exit 1
+. ./defs || Exit 1
# This test does not work well if $MAKE contains -j.
case $MAKE in
@@ -52,8 +53,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
for build in serial parallel; do
mkdir $build
cd $build
diff --git a/tests/parallel-tests4.test b/tests/parallel-tests4.test
index d842486..efe7e8d 100755
--- a/tests/parallel-tests4.test
+++ b/tests/parallel-tests4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -17,7 +17,8 @@
# Check parallel-tests features:
# - suffix rules
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
@@ -56,8 +57,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
$MAKE
$MAKE check
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
index a7bbc9e..c4ff5b9 100755
--- a/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -20,8 +20,9 @@
# Actually, this test doesn't ensure that things happen concurrently.
# It merely serves as demonstration. :-)
+parallel_tests=yes
required=GNUmake
-. ./defs-p || Exit 1
+. ./defs || Exit 1
set -e
@@ -60,8 +61,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
$MAKE -j4 check
$MAKE distcheck
diff --git a/tests/parallel-tests6.test b/tests/parallel-tests6.test
index 5dbb433..44caf0c 100755
--- a/tests/parallel-tests6.test
+++ b/tests/parallel-tests6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -19,7 +19,8 @@
# BSD make will expand `$(TESTS:=.log)' to `.log' unless overridden.
# See parallel-tests10.test for a similar issue.
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
@@ -34,8 +35,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
$MAKE check >stdout || { cat stdout; Exit 1; }
cat stdout
diff --git a/tests/parallel-tests7.test b/tests/parallel-tests7.test
index c2ae63a..d01ada1 100755
--- a/tests/parallel-tests7.test
+++ b/tests/parallel-tests7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -17,7 +17,8 @@
# Check parallel-tests features:
# - per-extension test drivers
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
@@ -77,8 +78,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-unset TESTS || :
-
./configure
$MAKE
$MAKE check
diff --git a/tests/parallel-tests8.test b/tests/parallel-tests8.test
index 2c27064..784e07f 100755
--- a/tests/parallel-tests8.test
+++ b/tests/parallel-tests8.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -24,7 +24,8 @@
# manual for the ugliness in this area, when VPATH comes into
# play. :-/
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index 300a2f0..337328f 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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
@@ -17,7 +17,8 @@
# Check parallel-tests features:
# - recheck
-. ./defs-p || Exit 1
+parallel_tests=yes
+. ./defs || Exit 1
set -e
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-34-gaa3a21f,
Ralf Wildenhues <=