Make check-compiler-rt subtarget respect LLVM_LIT_TOOLS_DIR

[gbedwell]

Summary

We ran into some strange test failures on a Windows machine that didn't have *nix style commands on the path, but was setting a path to the gnuwin32 tools via LLVM_LIT_TOOLS_DIR. Both the check-compiler-rt and check-lit tests weren't taking notice of this option.

This patch takes care of the compiler-rt part (see D40520 for the check-lit part).

[gbedwell]

Delayed ping. Apologies for the delay. I started paternity leave shortly after starting this review, and never got a chance to come back to it until now.

test/lit.common.cfg

possibly_dangerous_env_vars = ['ASAN_OPTIONS', 'DFSAN_OPTIONS', 'LSAN_OPTIONS',
                                'XRAY_OPTIONS']
 # 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]
 
+path = config.environment['PATH']
+
 # Tweak PATH to include llvm tools dir.
 if (not config.llvm_tools_dir) or (not os.path.exists(config.llvm_tools_dir)):
   lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % config.llvm_tools_dir)
-path = os.path.pathsep.join((config.llvm_tools_dir, config.environment['PATH']))
+path = os.path.pathsep.join((config.llvm_tools_dir, path))
+
+# Tweak PATH to include lit tools dir if specified.
+if config.lit_tools_dir:
+  if not os.path.exists(config.lit_tools_dir):
+    lit_config.fatal("Invalid lit_tools_dir config attribute: %r" % config.lit_tools_dir)
+  path = os.path.pathsep.join((config.lit_tools_dir, path))
+
 config.environment['PATH'] = path
 
 # Help MSVS link.exe find the standard libraries.
 # Make sure we only try to use it when targetting Windows.
 if platform.system() == 'Windows' and '-win' in config.target_triple:
   config.environment['LIB'] = os.environ['LIB']
 
 if re.match(r'^x86_64.*-linux', config.target_triple):

test/lit.common.configured.in

 set_default("host_os", "@HOST_OS@")
 set_default("llvm_build_mode", "@LLVM_BUILD_MODE@")
 set_default("llvm_src_root", "@LLVM_MAIN_SRC_DIR@")
 set_default("llvm_obj_root", "@LLVM_BINARY_DIR@")
 set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@")
 set_default("compiler_rt_obj_root", "@COMPILER_RT_BINARY_DIR@")
 set_default("llvm_tools_dir", "@LLVM_TOOLS_DIR@")
 set_default("llvm_shlib_dir", "@LLVM_LIBRARY_OUTPUT_INTDIR@")
+set_default("lit_tools_dir", "@LLVM_LIT_TOOLS_DIR@")
 set_default("gold_executable", "@GOLD_EXECUTABLE@")
 set_default("clang", "@COMPILER_RT_RESOLVED_TEST_COMPILER@")
 set_default("compiler_id", "@COMPILER_RT_TEST_COMPILER_ID@")
 set_default("python_executable", "@PYTHON_EXECUTABLE@")
 set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@)
 set_default("compiler_rt_libdir", "@COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR@")
 set_default("emulator", "@COMPILER_RT_EMULATOR@")
 set_default("asan_shadow_scale", "@COMPILER_RT_ASAN_SHADOW_SCALE@")