Fix buildbot regression by rL339929: NameError: global name 'test_directory' is not defined

[jankratochvil]

Summary

With buildbot slave under test - I get after rL339929:
http://lab.llvm.org:8014/builders/lldb-x86_64-fedora-28-cmake/builds/243/steps/test1/logs/stdio

  File "/home/buildbot/lldbroot/lldb-x86_64-fedora-28-cmake/scripts/../llvm/tools/lldb/test/dotest.py", line 7, in <module>
    lldbsuite.test.run_suite()
  File "/quad/home/buildbot/lldbroot/lldb-x86_64-fedora-28-cmake/llvm/tools/lldb/packages/Python/lldbsuite/test/dotest.py", line 1177, in run_suite
    configuration.results_formatter_object)
  File "/quad/home/buildbot/lldbroot/lldb-x86_64-fedora-28-cmake/llvm/tools/lldb/packages/Python/lldbsuite/test/dosep.py", line 1692, in main
    dst = core.replace(test_directory, "")[1:]
NameError: global name 'test_directory' is not defined

Do you agree with this patch? Unfortunately I do not have it reproducible here without checking it into repository as the test outside of buildbot does not hit this code path. I may reproduce it later but it looks obvious to me. Could you test the fix easily yourself? Thanks.

[davide]

I think this looks fine. Vedant, thoughts?

[vsk]

packages/Python/lldbsuite/test/dosep.py

1692

Instead of redefining test_directory, please use 'test_subdir' in the call to core.replace. That leaves the logic to find the right path in configuration.get_absolute_path_to_root_test_dir.

packages/Python/lldbsuite/test/dosep.py

def main(num_threads, test_runner_name, results_formatter):
 
     timed_out = set(timed_out)
     num_test_files = len(passed) + len(failed)
     num_test_cases = pass_count + fail_count
 
     # move core files into session dir
     cores = find('core.*', test_subdir)
     for core in cores:
-        dst = core.replace(test_directory, "")[1:]
+        dst = core.replace(test_subdir, "")[1:]
         dst = dst.replace(os.path.sep, "-")
         os.rename(core, os.path.join(session_dir, dst))
 
     # remove expected timeouts from failures
     for xtime in expected_timeout:
         if xtime in timed_out:
             timed_out.remove(xtime)
             failed.remove(xtime)