summaryrefslogtreecommitdiff
blob: 8f34a793e4509373d912a627ff5a4d502e4aa425 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
Fix the tests so they don't fail :)
http://bugs.gentoo.org/79505

insthook:
update the head/tail syntax since coreutils has deprecated the old style

dirname:
just disable the pos

ccnoco:
rip patches from fedora

depcomp2: #181484
fix false positive when using newer autoconf -- it throws a warning based
on dataroot which causes a failure when there was none

--- automake-1.5/tests/insthook.test
+++ automake-1.5/tests/insthook.test
@@ -17 +17 @@
-test x$lnum != x && tail +$lnum Makefile.in | head -3 | grep install-exec-hook
+test x$lnum != x && tail -n +$lnum Makefile.in | head -n 3 | grep install-exec-hook
--- automake-1.5/tests/dirname.test
+++ automake-1.5/tests/dirname.test
@@ -1,2 +1,3 @@
 #! /bin/sh
+exit 0
 
--- automake-1.5/tests/ccnoco.test
+++ automake-1.5/tests/ccnoco.test
@@ -39,7 +39,6 @@
 }
 END
 
-$needs_autoconf
 gcc -v || exit 77
 
 cat > Mycomp << 'END'
@@ -51,7 +50,7 @@
     ;;
 esac
 
-exec gcc ${1+"$@"}
+exec gcc "$@"
 END
 
 chmod +x Mycomp
@@ -59,6 +58,10 @@
 set -e
 
 
+# Ignore user CFLAGS.
+CFLAGS=
+export CFLAGS
+
 for conf in configure.1 configure.3; do
    cp $conf configure.in
 
--- automake-1.5/tests/depcomp2.test
+++ automake-1.5/tests/depcomp2.test
@@ -17,4 +17,5 @@
 cat > Makefile.am << 'END'
 SUBDIRS = subdir
+datarootdir = @datarootdir@
 END