projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use standard POSIX "ustar" format for the scratch disk.
[pintos-anon]
/
src
/
tests
/
make-grade
diff --git
a/src/tests/make-grade
b/src/tests/make-grade
index e6c4b9cdaad627eec2f2ab46612f7b3c43b987ce..a3faa0ebd560ac1f5af6b1180a50f489125860ca 100755
(executable)
--- a/
src/tests/make-grade
+++ b/
src/tests/make-grade
@@
-72,7
+72,7
@@
while (<GRADING>) {
push (@rubrics, '');
my ($pct) = ($score / $possible) * $max_pct;
push (@rubrics, '');
my ($pct) = ($score / $possible) * $max_pct;
- push (@summary, sprintf ("%-4
0
s %3d/%3d %5.1f%%/%5.1f%%",
+ push (@summary, sprintf ("%-4
5
s %3d/%3d %5.1f%%/%5.1f%%",
$rubric_suffix,
$score, $possible,
$pct, $max_pct));
$rubric_suffix,
$score, $possible,
$pct, $max_pct));
@@
-82,16
+82,16
@@
while (<GRADING>) {
close GRADING;
my ($sum_line)
close GRADING;
my ($sum_line)
- = "---------------------------------------- --- --- ------ ------";
+ = "----------------------------------------
-----
--- --- ------ ------";
unshift (@summary,
"SUMMARY BY TEST SET",
'',
unshift (@summary,
"SUMMARY BY TEST SET",
'',
- sprintf ("%-4
0
s %3s %3s %6s %6s",
+ sprintf ("%-4
5
s %3s %3s %6s %6s",
"Test Set", "Pts", "Max", "% Ttl", "% Max"),
$sum_line);
push (@summary,
$sum_line,
"Test Set", "Pts", "Max", "% Ttl", "% Max"),
$sum_line);
push (@summary,
$sum_line,
- sprintf ("%-4
0
s %3s %3s %5.1f%%/%5.1f%%",
+ sprintf ("%-4
5
s %3s %3s %5.1f%%/%5.1f%%",
'Total', '', '', $pct_actual, $pct_possible));
unshift (@rubrics,
'Total', '', '', $pct_actual, $pct_possible));
unshift (@rubrics,
@@
-110,6
+110,9
@@
foreach my $name (keys (%verdicts)) {
}
}
push (@overall, sprintf ("TOTAL TESTING SCORE: %.1f%%", $pct_actual));
}
}
push (@overall, sprintf ("TOTAL TESTING SCORE: %.1f%%", $pct_actual));
+if (sprintf ("%.1f", $pct_actual) eq sprintf ("%.1f", $pct_possible)) {
+ push (@overall, "ALL TESTED PASSED -- PERFECT SCORE");
+}
my (@divider) = ('', '- ' x 38, '');
my (@divider) = ('', '- ' x 38, '');
@@
-132,13
+135,17
@@
for my $test (@failures) {
if (open (OUTPUT, '<', "$test.output")) {
print "\nOUTPUT FROM $test:\n\n";
if (open (OUTPUT, '<', "$test.output")) {
print "\nOUTPUT FROM $test:\n\n";
- my ($panics
) = 0
;
+ my ($panics
, $boots) = (0, 0)
;
while (<OUTPUT>) {
if (/PANIC/ && ++$panics > 2) {
print "[...details of additional panic(s) omitted...]\n";
last;
}
print;
while (<OUTPUT>) {
if (/PANIC/ && ++$panics > 2) {
print "[...details of additional panic(s) omitted...]\n";
last;
}
print;
+ if (/Pintos booting/ && ++$boots > 1) {
+ print "[...details of reboot(s) omitted...]\n";
+ last;
+ }
}
close (OUTPUT);
}
}
close (OUTPUT);
}