projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(strip_exit_codes) Include _ in the list of characters considered as
[pintos-anon]
/
grading
/
lib
/
Pintos
/
Grading.pm
diff --git
a/grading/lib/Pintos/Grading.pm
b/grading/lib/Pintos/Grading.pm
index 30ac7101493b473bf96a316f0268e986f64581fb..90d9ba311ce548636748097f9a7f7a32c7d5b1ee 100644
(file)
--- a/
grading/lib/Pintos/Grading.pm
+++ b/
grading/lib/Pintos/Grading.pm
@@
-422,7
+422,14
@@
sub run_pintos {
sub grade_test {
# Read test output.
my ($outfile) = "output/$test/run.out";
sub grade_test {
# Read test output.
my ($outfile) = "output/$test/run.out";
- die "$outfile: missing test output file (make failed?)" if ! -e $outfile;
+ if (! -e $outfile) {
+ if (-s "output/$test/make.err") {
+ # make failed.
+ $details{$test} = snarf ("output/$test/make.err");
+ return "make failed. Error messages at end of file.";
+ }
+ return "preparation for test failed";
+ }
my (@output) = snarf ($outfile);
# If there's a function "grade_$test", use it to evaluate the output.
my (@output) = snarf ($outfile);
# If there's a function "grade_$test", use it to evaluate the output.
@@
-691,7
+698,7
@@
sub canonicalize_exit_codes {
}
sub strip_exit_codes {
}
sub strip_exit_codes {
- return grep (!/^[-a-z0-9]+: exit\(-?\d+\)/, canonicalize_exit_codes (@_));
+ return grep (!/^[-
_
a-z0-9]+: exit\(-?\d+\)/, canonicalize_exit_codes (@_));
}
sub compare_output {
}
sub compare_output {