Automatically skip tests that require USE=debug #286173 by Alexis Ballier.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 65 insertions, 7 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index fd3ce99c410d..63af531180fa 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.112 2009/09/23 19:55:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.113 2009/09/26 18:07:58 vapier Exp $
+
+  26 Sep 2009; Mike Frysinger <vapier@gentoo.org> wget-1.12.ebuild,
+  +files/wget-1.12-debug-tests.patch:
+  Automatically skip tests that require USE=debug #286173 by Alexis Ballier.
 
   23 Sep 2009; Mike Frysinger <vapier@gentoo.org> wget-1.12.ebuild,
   +files/wget-1.12-linking.patch, metadata.xml:
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 3fc03a7cbe62..7ee761bd5e6d 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX wget-1.11-linking.patch 4935 RMD160 4285dd7325f29ac49edd5c42853c9f09b683b844 SHA1 2ae2e3202daa7ed0c4f33bd005469ab7c558ae7d SHA256 3f3a1b6ec439ba042c3da92cca04990e71ff4894ffc04d2d52a3186194665171
+AUX wget-1.12-debug-tests.patch 1043 RMD160 fa781575f12a9483399c450b83c3584133bc4fc8 SHA1 76bbf6e2252a4d90a4b332fa37881ff4eae83e3f SHA256 ba3e1b25869ffd310615aeababdb256e9a356af555f578753bd3985f50cb22bb
 AUX wget-1.12-linking.patch 9511 RMD160 8c7a27ec67d9c4ed9eb79c525bf1bff64bfaee95 SHA1 08905ad2bbfbe23a70d84d148426b671a20b5a6d SHA256 c53933a8a64574c999be2381c5991053725f9a6651b130511ed88fdacdc66c91
 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518
 DIST wget-1.11.4.tar.bz2 954561 RMD160 c7a7791a28900b8a4abb654f72b8dbd8982879ec SHA1 a69e382c0965992b2c662e80f7040600207619d2 SHA256 8b7f52e2861b89c3ee0cc10c3665af5b705d0cb7fc00bca59a9b1e2b50e027fb
 DIST wget-1.12.tar.bz2 1609032 RMD160 52fca690ea2b4e763a655aff36495059612fc65d SHA1 1a059b3736ef908b68acac91670f9df576d1a061 SHA256 c823d938e2f849305a101c0860229b123d7564c26470fdac9118d85e3c7dba9a
 EBUILD wget-1.11.4.ebuild 1831 RMD160 5428c5cf65e28d8200c5a296e6bd46e92fd96c07 SHA1 1adb9a5616a74f9777a0841acfa09f0568a97c36 SHA256 7ed3f3b4c61130ed7409b4ba48eaaf47adcd17b671493e816337fb45fd5a2f70
-EBUILD wget-1.12.ebuild 2090 RMD160 176d919cd184e3d7696ce854ab99c696bef82fde SHA1 739c9d126c613bf749890cb149c9115aebdb39d2 SHA256 bbec26e588ad60ed2f08d7f8d348797fe4ea41dde56f7e3e7b6511d00fca0907
-MISC ChangeLog 17281 RMD160 0533d62ced93f887c43a75a559a0dbad472fe5eb SHA1 924b5698001d7e92207928725d24fbc842063e39 SHA256 4981facc99b094f8ca64e92d1d438f611bcbac01a669c440360f42724ef502f6
+EBUILD wget-1.12.ebuild 2143 RMD160 75c62d15263419438741ad3859a41d063dd4cb4f SHA1 982d9a7693d1d38b81c6958f18dfb048afe22a40 SHA256 4c57629d050d2305942b233a384e289642fff735b1c59ef6e99deef0ed1f0fc8
+MISC ChangeLog 17465 RMD160 1c777aa8ece3e6be53b5735b0141823231d6c7b0 SHA1 b356435ad4b8352d8a0dd2828c22aae7ae27026b SHA256 5f6860ed940a00e25494db1f258690a51e6552085acf04739dc1aca5701d5d5a
 MISC metadata.xml 258 RMD160 67393c1bb85136bfc1cd8e1145f3e5e0efa32828 SHA1 8d60f18c79ce849b2e3b31d33cb04ef8a0d70546 SHA256 63f6de85aadabff6f0250403fd8c60a6782e62b0d953dbdae71daf62ea717716
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq6fSoACgkQlPl3HsVfCDqi7gCdFk7/OtVuDt5/vCEotV8MmtXq
-1k4An1eb+rGgr9aTAuG+AQcIi8XFkwHF
-=LfJE
+iEYEARECAAYFAkq+WIMACgkQlPl3HsVfCDoQxQCdHHJk7pciZKdo6zQF3B9/iNfG
+rXIAn2Tw9Wk9JX9Uoq6zFsgfTcHYt5CO
+=Mo4x
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wget/files/wget-1.12-debug-tests.patch b/net-misc/wget/files/wget-1.12-debug-tests.patch
new file mode 100644
index 000000000000..7891ed354629
--- /dev/null
+++ b/net-misc/wget/files/wget-1.12-debug-tests.patch
@@ -0,0 +1,52 @@
+Skip tests that require USE=debug when building with USE=-debug
+
+http://bugs.gentoo.org/286173
+
+--- a/tests/Test-E-k-K.px
++++ b/tests/Test-E-k-K.px
+@@ -3,6 +3,7 @@
+ use strict;
+ use warnings;
+ 
++use WgetFeature qw(debug);
+ use HTTPTest;
+ 
+ 
+--- a/tests/Test-cookies-401.px
++++ b/tests/Test-cookies-401.px
+@@ -3,6 +3,7 @@
+ use strict;
+ use warnings;
+ 
++use WgetFeature qw(debug);
+ use HTTPTest;
+ 
+ 
+--- a/tests/Test-ftp-bad-list.px
++++ b/tests/Test-ftp-bad-list.px
+@@ -3,6 +3,7 @@
+ use strict;
+ use warnings;
+ 
++use WgetFeature qw(debug);
+ use FTPTest;
+ 
+ 
+--- a/tests/Test-proxy-auth-basic.px
++++ b/tests/Test-proxy-auth-basic.px
+@@ -3,6 +3,7 @@
+ use strict;
+ use warnings;
+ 
++use WgetFeature qw(debug);
+ use HTTPTest;
+ 
+ 
+--- a/tests/WgetFeature.cfg
++++ b/tests/WgetFeature.cfg
+@@ -1,4 +1,5 @@
+ %skip_messages = (
++    debug => "Not running test: Wget under test doesn't support debug.",
+     https => "Not running test: Wget under test doesn't support HTTPS.",
+     iri   => "Not running test: Wget under test doesn't support IDN/IRI.",
+ );
diff --git a/net-misc/wget/wget-1.12.ebuild b/net-misc/wget/wget-1.12.ebuild
index fb3874ca571b..e173c9560f03 100644
--- a/net-misc/wget/wget-1.12.ebuild
+++ b/net-misc/wget/wget-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12.ebuild,v 1.2 2009/09/23 19:55:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.12.ebuild,v 1.3 2009/09/26 18:07:58 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.12-linking.patch
+	epatch "${FILESDIR}"/${P}-debug-tests.patch #286173
 }
 
 src_compile() {