Skip to content

Commit e3915dc

Browse files
simonmcqueensimonmcqueen
committed
Revert selected changes from d9af70f
that appear to have broken autobuild.pl with Perl v5.8.8.
1 parent 9065c1d commit e3915dc

1 file changed

Lines changed: 28 additions & 18 deletions

File tree

‎common/prettify.pm‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ our $path = "";
1717
sub new ($)
1818
{
1919
my $proto = shift;
20+
my $basename = shift;
21+
2022
my $class = ref ($proto) || $proto;
2123
my $self = {};
22-
my $basename = shift;
2324
my $filename = $basename . "_Full.html";
2425
my $log_root = main::GetVariable('log_root');
2526
$path = ((defined $log_root) ? ($log_root . '/' . $filename) : $filename);
@@ -39,7 +40,7 @@ sub new ($)
3940
return $self;
4041
}
4142

42-
sub Header ()
43+
sub Header ($)
4344
{
4445
my $self = shift;
4546
print {$self->{FH}} "<html>\n";
@@ -48,7 +49,7 @@ sub Header ()
4849
print {$self->{FH}} "<h1>Daily Build Log</h1>\n";
4950
}
5051

51-
sub Footer ()
52+
sub Footer ($)
5253
{
5354
my $self = shift;
5455
print {$self->{FH}} "</body>\n";
@@ -206,9 +207,10 @@ use FileHandle;
206207
sub new ($)
207208
{
208209
my $proto = shift;
210+
my $basename = shift;
211+
209212
my $class = ref ($proto) || $proto;
210213
my $self = {};
211-
my $basename = shift;
212214
my $filename = $basename . "_Brief.html";
213215

214216
$basename =~ s/^.*\///;
@@ -225,7 +227,7 @@ sub new ($)
225227
return $self;
226228
}
227229

228-
sub Header ()
230+
sub Header ($)
229231
{
230232
my $self = shift;
231233
print {$self->{FH}} "<html>\n";
@@ -234,7 +236,7 @@ sub Header ()
234236
print {$self->{FH}} "<h1>Daily Build Log (Brief)</h1>\n";
235237
}
236238

237-
sub Footer ()
239+
sub Footer ($)
238240
{
239241
my $self = shift;
240242

@@ -368,14 +370,15 @@ use FileHandle;
368370
sub new ($)
369371
{
370372
my $proto = shift;
371-
my $class = ref ($proto) || $proto;
372-
my $self = {};
373373
my $basename = shift;
374374
my $buildname = shift;
375375
my $failed_tests = shift;
376376
my $rev_link = shift;
377377
my $log_prefix = shift;
378378

379+
my $class = ref ($proto) || $proto;
380+
my $self = {};
381+
379382
my $filename = $log_prefix . "_Failed_Tests_By_Build.html";
380383

381384
$basename =~ s/^.*\///;
@@ -595,10 +598,11 @@ use FileHandle;
595598
sub new ($)
596599
{
597600
my $proto = shift;
601+
my $basename = shift;
602+
598603
my $class = ref ($proto) || $proto;
599604
my $self = {};
600605

601-
my $basename = shift;
602606
my $filename = $basename . '_JUnit.xml';
603607
$self->{FH} = new FileHandle ($filename, 'w');
604608
$self->{FILENAME} = $filename;
@@ -610,7 +614,7 @@ sub new ($)
610614
return $self;
611615
}
612616

613-
sub Header ()
617+
sub Header ($)
614618
{
615619
my $self = shift;
616620
my $out = $self->{FH};
@@ -619,7 +623,7 @@ sub Header ()
619623
' xsi:noNamespaceSchemaLocation="JUnit.xsd">', "\n";
620624
}
621625

622-
sub Footer ()
626+
sub Footer ($)
623627
{
624628
my $self = shift;
625629
my $out = $self->{FH};
@@ -732,7 +736,9 @@ sub CleanCData
732736
sub Error ($)
733737
{
734738
my $self = shift;
735-
my $line = (shift) . "\n";
739+
my $line = shift;
740+
741+
$line = $line . "\n";
736742
my $test = $self->CurrentTest ();
737743
return unless defined $test;
738744

@@ -745,7 +751,9 @@ sub Error ($)
745751
sub Warning ($)
746752
{
747753
my $self = shift;
748-
my $line = (shift) . "\n";
754+
my $line = shift;
755+
756+
$line = $line . "\n";
749757
my $test = $self->CurrentTest ();
750758
return unless defined $test;
751759
CleanCData (\$line);
@@ -755,7 +763,9 @@ sub Warning ($)
755763
sub Normal ($)
756764
{
757765
my $self = shift;
758-
my $line = (shift) . "\n";
766+
my $line = shift;
767+
768+
$line = $line . "\n";
759769
my $test = $self->CurrentTest ();
760770
return unless defined $test;
761771
my $separator = '=' x 78 . "\n";
@@ -789,8 +799,8 @@ use FileHandle;
789799
sub new ($)
790800
{
791801
my $proto = shift;
792-
my $class = ref ($proto) || $proto;
793802
my $basename = shift;
803+
my $class = ref ($proto) || $proto;
794804
my $filename = $basename . '_Totals.html';
795805
my $self = {};
796806

@@ -1937,9 +1947,9 @@ my $host_next = 0;
19371947
sub new ($)
19381948
{
19391949
my $proto = shift;
1950+
my $basename = shift;
19401951
my $class = ref ($proto) || $proto;
19411952
my $self = {};
1942-
my $basename = shift;
19431953
my $filename = $basename . "_Config.html";
19441954

19451955
$basename =~ s/^.*\///;
@@ -1956,7 +1966,7 @@ sub new ($)
19561966
return $self;
19571967
}
19581968

1959-
sub Header ()
1969+
sub Header ($)
19601970
{
19611971
my $self = shift;
19621972
print {$self->{FH}} "<html>\n";
@@ -1966,7 +1976,7 @@ sub Header ()
19661976
print {$self->{FH}} "<pre>\n";
19671977
}
19681978

1969-
sub Footer ()
1979+
sub Footer ($)
19701980
{
19711981
my $self = shift;
19721982
print {$self->{FH}} "</pre>\n";

0 commit comments

Comments
 (0)