[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-237-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-237-gb5a4460 |
|
Date: |
Sat, 12 Jun 2010 12:22:42 +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=b5a44609007206e061a2336f23f2b0c028466363
The branch, master has been updated
via b5a44609007206e061a2336f23f2b0c028466363 (commit)
via ea2824f7ca0784b18605a6345d72fdb5b2fd70e7 (commit)
via 96286138989c8e3d32d00c7373ccd154e6638695 (commit)
via b563243e60d1886f639b2f6741340e7e1c0d0aef (commit)
from 6fbb707f188ac2ec7b34d379370d69d80591ad8d (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 b5a44609007206e061a2336f23f2b0c028466363
Merge: 6fbb707f188ac2ec7b34d379370d69d80591ad8d
ea2824f7ca0784b18605a6345d72fdb5b2fd70e7
Author: Ralf Wildenhues <address@hidden>
Date: Sat Jun 12 14:21:40 2010 +0200
Merge branch 'maint'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 59 +++++++++++++++++++++++++++++
tests/Makefile.am | 3 +-
tests/Makefile.in | 3 +-
tests/cygwin32.test | 14 ++++---
tests/{symlink3.test => forcemiss.test} | 19 +++++----
tests/{nodepcomp.test => forcemiss2.test} | 23 ++++++++++-
tests/pluseq.test | 11 ++---
tests/pluseq10.test | 18 +++++---
tests/pluseq2.test | 21 ++++++----
tests/pluseq3.test | 19 ++++-----
tests/pluseq4.test | 16 +++++---
tests/pluseq5.test | 8 +++-
tests/pluseq6.test | 16 +++++--
tests/pluseq7.test | 7 ++-
tests/pluseq8.test | 11 ++++-
tests/pluseq9.test | 15 ++++---
tests/postproc.test | 14 ++++---
tests/pr243.test | 3 +-
tests/pr266.test | 3 +-
tests/recurs.test | 12 +++---
tests/recurs2.test | 14 +-----
tests/scripts.test | 11 ++---
tests/strip.test | 19 +++++----
tests/substre2.test | 8 ++-
tests/substref.test | 36 +++++++++--------
tests/substtarg.test | 14 +++---
tests/symlink2.test | 17 ++++++--
27 files changed, 264 insertions(+), 150 deletions(-)
rename tests/{symlink3.test => forcemiss.test} (76%)
copy tests/{nodepcomp.test => forcemiss2.test} (67%)
diff --git a/ChangeLog b/ChangeLog
index 8f3dbea..c4e69a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+2010-06-12 Ralf Wildenhues <address@hidden>
+
+ Remove a couple of unneeded conditionals from tests.
+ * tests/pr243.test, tests/pr266.test, tests/strip.test: No need
+ for the FOOTEST conditional.
+
+2010-06-12 Stefano Lattarini <address@hidden>
+
+ Modernize, improve and/or fix various test scripts.
+ * tests/symlink3.test: Deleted, separated into two new, more
+ complete tests ...
+ * tests/forcemiss.test: ... this one ...
+ * tests/forcemiss2.test: ... and this one.
+ * tests/symlink2.test: Enable `errexit' shell flag, make test
+ stricter, and skip it if symlink creation is not supported.
+ * tests/postproc.test: Enable `errexit' shell flag, related
+ changes, and a couple of unrelated cosmetic changes.
+ * tests/recurs.test: Use the `configure.in' stub created by
+ `./defs', rather than writing one from scratch. Make grepping
+ of Automake stderr slighty stricter.
+ * tests/substtarg.test: Likewise.
+ * tests/strip.test: Likewise, and move the call to `set -e'
+ earlier (just after the inclusion of `./defs'). Also, make sure
+ that the script installed by `make install-script' is equal to
+ the original one.
+ * tests/substref.test: Use the `configure.in' stub created by
+ `./defs', rather than writing one from scratch. Move the call
+ to `set -e' earlier (just after the inclusion of `./defs').
+ Avoid to explicitly export CC for configure (that's already done
+ in ./defs). Avoid potential problems with unpredictable make
+ output. Finally, make grepping of Makefile.in stricter.
+ * tests/substre2.test: Ensure verbose printing of the captured
+ make's output, and make its grepping slighty stricter.
+ * tests/cygwin32.test: Enable `errexit' shell flag, and related
+ changes. Also, do not create useless dummy source/data files.
+ * tests/scripts.test: Likewise.
+ * tests/recurs2.test: Likewise. Also, use the `configure.in'
+ stub created by `./defs'.
+ * tests/Makefile.am (TESTS): Updated.
+
+ Modernize, improve and/or fix tests `pluseq*.test.
+ * tests/pluseq5.test: Append to configure.in using cat with an
+ here-doc, not using echo.
+ * tests/pluseq10.test: Make sure that the captured output of
+ `make' command is always displayed. Where possible, use $FGREP
+ instead of grep (this change makes some checks slighty stricter).
+ * tests/pluseq8.test: Enable `errexit' shell flag, with related
+ changes.
+ * tests/pluseq.test: Likewise. Also, do not create useless dummy
+ data files, and use better m4 quoting in generated configure.in.
+ * tests/pluseq2.test: Likewise. Also, append to configure.in
+ using cat with an here-doc, not using echo.
+ * tests/pluseq3.test: Likewise.
+ * tests/pluseq4.test: Likewise.
+ * tests/pluseq6.test: Likewise.
+ * tests/pluseq7.test: Do not create useless dummy source file.
+ * tests/pluseq9.test: Slighty extended w.r.t. the grepping of
+ Automake stderr. Some unrelated cosmetic changes.
+
2010-06-12 Stefano Lattarini <address@hidden>
cscope.test: ensure verbose printing of captured stderr.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 671df0c..7875fc5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -340,6 +340,8 @@ fn99.test \
fn99subdir.test \
fnoc.test \
fo.test \
+forcemiss.test \
+forcemiss2.test \
fort1.test \
fort2.test \
fort4.test \
@@ -716,7 +718,6 @@ suffix12.test \
suffix13.test \
symlink.test \
symlink2.test \
-symlink3.test \
syntax.test \
tags.test \
tags2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 670867c..07f27ed 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -553,6 +553,8 @@ fn99.test \
fn99subdir.test \
fnoc.test \
fo.test \
+forcemiss.test \
+forcemiss2.test \
fort1.test \
fort2.test \
fort4.test \
@@ -929,7 +931,6 @@ suffix12.test \
suffix13.test \
symlink.test \
symlink2.test \
-symlink3.test \
syntax.test \
tags.test \
tags2.test \
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index 6b8d70a..ec3f43d 100755
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1999, 2001, 2002, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2001, 2002, 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
@@ -18,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
END
@@ -29,11 +32,10 @@ EXTRA_www_SOURCES = xtra.c
www_LDADD = @extra_stuff@
END
-: > www.c
-: > xtra.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^CYGWIN' Makefile.in && Exit 1
grep 'EXEEXT' Makefile.in
+
+:
diff --git a/tests/symlink3.test b/tests/forcemiss.test
similarity index 76%
rename from tests/symlink3.test
rename to tests/forcemiss.test
index 12cb714..4b9f63c 100755
--- a/tests/symlink3.test
+++ b/tests/forcemiss.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 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,16 +18,19 @@
. ./defs || Exit 1
+set -e
+
rm -f install-sh
-rm -f mkinstalldirs
-echo zot > zot
-echo zot > mkinstalldirs
+echo zot > install-sh
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE --add-missing --force-missing || Exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing --force-missing
+
+ls -l install-sh
+test -f install-sh
+grep zot install-sh && Exit 1
-grep zot mkinstalldirs && Exit 1
-Exit 0
+:
diff --git a/tests/nodepcomp.test b/tests/forcemiss2.test
similarity index 67%
copy from tests/nodepcomp.test
copy to tests/forcemiss2.test
index 735c363..408ea8a 100755
--- a/tests/nodepcomp.test
+++ b/tests/forcemiss2.test
@@ -14,15 +14,32 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure depcomp isn't always required.
+# Test to make sure that `automake --force-missing' works, even with
+# symlinked files.
. ./defs || Exit 1
set -e
-rm -f depcomp
+rm -f install-sh
+
+echo zot > foo
+cp foo foo2
+
+ln -s foo2 install-sh || {
+ echo "$me: cannot create symlinks to files" >&2
+ Exit 77
+}
: > Makefile.am
$ACLOCAL
-$AUTOMAKE
+ls -l install-sh
+$AUTOMAKE --add-missing --force-missing
+ls -l install-sh
+
+test -f install-sh
+grep zot install-sh && Exit 1
+diff foo foo2
+
+:
diff --git a/tests/pluseq.test b/tests/pluseq.test
index 05a5fce..66eec8f 100755
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 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
@@ -23,9 +23,8 @@ data_DATA = zar
data_DATA += doz
END
-: > zar
-: > doz
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'zar doz' Makefile.in
+
+:
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
index 5548e6d..9273415 100755
--- a/tests/pluseq10.test
+++ b/tests/pluseq10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 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
@@ -21,11 +21,11 @@
set -e
-cat >>configure.in <<EOF
-AM_CONDITIONAL(A, true)
-AM_CONDITIONAL(B, false)
+cat >>configure.in << 'END'
+AM_CONDITIONAL([A], [true])
+AM_CONDITIONAL([B], [false])
AC_OUTPUT
-EOF
+END
cat > Makefile.am << 'END'
foo = 0.h
@@ -40,6 +40,7 @@ foo += b0.h \
b1.h
endif
+.PHONY: print
print:
@echo BEG: $(foo) :END
END
@@ -47,7 +48,10 @@ END
$ACLOCAL
$AUTOCONF
$AUTOMAKE
+
./configure
-$MAKE print >stdout
+$MAKE print >stdout || { cat stdout; Exit 1; }
cat stdout
-grep 'BEG: 0.h a0.h a1.h a2.h a3.h :END' stdout
+$FGREP 'BEG: 0.h a0.h a1.h a2.h a3.h :END' stdout
+
+:
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index 28f9848..f9db345 100755
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 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 +19,11 @@
. ./defs || Exit 1
-echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AM_CONDITIONAL([CHECK], [true])
+END
cat > Makefile.am << 'END'
@@ -36,11 +41,9 @@ endif
END
-: > zar
-: > doz
-: > dog
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-grep 'CHECK_TRUE.*zar doz' Makefile.in || Exit 1
+$ACLOCAL
+$AUTOMAKE
+grep 'CHECK_TRUE.*zar doz' Makefile.in
grep 'CHECK_FALSE.*dog' Makefile.in
+
+:
diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index 64ddd69..755002c 100755
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 2004, 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 +19,11 @@
. ./defs || Exit 1
-echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AM_CONDITIONAL([CHECK], [true])
+END
cat > Makefile.am << 'END'
@@ -37,13 +42,7 @@ endif
END
-: > zar
-: > doz
-: > dog
-
-set -e
-
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
grep 'address@hidden@data_DATA =
zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\$'
Makefile.in
@@ -51,4 +50,4 @@ grep 'address@hidden@ doz$' Makefile.in
grep 'address@hidden@data_DATA = dog$' Makefile.in
-Exit 0
+:
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index febc33b..744b489 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 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,15 +18,19 @@
. ./defs || Exit 1
-echo AC_PROG_CC >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+END
cat > Makefile.am << 'END'
bin_PROGRAMS = foo
CC += -Dwhatever
END
-: > foo.c
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP '@CC@ -Dwhatever' Makefile.in
+
+:
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 5efe34e..88b2cb7 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2010 Free Software Foundation,
+# Copyright (C) 1999, 2001, 2002, 2003, 2010 Free Software Foundation,
# Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,9 @@
set -e
-echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in
+cat >> configure.in << 'END'
+AM_CONDITIONAL([CHECK], [true])
+END
cat > Makefile.am << 'END'
if CHECK
@@ -57,3 +59,5 @@ AUTOMAKE_fails
grep AM_CPPFLAGS stderr && Exit 1
# !CHECK should still be mentioned.
grep ':.*!CHECK$' stderr
+
+:
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index bb546cf..af05239 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 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,11 @@
. ./defs || Exit 1
-echo 'AC_SUBST(ZZZ)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_SUBST([ZZZ])
+END
# If you do this in a real Makefile.am, I will kill you.
cat > Makefile.am << 'END'
@@ -26,9 +30,11 @@ mandir += foo
zq = zzz
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-$FGREP '@mandir@ foo' Makefile.in || Exit 1
+$ACLOCAL
+$AUTOMAKE
+$FGREP '@mandir@ foo' Makefile.in
num=`grep '^mandir =' Makefile.in | wc -l`
test $num -eq 1
+
+:
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index f74e62c..0716462 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 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
@@ -32,8 +33,8 @@ libq_a_SOURCES = q.c
AR += qq
END
-: > q.c
-
$ACLOCAL
AUTOMAKE_fails
grep 'Makefile.am:3:.*AR' stderr
+
+:
diff --git a/tests/pluseq8.test b/tests/pluseq8.test
index a39059a..901f8b6 100755
--- a/tests/pluseq8.test
+++ b/tests/pluseq8.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004, 2006, 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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
VAR = \
one \
@@ -25,8 +28,8 @@ VAR = \
VAR += three
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
sed -n -e '/^VAR =/ {
:loop
@@ -39,3 +42,5 @@ sed -n -e '/^VAR =/ {
p
n
}' Makefile.in | grep three
+
+:
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index b7d6643..7d65bea 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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,11 +20,11 @@
set -e
-cat >>configure.in <<EOF
-AM_CONDITIONAL(COND1, true)
-AM_CONDITIONAL(COND2, true)
-AM_CONDITIONAL(COND3, true)
-EOF
+cat >>configure.in << 'END'
+AM_CONDITIONAL([COND1], [true])
+AM_CONDITIONAL([COND2], [true])
+AM_CONDITIONAL([COND3], [true])
+END
cat > Makefile.am << 'END'
if COND1
@@ -65,6 +65,9 @@ AUTOMAKE_fails
# COND1_FALSE (merging the last two conditions), so we'll support
# this case in the check too.
+grep '[cC]annot apply.*+=' stderr
grep ': !COND1 and !COND3$' stderr
# Make sure there is exactly one missing condition.
test `grep ': ' stderr | wc -l` = 1
+
+:
diff --git a/tests/postproc.test b/tests/postproc.test
index 197f267..44570fe 100755
--- a/tests/postproc.test
+++ b/tests/postproc.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 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,8 +19,10 @@
. ./defs || Exit 1
-cat >configure.in <<'END'
-AC_INIT([mumble], [0.1])
+set -e
+
+cat >configure.in <<END
+AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
AC_PROG_CC
AC_CONFIG_FILES([myMakefile])
@@ -32,9 +34,9 @@ bin_PROGRAMS = fred
fred_SOURCES = fred.c
END
-$ACLOCAL || Exit 1
-$AUTOCONF || Exit 1
-$AUTOMAKE -- myMakefile || Exit 1
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -- myMakefile
mv myMakefile.in myMakefile.old
echo '# Post-processed by post-processor 3.14.' > myMakefile.in
diff --git a/tests/pr243.test b/tests/pr243.test
index a3fdb8e..a5e869e 100755
--- a/tests/pr243.test
+++ b/tests/pr243.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -22,7 +22,6 @@ cat > configure.in << 'END'
AC_INIT(foo, 0.1, address@hidden)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AC_PROG_CC
-AM_CONDITIONAL(FOOTEST, false)
AC_CONFIG_FILES(Makefile:Makefile.in:tail.mk)
AC_OUTPUT
END
diff --git a/tests/pr266.test b/tests/pr266.test
index 865369f..a1cd2fe 100755
--- a/tests/pr266.test
+++ b/tests/pr266.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -22,7 +22,6 @@ cat > configure.in << 'END'
AC_INIT(foo, 0.1, address@hidden)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AC_PROG_CC
-AM_CONDITIONAL(FOOTEST, false)
AC_CONFIG_FILES(Maudefile)
AC_OUTPUT
END
diff --git a/tests/recurs.test b/tests/recurs.test
index 026fb0d..4937f4f 100755
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2003, 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,13 +21,10 @@
set -e
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+cat >> configure.in << 'END'
AC_PROG_CC
AM_CONDITIONAL(ONE, true)
AM_CONDITIONAL(TWO, false)
-AC_OUTPUT(Makefile)
END
cat > Makefile.am << 'END'
@@ -36,4 +34,6 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'Makefile.am:.*bin_PROGRAMS.*recursively defined' stderr
+grep 'Makefile\.am:.*bin_PROGRAMS.*recursively defined' stderr
+
+:
diff --git a/tests/recurs2.test b/tests/recurs2.test
index 5062bf0..c025984 100755
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 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,12 +19,7 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_PROG_CC
-AC_OUTPUT(Makefile)
-END
+set -e
cat > Makefile.am << 'END'
man_MANS = chgrp.1
@@ -32,8 +27,5 @@ man_aux = $(man_MANS:.1=.x)
EXTRA_DIST = $(man_aux) $(man_MANS)
END
-> chgrp.1
-> chgrp.x
-
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/scripts.test b/tests/scripts.test
index 6d3f0e8..b9aed7f 100755
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 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,15 +20,11 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_OUTPUT(Makefile)
-END
+set -e
cat > Makefile.am << 'END'
noinst_SCRIPTS = foo
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/strip.test b/tests/strip.test
index 3dcddaf..12fe6b4 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 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,12 +18,10 @@
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT(foo, 0.1, address@hidden)
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+set -e
+
+cat >> configure.in << 'END'
AC_PROG_CC
-AM_CONDITIONAL(FOOTEST, false)
-AC_CONFIG_FILES(Makefile)
AC_OUTPUT
END
@@ -38,13 +36,16 @@ END
chmod +x foo
-set -e
-
mkdir install
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-./configure "--prefix=`cd install && pwd`"
+
+prefix=`cd install && pwd` || Exit 1
+./configure --prefix="$prefix"
$MAKE
$MAKE install-strip
+diff foo "$prefix"/bin/foo
+
+:
diff --git a/tests/substre2.test b/tests/substre2.test
index 30e7c94..ffe9e8b 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 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,6 +46,8 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE echorule >output
+$MAKE echorule >output || { cat output; Exit 1; }
cat output
-grep 'BEG: foo1.obj foo4.obj bar3.obj bar4.obj :END' output
+$FGREP 'BEG: foo1.obj foo4.obj bar3.obj bar4.obj :END' output
+
+:
diff --git a/tests/substref.test b/tests/substref.test
index 41d782a..3d4da05 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -14,18 +14,18 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test for bug in variable substitution references when left hand pattern is
-# null.
+# Test for bug in variable substitution references when left hand
+# pattern is null.
# Report from Richard Boulton
required=gcc
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT(hello.c)
-AM_INIT_AUTOMAKE(hello,0.23)
+set -e
+
+cat >> configure.in << 'END'
AC_PROG_CC
-AC_OUTPUT(Makefile)
+AC_OUTPUT
END
cat > hello.c << 'END'
@@ -39,30 +39,32 @@ var2 = $(var1:=.)
helldl_SOURCES = $(var2:=c)
-echorule:
- @echo $(helldl_SOURCES) $(helldl_OBJECTS)
-
bin_PROGRAMS = helldl
+
+got:
+ @echo $(helldl_SOURCES) $(helldl_OBJECTS) >got
+
END
# Ignore user CFLAGS.
CFLAGS=
export CFLAGS
-set -e
-
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-CC='gcc' ./configure
+./configure
-val=`$MAKE -s echorule`;
-echo $val
-test "x$val" = "xdlmain.c dlmain.o"
+echo dlmain.c dlmain.o >exp
+$MAKE got
+cat got
+diff exp got
# This is unrelated to the rest of this test. But while we are
# at it, make sure we don't use am__helldl_SOURCES_DIST here, since
# it's not needed. DIST_SOURCES should contains $(helldl_SOURCES).
grep am__helldl_SOURCES_DIST Makefile && Exit 1
-grep 'DIST_SOURCES.*\(helldl_SOURCES\)' Makefile
+grep 'DIST_SOURCES.*\$(helldl_SOURCES)' Makefile
+
+:
diff --git a/tests/substtarg.test b/tests/substtarg.test
index 7d5e098..d828954 100755
--- a/tests/substtarg.test
+++ b/tests/substtarg.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 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
@@ -21,15 +22,14 @@
set -e
-cat > configure.in << 'END'
-AC_INIT(fakelib.c)
-AM_INIT_AUTOMAKE(fakelib,0.0)
+cat >> configure.in << 'END'
+AC_CONFIG_SOURCE([fakelib.c])
AC_PROG_CC
RANLIB=:
-AC_SUBST(RANLIB)
+AC_SUBST([RANLIB])
SUBST=hei
-AC_SUBST(SUBST)
-AC_OUTPUT(Makefile)
+AC_SUBST([SUBST])
+AC_OUTPUT
END
cat > Makefile.am << 'END'
diff --git a/tests/symlink2.test b/tests/symlink2.test
index cb2cd30..97a3d26 100755
--- a/tests/symlink2.test
+++ b/tests/symlink2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 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,11 +18,20 @@
. ./defs || Exit 1
+set -e
+
rm -f install-sh
-rm -f mkinstalldirs
-ln -s Zardoz mkinstalldirs
+ln -s Zardoz install-sh || {
+ echo "$me: cannot create broken symlinks" >&2
+ Exit 77
+}
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --add-missing
+
+test -f install-sh
+test ! -r Zardoz
+
+:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-237-gb5a4460,
Ralf Wildenhues <=