stas 2004/04/16 12:23:40
Modified: perl-framework/Apache-Test/lib/Apache TestMM.pm TestRun.pm perl-framework/Apache-Test Changes Log: Quote and escape filtered args received during 'perl Makefile.PL' Submitted by: Geoffrey Young, Ken Coar Revision Changes Path 1.33 +3 -2 httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm Index: TestMM.pm =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestMM.pm,v retrieving revision 1.32 retrieving revision 1.33 diff -u -u -r1.32 -r1.33 --- TestMM.pm 26 Mar 2004 01:17:08 -0000 1.32 +++ TestMM.pm 16 Apr 2004 19:23:40 -0000 1.33 @@ -90,8 +90,9 @@ $body .= Apache::TestConfig->modperl_2_inc_fixup; - if (@Apache::TestMM::Argv) { - $body .= "\n\%Apache::TestConfig::Argv = qw(@Apache::TestMM::Argv);\n"; + while (my($k, $v) = splice @Apache::TestMM::Argv, 0, 2) { + $v =~ s/\|/\\|/g; + $body .= "\n\$Apache::TestConfig::Argv{'$k'} = q|$v|;\n"; } my $in = Symbol::gensym(); 1.164 +3 -2 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm Index: TestRun.pm =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v retrieving revision 1.163 retrieving revision 1.164 diff -u -u -r1.163 -r1.164 --- TestRun.pm 5 Apr 2004 04:35:21 -0000 1.163 +++ TestRun.pm 16 Apr 2004 19:23:40 -0000 1.164 @@ -1221,8 +1221,9 @@ $body .= Apache::TestConfig->modperl_2_inc_fixup; - if (@Apache::TestMM::Argv) { - $body .= "\n\%Apache::TestConfig::Argv = qw(@Apache::TestMM::Argv);\n"; + while (my($k, $v) = splice @Apache::TestMM::Argv, 0, 2) { + $v =~ s/\|/\\|/g; + $body .= "\n\$Apache::TestConfig::Argv{'$k'} = q|$v|;\n"; } my $header = Apache::TestConfig->perlscript_header; 1.123 +3 -0 httpd-test/perl-framework/Apache-Test/Changes Index: Changes =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v retrieving revision 1.122 retrieving revision 1.123 diff -u -u -r1.122 -r1.123 --- Changes 15 Apr 2004 13:17:02 -0000 1.122 +++ Changes 16 Apr 2004 19:23:40 -0000 1.123 @@ -8,6 +8,9 @@ =item 1.10-dev +Quote and escape filtered args received during 'perl Makefile.PL' +[Geoffrey Young, Ken Coar] + add :withtestmore import tag to Apache::Test, which will export all standard Apache::Test symbols except those that collide with Test::More. [Geoffrey Young]