summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-07 13:20:58 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-07 13:20:58 -0400
commitec1dd0cd090ccdd8db7140c29755971aa0afa6ef (patch)
treefbdcef01664f7ccf5810f111c0251f12f2ff3f40
parent817616ac6bfc56e4dfbbda9299a8b1ac03acab1a (diff)
downloadwww-ec1dd0cd090ccdd8db7140c29755971aa0afa6ef.tar.gz
www-ec1dd0cd090ccdd8db7140c29755971aa0afa6ef.zip
buildmaster: Ignore whitespace-only lines in the builds file
-rw-r--r--buildserver/builds1
-rw-r--r--buildserver/rbmaster.pm7
2 files changed, 4 insertions, 4 deletions
diff --git a/buildserver/builds b/buildserver/builds
index 922bf67..cbf2369 100644
--- a/buildserver/builds
+++ b/buildserver/builds
@@ -59,7 +59,6 @@ sdl:0:ihifi770csim:IHIFI 770C - Simulator:rockboxui:212940:../tools/configure --
sdl:0:ihifi800sim:IHIFI 800 - Simulator:rockboxui:212940:../tools/configure --target=ihifi800 --type=s && make
sdl:0:samsungypr0:Samsung YP-R0 - Simulator:rockboxui:207580:../tools/configure --target=samsungypr0 --type=s && make
sdl:0:samsungypr1:Samsung YP-R1 - Simulator:rockboxui:118270:../tools/configure --target=samsungypr1 --type=s && make
-
####
# m68k-based native targets
m68k-gcc452:1:iriverh100:iriver H100 - Normal:rockbox.zip:231880:../tools/configure --target=iriverh100 --type=n && make zip
diff --git a/buildserver/rbmaster.pm b/buildserver/rbmaster.pm
index 617e637..86e2e4e 100644
--- a/buildserver/rbmaster.pm
+++ b/buildserver/rbmaster.pm
@@ -21,9 +21,10 @@ sub getbuilds {
open(F, "<$filename");
while(<F>) {
- # arm-eabi-gcc444:0:ipodnano1gboot:iPod Nano 1G - Boot:bootloader-ipodnano1g.ipod:839:../tools/configure --target=ipodnano1g --type=b && make
- next if (/^\#/);
chomp;
+ next if (/^\#/);
+ next if (/^\s*$/);
+ # arm-eabi-gcc444:0:ipodnano1gboot:iPod Nano 1G - Boot:bootloader-ipodnano1g.ipod:839:../tools/configure --target=ipodnano1g --type=b && make
my ($arch, $upload, $id, $name, $result, $score,
$cmdline) = split(':', $_);
$builds{$id}{'arch'}=$arch;
@@ -114,7 +115,7 @@ sub getspeed($)
$us /= scalar @ulspeeds;
}
}
-
+
return (int $bs, int $us);
}
return (0, 0);