Rebased localmods in clang to 223109.

test/lit.cfg

 # -*- Python -*-
 
 import os
 import platform
 import re
 import subprocess
 import tempfile
 
 import lit.formats
 import lit.util
 
 # Configuration file for the 'lit' test runner.
 
 # name: The name of this test suite.
 config.name = 'Clang'
 
+# @LOCALMOD-START
+# Msys tools like make and bash output paths like /c/dir/path. We need Windows
+# drive letters. Makefile.rules has $(ECHOPATH) to try to get Windows paths but
+# it doesn't work with autoconf substitutions like @FOO@=$(path)
+def FixMsysPath(path):
+    if sys.platform == 'win32' and path and path.startswith('/'):
+        return path[1] + ':' + path[2:]
+    return path
+# @LOCALMOD-END
+
 # Tweak PATH for Win32
 if platform.system() == 'Windows':
     # Seek sane tools in directories and set to $PATH.
     path = getattr(config, 'lit_tools_dir', None)
     path = lit_config.getToolsPath(path,
                                    config.environment['PATH'],
                                    ['cmp.exe', 'grep.exe', 'sed.exe'])
     if path is not None:
         path = os.path.pathsep.join((path,
                                      config.environment['PATH']))
@@ skipping 21 matching lines @@
 
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent
 # directories.
 config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
 
 # test_source_root: The root path where tests are located.
 config.test_source_root = os.path.dirname(__file__)
 
 # test_exec_root: The root path where tests should be run.
-clang_obj_root = getattr(config, 'clang_obj_root', None)
+clang_obj_root = FixMsysPath(getattr(config, 'clang_obj_root', None))# @LOCALMOD
 if clang_obj_root is not None:
     config.test_exec_root = os.path.join(clang_obj_root, 'test')
 
 # Set llvm_{src,obj}_root for use by others.
 config.llvm_src_root = getattr(config, 'llvm_src_root', None)
 config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
 
 # Clear some environment variables that might affect Clang.
 #
 # This first set of vars are read by Clang, but shouldn't affect tests
@@ skipping 17 matching lines @@
                                'LIBCLANG_CODE_COMPLETION_LOGGING']
 # Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it.
 if platform.system() != 'Windows':
     possibly_dangerous_env_vars.append('INCLUDE')
 for name in possibly_dangerous_env_vars:
   if name in config.environment:
     del config.environment[name]
 
 # Tweak the PATH to include the tools dir and the scripts dir.
 if clang_obj_root is not None:
-    clang_tools_dir = getattr(config, 'clang_tools_dir', None)
+    clang_tools_dir = FixMsysPath(getattr(config, 'clang_tools_dir', None)) # @LOCALMOD
     if not clang_tools_dir:
         lit_config.fatal('No Clang tools dir set!')
-    llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
+    llvm_tools_dir = FixMsysPath(getattr(config, 'llvm_tools_dir', None)) # @LOCALMOD
     if not llvm_tools_dir:
         lit_config.fatal('No LLVM tools dir set!')
     path = os.path.pathsep.join((
             clang_tools_dir, llvm_tools_dir, config.environment['PATH']))
     config.environment['PATH'] = path
     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
     if not llvm_libs_dir:
         lit_config.fatal('No LLVM libs dir set!')
     path = os.path.pathsep.join((llvm_libs_dir,
                                  config.environment.get('LD_LIBRARY_PATH','')))
@@ skipping 367 matching lines @@
     use_gmalloc = False
 
 # Allow use of an explicit path for gmalloc library.
 # Will default to '/usr/lib/libgmalloc.dylib' if not set.
 gmalloc_path_str = lit_config.params.get('gmalloc_path',
                                          '/usr/lib/libgmalloc.dylib')
 if use_gmalloc:
      config.environment.update({'DYLD_INSERT_LIBRARIES' : gmalloc_path_str})
 
 lit.util.usePlatformSdkOnDarwin(config, lit_config)