Commit 849b1c13 authored by wurblzap%gmail.com's avatar wurblzap%gmail.com

Bug 416047 – Test 1 fails in compiling Bugzilla::Install::CPAN and…

Bug 416047 – Test 1 fails in compiling Bugzilla::Install::CPAN and install-module.pl when Cygwin is installed. Patch by Marc Schumann <wurblzap@gmail.com>; r=LpSolit; a=LpSolit
parent 005af1b6
...@@ -91,13 +91,23 @@ foreach my $file (@testitems) { ...@@ -91,13 +91,23 @@ foreach my $file (@testitems) {
my $loginfo=`$command`; my $loginfo=`$command`;
#print '@@'.$loginfo.'##'; #print '@@'.$loginfo.'##';
if ($loginfo =~ /syntax ok$/im) { if ($loginfo =~ /syntax ok$/im) {
# Special hack due to CPAN.pm on Windows with Cygwin installed throwing
# strings of the form "Set up gcc environment - 3.4.4 (cygming special,
# gdc 0.12, using dmd 0.125)". See bug 416047 for details.
if ($^O =~ /MSWin32/i
&& grep($_ eq $file, 'install-module.pl', 'Bugzilla/Install/CPAN.pm'))
{
$loginfo =~ s/^Set up gcc environment.*?\n//;
}
if ($loginfo ne "$file syntax OK\n") { if ($loginfo ne "$file syntax OK\n") {
ok(0,$file." --WARNING"); ok(0,$file." --WARNING");
print $fh $loginfo; print $fh $loginfo;
} else { }
else {
ok(1,$file); ok(1,$file);
} }
} else { }
else {
ok(0,$file." --ERROR"); ok(0,$file." --ERROR");
print $fh $loginfo; print $fh $loginfo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment