projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix runaway bochs, pintos processes on time-outs.
[pintos-anon]
/
grading
/
lib
/
Pintos
/
Grading.pm
diff --git
a/grading/lib/Pintos/Grading.pm
b/grading/lib/Pintos/Grading.pm
index 3ebeb223b6a7ee53f5b7c6f11e943c2010075156..30ac7101493b473bf96a316f0268e986f64581fb 100644
(file)
--- a/
grading/lib/Pintos/Grading.pm
+++ b/
grading/lib/Pintos/Grading.pm
@@
-13,13
+13,20
@@
our $action;
our $hw;
use POSIX;
our $hw;
use POSIX;
-use Getopt::Long;
+use Getopt::Long
qw(:config no_ignore_case)
;
use Algorithm::Diff;
\f
use Algorithm::Diff;
\f
+# We execute lots of subprocesses.
+# Without this, our stdout output can get flushed multiple times,
+# which is harmless but looks bizarre.
+$| = 1;
+
sub parse_cmd_line {
sub parse_cmd_line {
+ my ($do_regex, $no_regex);
GetOptions ("v|verbose+" => \$verbose,
"h|help" => sub { usage (0) },
GetOptions ("v|verbose+" => \$verbose,
"h|help" => sub { usage (0) },
- "tests=s" => \@TESTS,
+ "d|do-tests=s" => \$do_regex,
+ "n|no-tests=s" => \$no_regex,
"c|clean" => sub { set_action ('clean'); },
"x|extract" => sub { set_action ('extract'); },
"b|build" => sub { set_action ('build'); },
"c|clean" => sub { set_action ('clean'); },
"x|extract" => sub { set_action ('extract'); },
"b|build" => sub { set_action ('build'); },
@@
-33,6
+40,11
@@
sub parse_cmd_line {
if (!defined $action) {
$action = -e 'review.txt' ? 'assemble' : 'test';
}
if (!defined $action) {
$action = -e 'review.txt' ? 'assemble' : 'test';
}
+
+ my (@default_tests) = @_;
+ @TESTS = @default_tests;
+ @TESTS = grep (/$do_regex/, @TESTS) if defined $do_regex;
+ @TESTS = grep (!/$no_regex/, @TESTS) if defined $no_regex;
}
sub set_action {
}
sub set_action {
@@
-70,7
+82,8
@@
Workflow:
Options:
-c, --clean Delete test results and temporary files, then exit.
Options:
-c, --clean Delete test results and temporary files, then exit.
- --tests=TESTS Run only the specified comma-separated tests.
+ -d, --do-tests=RE Run only tests that match the given regular expression.
+ -n, --no-tests=RE Do not run tests that match the given regular expression.
-x, --extract Stop after step 1.
-b, --build Stop after step 2.
-t, --test Stop after step 3 (default if "review.txt" not present).
-x, --extract Stop after step 1.
-b, --build Stop after step 2.
-t, --test Stop after step 3 (default if "review.txt" not present).
@@
-303,7
+316,13
@@
sub xsystem {
open (STDOUT, ">output/$log.out");
open (STDERR, ">output/$log.err");
}
open (STDOUT, ">output/$log.out");
open (STDERR, ">output/$log.err");
}
- exec ($command);
+ chdir $options{CHDIR} or die "$options{CHDIR}: chdir: $!\n"
+ if defined ($options{CHDIR});
+ if (!defined ($options{EXEC})) {
+ exec ($command);
+ } else {
+ exec (@{$options{EXEC}});
+ }
exit (-1);
}
waitpid ($pid, 0);
exit (-1);
}
waitpid ($pid, 0);
@@
-332,12
+351,9
@@
sub xsystem {
print "Child terminated with signal $signal\n";
}
print "Child terminated with signal $signal\n";
}
- my ($exp_status) = !defined ($options{EXPECT}) ? 0 : $options{EXPECT};
- $result = WIFEXITED ($status) && WEXITSTATUS ($status) == $exp_status
- ? "ok" : "error";
+ $result = $status == 0 ? "ok" : "error";
}
}
-
if ($result eq 'error' && defined $options{DIE}) {
my ($msg) = $options{DIE};
if (defined ($log)) {
if ($result eq 'error' && defined $options{DIE}) {
my ($msg) = $options{DIE};
if (defined ($log)) {
@@
-389,10
+405,15
@@
sub get_test_result {
sub run_pintos {
my ($cmd_line, %args) = @_;
sub run_pintos {
my ($cmd_line, %args) = @_;
-
$args{EXPECT} = 1 unless defined $args{EXPECT}
;
- my ($retval) = xsystem (
$cmd_line, %args
);
+
unshift (@$cmd_line, 'pintos')
;
+ my ($retval) = xsystem (
join (' ', @$cmd_line), %args, EXEC => $cmd_line
);
return 'ok' if $retval eq 'ok';
return 'ok' if $retval eq 'ok';
- return "Timed out after $args{TIMEOUT} seconds" if $retval eq 'timeout';
+ if ($retval eq 'timeout') {
+ my ($msg) = "Timed out after $args{TIMEOUT} seconds";
+ my ($load_avg) = `uptime` =~ /(load average:.*)$/i;
+ $msg .= " - $load_avg" if defined $load_avg;
+ return $msg;
+ }
return 'Error running Bochs' if $retval eq 'error';
die;
}
return 'Error running Bochs' if $retval eq 'error';
die;
}
@@
-400,7
+421,9
@@
sub run_pintos {
# Grade the test.
sub grade_test {
# Read test output.
# Grade the test.
sub grade_test {
# Read test output.
- my (@output) = snarf ("output/$test/run.out");
+ my ($outfile) = "output/$test/run.out";
+ die "$outfile: missing test output file (make failed?)" if ! -e $outfile;
+ my (@output) = snarf ($outfile);
# If there's a function "grade_$test", use it to evaluate the output.
# If there's a file "$GRADES_DIR/$test.exp", compare its contents
# If there's a function "grade_$test", use it to evaluate the output.
# If there's a file "$GRADES_DIR/$test.exp", compare its contents
@@
-817,5
+840,12
@@
sub file_contains {
close (FILE);
return $equal;
}
close (FILE);
return $equal;
}
+
\f
+sub success {
+ for my $test (@TESTS) {
+ return 1 if !defined ($result{$test}) || $result{$test} ne 'ok';
+ }
+ return 0;
+}
1;
1;