Fix dosep.py on windows after r240946

[labath]

Summary

On windows, global python variables are not automatically passed to child processes. This commit
makes sure the default timeout value is available to child processes by passing it directly.
I pass the whole dotest_opts value to the children, so we can use the other members as well if we
need to do it in the future.

[amccarth]

Looks good.

test/dosep.py

72 ↗

(On Diff #28942)

Technically should be set_up_global_variables, but this is such a frequent error that setup is probably more consistent.

lldb/trunk/test/dosep.py

 timeout_command = get_timeout_command()
 
 # Status codes for running command with timeout.
 eTimedOut, ePassed, eFailed = 124, 0, 1
 
 output_lock = None
 test_counter = None
 total_tests = None
+dotest_options = None
 
-def setup_lock_and_counter(lock, counter, total):
-    global output_lock, test_counter, total_tests
+def setup_global_variables(lock, counter, total, options):
+    global output_lock, test_counter, total_tests, dotest_options
     output_lock = lock
     test_counter = counter
     total_tests = total
+    dotest_options = options
 
 def update_status(name = None, command = None, output = None):
     global output_lock, test_counter, total_tests
     with output_lock:
         if output is not None:
             print >> sys.stderr
             print >> sys.stderr, "Failed test suite: %s" % name
             print >> sys.stderr, "Command invoked: %s" % ' '.join(command)
for name in files:
 
         script_file = os.path.join(test_root, "dotest.py")
         command = ([sys.executable, script_file] +
                    dotest_argv +
                    ["-p", name, root])
 
         timeout_name = os.path.basename(os.path.splitext(name)[0]).upper()
 
-        timeout = os.getenv("LLDB_%s_TIMEOUT" % timeout_name) or default_timeout
+        timeout = os.getenv("LLDB_%s_TIMEOUT" % timeout_name) or getDefaultTimeout(dotest_options.lldb_platform_name)
 
         exit_status, pass_count, fail_count = call_with_timeout(command, timeout, name)
 
         pass_sub_count = pass_sub_count + pass_count
         fail_sub_count = fail_sub_count + fail_count
 
         if exit_status == ePassed:
             passed.append(name)
def walk_and_invoke(test_directory, test_subdir, dotest_argv, num_threads):
     test_counter = multiprocessing.Value('i', 0)
     print >> sys.stderr, "Testing: %d tests, %d threads" % (total_tests, num_threads)
     update_status()
 
     # Run the items, either in a pool (for multicore speedup) or
     # calling each individually.
     if num_threads > 1:
         pool = multiprocessing.Pool(num_threads,
-            initializer = setup_lock_and_counter,
-            initargs = (output_lock, test_counter, total_tests))
+            initializer = setup_global_variables,
+            initargs = (output_lock, test_counter, total_tests, dotest_options))
         test_results = pool.map(process_dir_worker, test_work_items)
     else:
         test_results = []
         for work_item in test_work_items:
             test_results.append(process_dir_worker(work_item))
 
     timed_out = []
     failed = []
""")
 
     opts, args = parser.parse_args()
     dotest_option_string = opts.dotest_options
 
     is_posix = (os.name == "posix")
     dotest_argv = shlex.split(dotest_option_string, posix=is_posix) if dotest_option_string else []
 
     parser = dotest_args.create_parser()
+    global dotest_options
     dotest_options = dotest_args.parse_args(parser, dotest_argv)
 
     if not dotest_options.s:
         # no session log directory, we need to add this to prevent
         # every dotest invocation from creating its own directory
         import datetime
         # The windows platforms don't like ':' in the pathname.
         timestamp_started = datetime.datetime.now().strftime("%Y-%m-%d-%H_%M_%S")
else:
         num_threads_str = os.environ.get("LLDB_TEST_THREADS")
         if num_threads_str:
             num_threads = int(num_threads_str)
         else:
             num_threads = multiprocessing.cpu_count()
     if num_threads < 1:
         num_threads = 1
 
-    global default_timeout
-    default_timeout = getDefaultTimeout(dotest_options.lldb_platform_name)
-
     system_info = " ".join(platform.uname())
     (timed_out, failed, passed, all_fails, all_passes) = walk_and_invoke(test_directory, test_subdir, dotest_argv, num_threads)
 
     timed_out = set(timed_out)
     num_test_files = len(failed) + len(passed)
     num_tests = all_fails + all_passes
 
     # move core files into session dir