summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwurblzap%gmail.com <>2008-03-18 23:30:02 +0100
committerwurblzap%gmail.com <>2008-03-18 23:30:02 +0100
commit849b1c1357ca06a56ff9cd82adf67fd67c8878cb (patch)
treea8446ca9abea6fa9fe71f9855334649f6c745685
parent005af1b6b7e3da76b7c4c4fae9e0f15218d03a8c (diff)
downloadbugzilla-849b1c1357ca06a56ff9cd82adf67fd67c8878cb.tar.gz
bugzilla-849b1c1357ca06a56ff9cd82adf67fd67c8878cb.tar.xz
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
-rw-r--r--t/001compile.t14
1 files changed, 12 insertions, 2 deletions
diff --git a/t/001compile.t b/t/001compile.t
index fdbe875e3..78fc6a684 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -91,13 +91,23 @@ foreach my $file (@testitems) {
my $loginfo=`$command`;
#print '@@'.$loginfo.'##';
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") {
ok(0,$file." --WARNING");
print $fh $loginfo;
- } else {
+ }
+ else {
ok(1,$file);
}
- } else {
+ }
+ else {
ok(0,$file." --ERROR");
print $fh $loginfo;
}