[d1afb9e] | 1 | Fix the tests so they don't fail :) |
---|
| 2 | http://bugs.gentoo.org/show_bug.cgi?id=79505 |
---|
| 3 | |
---|
| 4 | insthook: |
---|
| 5 | update the head/tail syntax since coreutils has deprecated the old style |
---|
| 6 | |
---|
| 7 | dirname,ccnoco: |
---|
| 8 | rip patches from fedora |
---|
| 9 | |
---|
| 10 | --- automake-1.5/tests/insthook.test.orig 2005-01-30 09:02:48.622592064 -0500 |
---|
| 11 | +++ automake-1.5/tests/insthook.test 2005-01-30 09:03:00.332811840 -0500 |
---|
| 12 | @@ -17 +17 @@ |
---|
| 13 | -test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook |
---|
| 14 | +test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook |
---|
| 15 | diff -u automake-1.5/tests/dirname.test automake-1.6.3/tests/dirname.test |
---|
| 16 | --- automake-1.5/tests/dirname.test 2003-04-25 15:44:56.000000000 +0900 |
---|
| 17 | +++ automake-1.6.3/tests/dirname.test 2003-04-25 15:44:56.000000000 +0900 |
---|
| 18 | @@ -5,7 +5,7 @@ |
---|
| 19 | . $srcdir/defs || exit 1 |
---|
| 20 | |
---|
| 21 | cat > configure.in << 'END' |
---|
| 22 | -AC_PLAIN_SCRIPT |
---|
| 23 | +AC_INIT |
---|
| 24 | echo "1 /a/path/to/a/file = _AM_DIRNAME([/a/path/to/a/file])" |
---|
| 25 | echo "2 another/path/to/a/file = _AM_DIRNAME([another/path/to/a/file])" |
---|
| 26 | echo "3 file = _AM_DIRNAME([file])" |
---|
| 27 | @@ -15,17 +15,13 @@ |
---|
| 28 | echo "7 /file = _AM_DIRNAME([/file])" |
---|
| 29 | END |
---|
| 30 | |
---|
| 31 | -# Fail gracefully if no autoconf. |
---|
| 32 | -$needs_autoconf |
---|
| 33 | - |
---|
| 34 | $ACLOCAL || exit 1 |
---|
| 35 | -$AUTOCONF || exit 1 |
---|
| 36 | - |
---|
| 37 | -# fail gracefully if autoconf didn't support AC_PLAIN_SCRIPT, because it won't |
---|
| 38 | -# support our regexps anyhow |
---|
| 39 | -test -s configure || exit 77 |
---|
| 40 | +# fail gracefully if autoconf didn't support support our regexps anyhow |
---|
| 41 | +$AUTOCONF || exit 77 |
---|
| 42 | |
---|
| 43 | -$SHELL ./configure >got || exit 1 |
---|
| 44 | +# Use --quiet otherwise unwelcome messages like "loading site script" |
---|
| 45 | +# would cause a failure. |
---|
| 46 | +./configure --quiet >got || exit 1 |
---|
| 47 | |
---|
| 48 | cat >wanted <<EOF |
---|
| 49 | 1 /a/path/to/a/file = /a/path/to/a |
---|
| 50 | @@ -40,4 +36,3 @@ |
---|
| 51 | diff wanted got || exit 1 |
---|
| 52 | |
---|
| 53 | exit 0 |
---|
| 54 | - |
---|
| 55 | diff -u automake-1.5/tests/ccnoco.test automake-1.6.3/tests/ccnoco.test |
---|
| 56 | --- automake-1.5/tests/ccnoco.test 2003-06-07 06:34:18.000000000 +0900 |
---|
| 57 | +++ automake-1.6.3/tests/ccnoco.test 2003-06-07 06:34:18.000000000 +0900 |
---|
| 58 | @@ -39,7 +39,6 @@ |
---|
| 59 | } |
---|
| 60 | END |
---|
| 61 | |
---|
| 62 | -$needs_autoconf |
---|
| 63 | gcc -v || exit 77 |
---|
| 64 | |
---|
| 65 | cat > Mycomp << 'END' |
---|
| 66 | @@ -51,7 +50,7 @@ |
---|
| 67 | ;; |
---|
| 68 | esac |
---|
| 69 | |
---|
| 70 | -exec gcc ${1+"$@"} |
---|
| 71 | +exec gcc "$@" |
---|
| 72 | END |
---|
| 73 | |
---|
| 74 | chmod +x Mycomp |
---|
| 75 | @@ -59,6 +58,10 @@ |
---|
| 76 | set -e |
---|
| 77 | |
---|
| 78 | |
---|
| 79 | +# Ignore user CFLAGS. |
---|
| 80 | +CFLAGS= |
---|
| 81 | +export CFLAGS |
---|
| 82 | + |
---|
| 83 | for conf in configure.1 configure.3; do |
---|
| 84 | cp $conf configure.in |
---|
| 85 | |
---|