Apply appropriate changes from main branch to bring win0405-branch up

[pintos-anon] / grading / threads / run-tests

diff --git a/grading/threads/run-tests b/grading/threads/run-tests
index 731499adc67e8a59f968ec71e21178fd6d56189f..dd2e7d3de52c843656aaf1d5549ebfbd5639cdfd 100755 (executable)
--- a/grading/threads/run-tests
+++ b/grading/threads/run-tests
@@ -56,6 +56,7 @@ die "Don't know how to '$action'";
 sub run_test {
     # Change constants.h if necessary.
     my ($defines) = $test ne 'mlfqs-on' ? "" : "#define MLFQS 1\n";
+    $defines .= "#define THREAD_JOIN_IMPLEMENTED 1\n";
     if ($defines ne snarf ("pintos/src/constants.h")) {
        open (CONSTANTS, ">pintos/src/constants.h");
        print CONSTANTS $defines;
@@ -94,7 +95,7 @@ sub run_test {
     xsystem ("cp pintos/src/threads/build/os.dsk output/$test");
 
     # Run.
-    my ($timeout) = $test !~ /^mlfqs/ ? 10 : 600;
+    my ($timeout) = $test !~ /^mlfqs/ ? 15 : 600;
     return run_pintos (["-v", "run", "-q"],
                       CHDIR => "pintos/src/threads/build",
                       LOG => "$test/run",