#!/usr/bin/env python

"""
Run the test suite using a separate process for each test file.
"""

import multiprocessing
import os
import platform
import sys

from optparse import OptionParser

# Command template of the invocation of the test driver.
template = '%s %s/dotest.py %s -p %s %s'

def process_dir(root, files, test_root, dotest_options):
    """Examine a directory for tests, and invoke any found within it."""
    failed = []
    passed = []
    for name in files:
        path = os.path.join(root, name)

        # We're only interested in the test file with the "Test*.py" naming pattern.
        if not name.startswith("Test") or not name.endswith(".py"):
            continue

        # Neither a symbolically linked file.
        if os.path.islink(path):
            continue

        command = template % (sys.executable, test_root, dotest_options if dotest_options else "", name, root)
        if 0 != os.system(command):
            failed.append(name)
        else:
            passed.append(name)
    return (failed, passed)

in_q = None
out_q = None

def process_dir_worker(arg_tuple):
    """Worker thread main loop when in multithreaded mode.
    Takes one directory specification at a time and works on it."""
    (root, files, test_root, dotest_options) = arg_tuple
    return process_dir(root, files, test_root, dotest_options)

def walk_and_invoke(test_root, dotest_options, num_threads):
    """Look for matched files and invoke test driver on each one.
    In single-threaded mode, each test driver is invoked directly.
    In multi-threaded mode, submit each test driver to a worker
    queue, and then wait for all to complete."""

    # Collect the test files that we'll run.
    test_work_items = []
    for root, dirs, files in os.walk(test_root, topdown=False):
        test_work_items.append((root, files, test_root, dotest_options))

    # Run the items, either in a pool (for multicore speedup) or
    # calling each individually.
    if num_threads > 1:
        pool = multiprocessing.Pool(num_threads)
        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))

    failed = []
    passed = []

    for test_result in test_results:
        (dir_failed, dir_passed) = test_result
        failed += dir_failed
        passed += dir_passed

    return (failed, passed)

def main():
    test_root = sys.path[0]

    parser = OptionParser(usage="""\
Run lldb test suite using a separate process for each test file.
""")
    parser.add_option('-o', '--options',
                      type='string', action='store',
                      dest='dotest_options',
                      help="""The options passed to 'dotest.py' if specified.""")

    parser.add_option('-t', '--threads',
                      type='int',
                      dest='num_threads',
                      help="""The number of threads to use when running tests separately.""",
                      default=multiprocessing.cpu_count())

    opts, args = parser.parse_args()
    dotest_options = opts.dotest_options
    num_threads = opts.num_threads
    if num_threads < 1:
        num_threads_str = os.environ.get("LLDB_TEST_THREADS")
        if num_threads_str:
            num_threads = int(num_threads_str)
            if num_threads < 1:
                num_threads = 1
        else:
            num_threads = 1

    system_info = " ".join(platform.uname())
    (failed, passed) = walk_and_invoke(test_root, dotest_options, num_threads)
    num_tests = len(failed) + len(passed)

    print "Ran %d tests." % num_tests
    if len(failed) > 0:
        failed.sort()
        print "Failing Tests (%d)" % len(failed)
        for f in failed:
          print "FAIL: LLDB (suite) :: %s (%s)" % (f, system_info)
        sys.exit(1)
    sys.exit(0)

if __name__ == '__main__':
    main()

@@ -3035,67 +3035,8 @@
 .%22%22%22
-,%0A                      default=multiprocessing.cpu_count()
 )%0A%0A 
@@ -3112,16 +3112,46 @@
 options%0A
+%0A    if opts.num_threads:%0A    
     num_
@@ -3181,34 +3181,20 @@
 ads%0A    
-if num_threads %3C 1
+else
 :%0A      
@@ -3336,82 +3336,92 @@
     
-    if num_threads %3C 1:%0A                num_threads = 1%0A        else:%0A    
+else:%0A            num_threads = multiprocessing.cpu_count()%0A    if num_threads %3C 1:%0A
     

Rework parallel test process count logic