OSDN Git Service

Fix clang test suite on Windows by reverting part of r347216
authorReid Kleckner <rnk@google.com>
Mon, 19 Nov 2018 19:36:28 +0000 (19:36 +0000)
committerReid Kleckner <rnk@google.com>
Mon, 19 Nov 2018 19:36:28 +0000 (19:36 +0000)
Otherwise, the clang analyzer tests fail on Windows when attempting to
unpickle AnalyzerTest objects in the worker processes. The pattern of,
add to path, import, remove from path, serialize, deserialize, doesn't
work. Once something gets added to the path, if we want to move it
across the wire for multiprocessing, we need to keep the module on
sys.path.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@347254 91177308-0d34-0410-b5e6-96231b3b80d8

utils/lit/lit/TestingConfig.py

index b70f18e..038a468 100644 (file)
@@ -85,9 +85,7 @@ class TestingConfig:
         cfg_globals['config'] = self
         cfg_globals['lit_config'] = litConfig
         cfg_globals['__file__'] = path
-        original_sys_path = list(sys.path)
         try:
-            sys.path.insert(0, os.path.dirname(path))
             exec(compile(data, path, 'exec'), cfg_globals, None)
             if litConfig.debug:
                 litConfig.note('... loaded config %r' % path)
@@ -102,7 +100,6 @@ class TestingConfig:
             litConfig.fatal(
                 'unable to parse config file %r, traceback: %s' % (
                     path, traceback.format_exc()))
-        sys.path = original_sys_path
         self.finish(litConfig)
 
     def __init__(self, parent, name, suffixes, test_format,