Gentoo Archives: gentoo-commits

From: "vapier (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/automake/files: automake-1.6.3-test-fixes.patch automake-1.8.5-test-fixes.patch automake-1.7.9-test-fixes.patch
Date: Sat, 08 Sep 2007 06:53:17
Message-Id: E1ITu5N-0000aL-Al@stork.gentoo.org
vapier      07/09/08 06:46:29

  Added:                automake-1.6.3-test-fixes.patch
                        automake-1.8.5-test-fixes.patch
                        automake-1.7.9-test-fixes.patch
  Log:
  Fixup misc false test failures related to newer versions of autotools in general.
  (Portage version: 2.1.3.7)

Revision  Changes    Path
1.1                  sys-devel/automake/files/automake-1.6.3-test-fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.6.3-test-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.6.3-test-fixes.patch?rev=1.1&content-type=text/plain

Index: automake-1.6.3-test-fixes.patch
===================================================================
Fix the tests so they don't fail :)

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

man2: #159557
grab update from newer automake

--- automake-1.6.3/tests/depcomp2.test
+++ automake-1.6.3/tests/depcomp2.test
@@ -17,4 +17,5 @@
 cat > Makefile.am << 'END'
 SUBDIRS = subdir
+datarootdir = @datarootdir@
 END
 
--- automake-1.6.3/tests/man2.test
+++ automake-1.6.3/tests/man2.test
@@ -23,7 +23,7 @@
 $AUTOMAKE
 
 # Let's play with $DESTDIR too, it shouldn't hurt.
-./configure --prefix=''
+./configure --prefix='' --mandir=/man
 DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install
 
 test -f ./=inst/man/man2/foo.2



1.1                  sys-devel/automake/files/automake-1.8.5-test-fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.8.5-test-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.8.5-test-fixes.patch?rev=1.1&content-type=text/plain

Index: automake-1.8.5-test-fixes.patch
===================================================================
Fix the tests so they don't fail :)

exdir2 man2 transform: #159557 #162565
grab updates from newer automake

--- automake-1.8.5/tests/man2.test
+++ automake-1.8.5/tests/man2.test
@@ -41,7 +41,7 @@
 $AUTOMAKE
 
 # Let's play with $DESTDIR too, it shouldn't hurt.
-./configure --prefix=''
+./configure --prefix='' --mandir=/man
 DESTDIR="`pwd`/_inst" $MAKE -e install
 
 test -f ./_inst/man/man2/foo.2
--- automake-1.8.5/tests/transform.test
+++ automake-1.8.5/tests/transform.test
@@ -56,7 +56,7 @@
 $AUTOCONF
 $AUTOMAKE
 
-./configure --program-prefix=gnu- --prefix `pwd`/inst
+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
 $MAKE
 $MAKE test-install
 $MAKE uninstall
--- automake-1.8.5/tests/exdir2.test
+++ automake-1.8.5/tests/exdir2.test
@@ -25,11 +25,11 @@
 set -e
 
 cat > Makefile.am << 'EOF'
-html_DATA = zot.html
+quuz_DATA = zot.html
 pkgdata_DATA = qbert
 EOF
 
 $ACLOCAL
 AUTOMAKE_fails
 grep 'pkgdatadir' stderr && exit 1
-grep 'Makefile.am:1:.*htmldir.*undefined' stderr
+grep 'Makefile.am:1:.*quuzdir.*undefined' stderr



1.1                  sys-devel/automake/files/automake-1.7.9-test-fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.7.9-test-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.7.9-test-fixes.patch?rev=1.1&content-type=text/plain

Index: automake-1.7.9-test-fixes.patch
===================================================================
Fix the tests so they don't fail :)

exdir2 man2 transform: #159557 #162565
grab updates from newer automake

mkdir-tests.m4:
when mixing newer gettext with this automake, the tests bomb out
as AM_PROG_MKDIR_P is not provided properly

--- automake-1.7.9/tests/man2.test
+++ automake-1.7.9/tests/man2.test
@@ -41,7 +41,7 @@
 $AUTOMAKE
 
 # Let's play with $DESTDIR too, it shouldn't hurt.
-./configure --prefix=''
+./configure --prefix='' --mandir=/man
 DESTDIR="`pwd`/_inst" $MAKE -e install
 
 test -f ./_inst/man/man2/foo.2
--- automake-1.7.9/tests/transform.test
+++ automake-1.7.9/tests/transform.test
@@ -56,7 +56,7 @@
 $AUTOCONF
 $AUTOMAKE
 
-./configure --program-prefix=gnu- --prefix `pwd`/inst
+./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
 $MAKE
 $MAKE test-install
 $MAKE uninstall
--- automake-1.7.9/tests/exdir2.test
+++ automake-1.7.9/tests/exdir2.test
@@ -23,7 +23,7 @@
 . ./defs || exit 1
 
 cat > Makefile.am << 'EOF'
-html_DATA = zot.html
+quuz_DATA = zot.html
 pkgdata_DATA = qbert
 EOF
 
--- automake-1.7.9/m4/mkdir-tests.m4
+++ automake-1.7.9/m4/mkdir-tests.m4
@@ -0,0 +1 @@
+AC_DEFUN([AM_PROG_MKDIR_P])



-- 
gentoo-commits@g.o mailing list