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 0852f6f99536d11953debf5d61b4141c6e8ead38..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;