Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv17510
Modified Files:
automake1.11.info automake1.12.info automake1.12.patch
Log Message:
Re-enable some automake build tests (they now work thanks to fixes to our dpkg
install-info, resp. in one case due to an upstream fix)
Index: automake1.12.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/automake1.12.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- automake1.12.info 11 Jul 2012 18:54:35 -0000 1.1
+++ automake1.12.info 2 Aug 2012 13:09:23 -0000 1.2
@@ -3,7 +3,8 @@
Revision: 1
Source: mirror:gnu:automake/automake-%v.tar.xz
Source-MD5: 56c3ab38a5ed8f2b825341b4e007372a
-BuildDepends: fink (>= 0.32)
+# versions of dpkg < 1.10.21-1233 have a buggy install-info command
+BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1233)
Depends: autoconf (>= 1:2.63-1) | autoconf2.6
Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6,
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, automake1.12
Replaces: automake, automake1.4, automake15, automake1.5, automake1.6,
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, automake1.12
@@ -19,8 +20,10 @@
# and <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11895>
# * Incorrect test failure in t/self-check-exit.tap
# See <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11898>
+# * Incorrect test failure in t/self-check-explicit-skips.sh
+# See <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11909>
PatchFile: %n.patch
-PatchFile-MD5: bc6027f5f42570d0ec0906977084ec5a
+PatchFile-MD5: aa4a03ee01cba5260b62e16e1b6d334f
PatchScript: <<
#!/bin/sh -ev
@@ -33,12 +36,9 @@
# See <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11893>
/usr/bin/sed -i.orig -e 's|aCC CC FCC KCC RCC xlC_r xlC|xlC_r xlC|g'
configure
# Disable some tests that fail due to our buggy %p/sbin/install-info
- /usr/bin/sed -i.orig -e 's|t/instfail-info\.sh||g' Makefile.in
- /usr/bin/sed -i.orig -e 's|t/txinfo19\.sh||g' Makefile.in
- /usr/bin/sed -i.orig -e 's|t/txinfo26\.sh||g' Makefile.in
- # Disable another failing test; failure is still under investigation.
- # See <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11909>
- /usr/bin/sed -i.orig -e 's|t/self-check-explicit-skips\.sh||g' Makefile.in
+ #/usr/bin/sed -i.orig -e 's|t/instfail-info\.sh||g' Makefile.in
+ #/usr/bin/sed -i.orig -e 's|t/txinfo19\.sh||g' Makefile.in
+ #/usr/bin/sed -i.orig -e 's|t/txinfo26\.sh||g' Makefile.in
<<
ConfigureParams: --infodir=%p/share/info PERL=/usr/bin/perl
Index: automake1.11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/automake1.11.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- automake1.11.info 19 Jul 2012 00:32:14 -0000 1.4
+++ automake1.11.info 2 Aug 2012 13:09:22 -0000 1.5
@@ -3,7 +3,8 @@
Revision: 1
Source: mirror:gnu:automake/automake-%v.tar.xz
Source-MD5: cf4752287ad708f83bd3689da57a32c9
-BuildDepends: fink (>= 0.32)
+# versions of dpkg < 1.10.21-1233 have a buggy install-info command
+BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1233)
Depends: autoconf (>= 1:2.63-1) | autoconf2.6
Conflicts: automake, automake1.4, automake15, automake1.5, automake1.6,
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, automake1.12
Replaces: automake, automake1.4, automake15, automake1.5, automake1.6,
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, automake1.12
@@ -13,8 +14,10 @@
#!/bin/sh -ev
# Fix a test case
/usr/bin/sed -i.orig -e 's|AC_FC_LIBRARY_LDFLAGS||g'
tests/compile_f90_c_cxx.test
- # Disable some tests that fail due to our buggy %p/sbin/install-info
- /usr/bin/sed -i.orig -E -e
's/(install-info-dir|instfail-info|txinfo(3|1[3689]|2[2-68]|33)|version7|vtexi4)\.test//g'
tests/Makefile.in
+ # Disable one failing test: Fails because our install-info tries to create
+ # %p/share/info/dir.bak, which it can't (and shouldn't) do while building
+ # as non-root.
+ /usr/bin/sed -i.orig -E -e 's/install-info-dir\.test//g' tests/Makefile.in
<<
ConfigureParams: --infodir=%p/share/info PERL=/usr/bin/perl
Index: automake1.12.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/automake1.12.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- automake1.12.patch 11 Jul 2012 18:54:35 -0000 1.1
+++ automake1.12.patch 2 Aug 2012 13:09:23 -0000 1.2
@@ -75,6 +75,36 @@
-command_ok_ "syntax error 2" test $? -gt 0
-
:
+diff -ru automake-1.12.2/t/self-check-explicit-skips.sh
automake-1.12.2-patched/t/self-check-explicit-skips.sh
+--- automake-1.12.2/t/self-check-explicit-skips.sh 2012-07-08
11:40:09.000000000 +0200
++++ automake-1.12.2-patched/t/self-check-explicit-skips.sh 2012-07-31
15:50:14.000000000 +0200
+@@ -36,22 +36,19 @@
+ " dummy.sh
+ }
+
+-run_dummy_test '(exit 77); exit 77'
++run_dummy_test 'exit 77'
+ test $? -eq 77 || exit 1
+
+ run_dummy_test 'sh -c "exit 77"' am_explicit_skips=no
+ test $? -eq 77 || exit 1
+
+-run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes
++run_dummy_test '$PERL -e "exit 77"; true' am_explicit_skips=yes
+ test $? -eq 78 || exit 1
+
+-run_dummy_test 'sh -c "exit 77"' am_explicit_skips=y
++run_dummy_test 'sh -c "exit 77"; exit 0' am_explicit_skips=y
+ test $? -eq 78 || exit 1
+
+-run_dummy_test 'exit 77' am_explicit_skips=yes
+-test $? -eq 77 || exit 1
+-
+-run_dummy_test 'skip_ "foo"' am_explicit_skips=y
++run_dummy_test 'skip_ "foo"; :' am_explicit_skips=y
+ test $? -eq 77 || exit 1
+
+ :
diff -ru automake-1.12.2/t/suffix10.tap automake-1.12.2-patched/t/suffix10.tap
--- automake-1.12.2/t/suffix10.tap 2012-07-08 11:40:09.000000000 +0200
+++ automake-1.12.2-patched/t/suffix10.tap 2012-07-10 16:31:39.000000000
+0200
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
