[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1549-geb52380 |
|
Date: |
Sat, 05 Nov 2011 20:35:37 +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=eb52380d7a7bbedcd10fb9991420ae25ea27520f
The branch, testsuite-work has been updated
via eb52380d7a7bbedcd10fb9991420ae25ea27520f (commit)
via 7a7aeb80c90e329f185aed585ffa7420d1d4a8a8 (commit)
via 972aef02635f1a1e7b60f14a2e0be368f576605a (commit)
from 206beed99dd1e40efcc55ece553dda07740c41ce (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 eb52380d7a7bbedcd10fb9991420ae25ea27520f
Author: Stefano Lattarini <address@hidden>
Date: Sat Nov 5 21:30:39 2011 +0100
tests: more faithful 'installcheck' support in few tests
* tests/ar-lib5a.test: Use the `$am_scriptdir' variable instead
of "$testsrcdir/../lib" or "$top_testsrcdir/lib", to test more
faithfully under "make installcheck".
* tests/ar-lib5a.test: Likewise.
* tests/libobj-basic.test: Likewise.
* tests/libobj19.test: Likewise.
* tests/suffix5.test: Likewise.
commit 7a7aeb80c90e329f185aed585ffa7420d1d4a8a8
Author: Stefano Lattarini <address@hidden>
Date: Sat Nov 5 20:41:49 2011 +0100
tests: remove redundant settings of `errexit' shell flag
* tests/aclocal-path-install-serial.test: Do not set the
`errexit' shell flag, as it is already set by `tests/defs'.
* tests/ar-lib2.test: Likewise.
* tests/ar-lib3.test: Likewise.
* tests/ar-lib4.test: Likewise.
* tests/ar-lib5a.test: Likewise.
* tests/ar-lib5b.test: Likewise.
* tests/ar-lib6a.test: Likewise.
* tests/ar-lib6b.test: Likewise.
* tests/ar-lib7.test: Likewise.
* tests/ar3.test: Likewise.
* tests/ar4.test: Likewise.
* tests/ar5.test: Likewise.
* tests/extra-portability.test: Likewise.
* tests/extra-portability2.test: Likewise.
* tests/extra-portability3.test: Likewise.
* tests/install-info-dir.test: Likewise.
* tests/maintmode-configure-msg.test: Likewise.
commit 972aef02635f1a1e7b60f14a2e0be368f576605a
Author: Stefano Lattarini <address@hidden>
Date: Sat Nov 5 20:33:19 2011 +0100
generated tests: avoid extra "FIXME" comments
* tests/gen-testsuite-part: Avoid putting too much "FIXME"
comments in the generated test scripts, since they end up
being just counter-productive noise when one has to grep
the test scripts looking for real "FIXME" items.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 41 ++++++++++++++++++++++++++++++++++++
tests/ar-lib2.test | 2 -
tests/ar-lib3.test | 2 -
tests/ar-lib4.test | 2 -
tests/ar-lib5a.test | 6 +----
tests/ar-lib5b.test | 2 -
tests/ar-lib6a.test | 2 -
tests/ar-lib6b.test | 2 -
tests/ar-lib7.test | 2 -
tests/ar3.test | 2 -
tests/ar4.test | 2 -
tests/ar5.test | 2 -
tests/extra-portability.test | 2 -
tests/extra-portability2.test | 2 -
tests/extra-portability3.test | 2 -
tests/gen-testsuite-part | 5 +--
tests/install-info-dir.test | 2 -
tests/libobj-basic.test | 3 +-
tests/libobj19.test | 3 +-
tests/maintmode-configure-msg.test | 2 -
tests/suffix5.test | 3 +-
21 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a97f070..2269ed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2011-11-05 Stefano Lattarini <address@hidden>
+
+ tests: more faithful 'installcheck' support in few tests
+ * tests/ar-lib5a.test: Use the `$am_scriptdir' variable instead
+ of "$testsrcdir/../lib" or "$top_testsrcdir/lib", to test more
+ faithfully under "make installcheck".
+ * tests/ar-lib5a.test: Likewise.
+ * tests/libobj-basic.test: Likewise.
+ * tests/libobj19.test: Likewise.
+ * tests/suffix5.test: Likewise.
+
+2011-11-05 Stefano Lattarini <address@hidden>
+
+ tests: remove redundant settings of `errexit' shell flag
+ * tests/aclocal-path-install-serial.test: Do not set the
+ `errexit' shell flag, as it is already set by `tests/defs'.
+ * tests/ar-lib2.test: Likewise.
+ * tests/ar-lib3.test: Likewise.
+ * tests/ar-lib4.test: Likewise.
+ * tests/ar-lib5a.test: Likewise.
+ * tests/ar-lib5b.test: Likewise.
+ * tests/ar-lib6a.test: Likewise.
+ * tests/ar-lib6b.test: Likewise.
+ * tests/ar-lib7.test: Likewise.
+ * tests/ar3.test: Likewise.
+ * tests/ar4.test: Likewise.
+ * tests/ar5.test: Likewise.
+ * tests/extra-portability.test: Likewise.
+ * tests/extra-portability2.test: Likewise.
+ * tests/extra-portability3.test: Likewise.
+ * tests/install-info-dir.test: Likewise.
+ * tests/maintmode-configure-msg.test: Likewise.
+
+2011-11-05 Stefano Lattarini <address@hidden>
+
+ generated tests: avoid extra "FIXME" comments
+ * tests/gen-testsuite-part: Avoid putting too much "FIXME"
+ comments in the generated test scripts, since they end up
+ being just counter-productive noise when one has to grep
+ the test scripts looking for real "FIXME" items.
+
2011-09-12 Stefano Lattarini <address@hidden>
cosmetics: fix typo in 'prove-runner' script
diff --git a/tests/ar-lib2.test b/tests/ar-lib2.test
index 67a64e9..5b697fa 100755
--- a/tests/ar-lib2.test
+++ b/tests/ar-lib2.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_AR
diff --git a/tests/ar-lib3.test b/tests/ar-lib3.test
index 6bcf6c2..4235bdb 100755
--- a/tests/ar-lib3.test
+++ b/tests/ar-lib3.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_RANLIB
diff --git a/tests/ar-lib4.test b/tests/ar-lib4.test
index e05a8c2..fb0ca5f 100755
--- a/tests/ar-lib4.test
+++ b/tests/ar-lib4.test
@@ -19,8 +19,6 @@
required=libtoolize
. ./defs || Exit 1
-set -e
-
cp configure.in X
cat >> configure.in << 'END'
diff --git a/tests/ar-lib5a.test b/tests/ar-lib5a.test
index d1de98b..8f1d227 100755
--- a/tests/ar-lib5a.test
+++ b/tests/ar-lib5a.test
@@ -21,8 +21,6 @@
required=lib
. ./defs || Exit 1
-set -e
-
cat > configure.in << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
@@ -52,9 +50,7 @@ int wish(void) { return 0; }
END
mkdir auxdir
-# FIXME: make this "installcheck-aware" once we are merged into the
-# 'testsuite-work' branch.
-cat - "$testsrcdir"/../lib/ar-lib > auxdir/ar-lib << 'END'
+cat - "$am_scriptdir/ar-lib" > auxdir/ar-lib << 'END'
#! /bin/sh
:> ar-lib-worked
END
diff --git a/tests/ar-lib5b.test b/tests/ar-lib5b.test
index 52deab5..09742ca 100755
--- a/tests/ar-lib5b.test
+++ b/tests/ar-lib5b.test
@@ -20,8 +20,6 @@
. ./defs || Exit 1
-set -e
-
cat > configure.in << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([auxdir])
diff --git a/tests/ar-lib6a.test b/tests/ar-lib6a.test
index f1b982c..0e04e82 100755
--- a/tests/ar-lib6a.test
+++ b/tests/ar-lib6a.test
@@ -20,8 +20,6 @@
required=libtoolize
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_RANLIB
diff --git a/tests/ar-lib6b.test b/tests/ar-lib6b.test
index 5487add..789691a 100755
--- a/tests/ar-lib6b.test
+++ b/tests/ar-lib6b.test
@@ -20,8 +20,6 @@
required=libtoolize
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_RANLIB
diff --git a/tests/ar-lib7.test b/tests/ar-lib7.test
index 3f758a9..89a279a 100755
--- a/tests/ar-lib7.test
+++ b/tests/ar-lib7.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AM_PROG_AR
END
diff --git a/tests/ar3.test b/tests/ar3.test
index 1d5e84e..c8db414 100755
--- a/tests/ar3.test
+++ b/tests/ar3.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_AR
diff --git a/tests/ar4.test b/tests/ar4.test
index ebd8c57..60db9e7 100755
--- a/tests/ar4.test
+++ b/tests/ar4.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AM_PROG_AR
END
diff --git a/tests/ar5.test b/tests/ar5.test
index d00f421..8908ca7 100755
--- a/tests/ar5.test
+++ b/tests/ar5.test
@@ -18,8 +18,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.in << 'END'
AM_PROG_AR([echo spy > bad-archiver-interface-detected])
END
diff --git a/tests/extra-portability.test b/tests/extra-portability.test
index 82f0654..22d3749 100755
--- a/tests/extra-portability.test
+++ b/tests/extra-portability.test
@@ -22,8 +22,6 @@
. ./defs || Exit 1
-set -e
-
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
diff --git a/tests/extra-portability2.test b/tests/extra-portability2.test
index cd8632b..ceaac22 100755
--- a/tests/extra-portability2.test
+++ b/tests/extra-portability2.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/tests/extra-portability3.test b/tests/extra-portability3.test
index 9773b89..125344d 100755
--- a/tests/extra-portability3.test
+++ b/tests/extra-portability3.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index c547f4a..6009dbc 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -84,10 +84,11 @@ sub line_match ($$)
sub write_wrapper_script ($$$)
{
my ($file_handle, $wrapped_test, $shell_setup_code, $creator_name) = @_;
+ # FIXME: we use some creative quoting in the generated scripts,
+ # FIXME: to please maintainer-check.
print $file_handle unindent <<EOF;
#! /bin/sh
# This file has been automatically generated. DO NOT EDIT BY HAND!
- # FIXME: creative quoting to please maintainer-check.
. ./defs-static || exit '99';
$shell_setup_code
# In the spirit of VPATH, we prefer a test in the build tree
@@ -95,12 +96,10 @@ sub write_wrapper_script ($$$)
for dir in . "\$testsrcdir"; do
if test -f "\$dir/$wrapped_test"; then
echo "\$0: will source \$dir/$wrapped_test"
- # FIXME: creative quoting to please maintainer-check.
. "\$dir/$wrapped_test"; exit "\$?"
fi
done
echo "\$0: cannot find wrapped test \\`$wrapped_test'" >&2
- # FIXME: creative quoting to please maintainer-check.
exit '99'
EOF
}
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index f75b115..b6f410b 100755
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -30,8 +30,6 @@ mkdir bin
saved_PATH=$PATH; export saved_PATH
PATH=$cwd/bin$PATH_SEPARATOR$PATH; export PATH
-set -e
-
cat >> configure.in <<'END'
AC_OUTPUT
END
diff --git a/tests/libobj-basic.test b/tests/libobj-basic.test
index a31d7eb..6578264 100755
--- a/tests/libobj-basic.test
+++ b/tests/libobj-basic.test
@@ -78,8 +78,7 @@ cat > extra-checks.am << 'END'
extra_checks = maude-src maude-dist liver-not-dist
END
-# FIXME: improve support for "installcheck" here.
-cp "$top_testsrcdir/lib/ar-lib" . || Exit 99
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script \`ar-lib'"
$ACLOCAL
$AUTOCONF
diff --git a/tests/libobj19.test b/tests/libobj19.test
index 7fb6531..79334d9 100755
--- a/tests/libobj19.test
+++ b/tests/libobj19.test
@@ -53,8 +53,7 @@ cat > libobj-dir/foobar.c << 'END'
extern int dummy;
END
-# FIXME: improve support for "installcheck" here.
-cp "$top_testsrcdir/lib/ar-lib" . || Exit 99
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script \`ar-lib'"
$ACLOCAL
$AUTOCONF
diff --git a/tests/maintmode-configure-msg.test
b/tests/maintmode-configure-msg.test
index f32c4fa..f330bd0 100755
--- a/tests/maintmode-configure-msg.test
+++ b/tests/maintmode-configure-msg.test
@@ -21,8 +21,6 @@
. ./defs || Exit 1
-set -e
-
set_maintmode ()
{
rm -rf autom4te*.cache # Just to be sure not to use a stale cache.
diff --git a/tests/suffix5.test b/tests/suffix5.test
index 113a40a..fcde0b6 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -46,9 +46,8 @@ END
: > ltmain.sh
-# FIXME: better support for installcheck.
for auxscript in ar-lib config.guess config.sub; do
- cp "$top_testsrcdir/lib/$auxscript" . \
+ cp "$am_scriptdir/$auxscript" . \
|| fatal_ "fetching auxiliary script \`$auxscript'"
done
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1549-geb52380,
Stefano Lattarini <=