[Lsb-messages] /var/www/bzr/lsb/4.1/perl-test r99: Backport bug 3660 mods from devel

[Stew Benedict]

------------------------------------------------------------
revno: 99
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: perl-test
timestamp: Mon 2013-01-28 10:29:41 -0500
message:
  Backport bug 3660 mods from devel
added:
  scripts/package/perl-test-bug-3660.patch
modified:
  scripts/package/Makefile
  scripts/package/lsb-test-perl.spec.sed
-------------- next part --------------
=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2012-06-21 13:43:58 +0000
+++ b/scripts/package/Makefile	2013-01-28 15:29:41 +0000
@@ -1,8 +1,8 @@
 # XXX We should play the usual tricks defining stuff here and building
 # XXX a specfile from this info, but not yet: for now keep in sync
 PACKAGE=lsb-test-perl
-VERSION=4.1.6
-RELEASE=2
+VERSION=4.1.7
+RELEASE=1
 PERLVER8=5.8.8
 PERLVER10=5.10.0
 PERLURL=http://www.cpan.org/src/5.0/

=== modified file 'scripts/package/lsb-test-perl.spec.sed'
--- a/scripts/package/lsb-test-perl.spec.sed	2012-06-12 20:38:57 +0000
+++ b/scripts/package/lsb-test-perl.spec.sed	2013-01-28 15:29:41 +0000
@@ -54,6 +54,7 @@
 Patch33: perl-test-bug-3466.patch
 Patch34: perl-test-bug-3554.patch
 Patch35: perl-test-bug-3590.patch
+Patch36: perl-test-bug-3660.patch
 
 URL: http://bzr.linuxfoundation.org/loggerhead/lsb/devel/perl-test/files
 BuildRoot: %{_tmppath}/%{name}-root
@@ -90,6 +91,7 @@
 %patch31 -p0 -b .3424
 %patch32 -p0 -b .3450
 %patch33 -p0 -b .3466
+%patch36 -p0 -b .3660
 cd ..
 %patch17 -p1 -b .2845
 %patch18 -p1 -b .2848
@@ -735,7 +737,7 @@
 done
 
 # clean up the patch backup files
-for extension in system-perl tet-output tet-output10 set-euid 1888 2114 2147 2507 2605 2613 1889 2644 2705 2820 2840 2845 2848 2953 3043 3066 3128 3148 3152 5.8.9 3154 3161 3113 3249 3266 3424 3450 3466 3554 3590;do
+for extension in system-perl tet-output tet-output10 set-euid 1888 2114 2147 2507 2605 2613 1889 2644 2705 2820 2840 2845 2848 2953 3043 3066 3128 3148 3152 5.8.9 3154 3161 3113 3249 3266 3424 3450 3466 3554 3590 3660;do
   find . -name "*.$extension" | xargs rm -f
 done
 popd
@@ -813,6 +815,9 @@
 
 #==================================================
 %changelog
+* Mon Jan 28 2013 Stew Benedict <stewb at linux-foundation.org>
+- disable two perl-CGI subtests  (behavior change, bug 3660, P36)
+
 * Tue Jun 12 2012 Stew Benedict <stewb at linux-foundation.org>
 - Tests failing against 5.16.0 - disable (bug 3590, P35)
 

=== added file 'scripts/package/perl-test-bug-3660.patch'
--- a/scripts/package/perl-test-bug-3660.patch	1970-01-01 00:00:00 +0000
+++ b/scripts/package/perl-test-bug-3660.patch	2013-01-28 15:29:41 +0000
@@ -0,0 +1,45 @@
+diff -up ./lib/CGI/t/form.t.3660 ./lib/CGI/t/form.t
+--- ./lib/CGI/t/form.t.3660	2007-12-18 05:47:07.000000000 -0500
++++ ./lib/CGI/t/form.t	2013-01-28 09:48:17.498199488 -0500
+@@ -4,7 +4,7 @@
+ # ensure the blib's are in @INC, else we might use the core CGI.pm
+ use lib qw(. ./blib/lib ./blib/arch);
+ 
+-use Test::More tests => 19;
++use Test::More tests => 18;
+ 
+ BEGIN { use_ok('CGI'); };
+ use CGI (':standard','-no_debug','-tabindex');
+@@ -28,9 +28,10 @@ $ENV{SERVER_PROTOCOL} = 'HTTP/1.0';
+ $ENV{SERVER_PORT}     = 8080;
+ $ENV{SERVER_NAME}     = 'the.good.ship.lollypop.com';
+ 
+-is(start_form(-action=>'foobar',-method=>'get'),
+-   qq(<form method="get" action="foobar" enctype="multipart/form-data">\n),
+-   "start_form()");
++# LSB bug 3660 - behavior changed slightly
++#is(start_form(-action=>'foobar',-method=>'get'),
++#   (qq(<form method="get" action="foobar" enctype="multipart/form-data">\n),
++#   "start_form()");
+ 
+ is(submit(),
+    qq(<input type="submit" tabindex="1" name=".submit" />),
+diff -up ./lib/CGI/t/function.t.3660 ./lib/CGI/t/function.t
+--- ./lib/CGI/t/function.t.3660	2013-01-28 10:18:58.347057266 -0500
++++ ./lib/CGI/t/function.t	2013-01-28 10:19:26.569057277 -0500
+@@ -6,7 +6,7 @@ use lib qw(t/lib);
+ ######################### We start with some black magic to print on failure.
+ use lib '.','..','../blib/lib','../blib/arch';
+ 
+-BEGIN {$| = 1; print "1..32\n"; }
++BEGIN {$| = 1; print "1..31\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ use Config;
+ use CGI (':standard','keywords');
+@@ -114,4 +114,5 @@ test(30, !charset("") && header() eq "Co
+ 
+ test(31, header(-foo=>'bar') eq "Foo: bar${CRLF}Content-Type: text/html${CRLF}${CRLF}", "Custom header");
+ 
+-test(32, start_form(-action=>'one',name=>'two',onsubmit=>'three') eq qq(<form method="post" action="one" enctype="multipart/form-data" onsubmit="three" name="two">\n), "initial dash followed by undashed arguments");
++# LSB bug 3660 - behavior change
++#test(32, start_form(-action=>'one',name=>'two',onsubmit=>'three') eq qq(<form method="post" action="one" enctype="multipart/form-data" onsubmit="three" name="two">\n), "initial dash followed by undashed arguments");