[tests] Update to use lit_config and lit package, as appropriate.

llvm-svn: 188116

diff --git a/compiler-rt/lib/asan/lit_tests/32bitConfig/lit.site.cfg.in b/compiler-rt/lib/asan/lit_tests/32bitConfig/lit.site.cfg.in
index 99496c2bf8baa5c1d05e456fc6f71206516a4a0d..faef4e8c9b17676d98f13e46b08d6a320a846a5d 100644 (file)
--- a/compiler-rt/lib/asan/lit_tests/32bitConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/asan/lit_tests/32bitConfig/lit.site.cfg.in
@@ -2,12 +2,12 @@
 # Do not edit!
 
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Tool-specific config options.
 config.asan_source_dir = "@ASAN_SOURCE_DIR@"
 config.bits = "32"
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")
+lit_config.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")
 

diff --git a/compiler-rt/lib/asan/lit_tests/64bitConfig/lit.site.cfg.in b/compiler-rt/lib/asan/lit_tests/64bitConfig/lit.site.cfg.in
index 94b02288d38029917aaa37a7e468ee6d467308c3..a35994484d5ff446c88a10f158960310cfce6341 100644 (file)
--- a/compiler-rt/lib/asan/lit_tests/64bitConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/asan/lit_tests/64bitConfig/lit.site.cfg.in
@@ -2,11 +2,11 @@
 # Do not edit!
 
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Tool-specific config options.
 config.asan_source_dir = "@ASAN_SOURCE_DIR@"
 config.bits = "64"
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")
+lit_config.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")

diff --git a/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
index 6864c80f8ee567636922cbad51d3284fd1cd48b5..0db0940036823c95d09a734c87ab7e09ef51c2a5 100644 (file)
--- a/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'AddressSanitizer-Unit'

diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index 815452dd916fcb5b5d9994505ef3bd04c1db1b59..317ec6f14e7fd83daf573d2803a33cc5b5fb6e1a 100644 (file)
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -2,12 +2,15 @@
 
 import os
 
+import lit.util
+
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup config name.
@@ -17,9 +20,9 @@ config.name = 'AddressSanitizer' + config.bits
 config.test_source_root = os.path.dirname(__file__)
 
 def DisplayNoConfigMessage():
-  lit.fatal("No site specific configuration available! " +
-            "Try running your test from the build tree or running " +
-            "make check-asan")
+  lit_config.fatal("No site specific configuration available! " +
+                   "Try running your test from the build tree or running " +
+                   "make check-asan")
 
 # Figure out LLVM source root.
 llvm_src_root = getattr(config, 'llvm_src_root', None)
@@ -27,9 +30,9 @@ if llvm_src_root is None:
   # We probably haven't loaded the site-specific configuration: the user
   # is likely trying to run a test file directly, and the site configuration
   # wasn't created by the build system.
-  asan_site_cfg = lit.params.get('asan_site_config', None)
+  asan_site_cfg = lit_config.params.get('asan_site_config', None)
   if (asan_site_cfg) and (os.path.exists(asan_site_cfg)):
-    lit.load_config(config, asan_site_cfg)
+    lit_config.load_config(config, asan_site_cfg)
     raise SystemExit
 
   # Try to guess the location of site-specific configuration using llvm-config
@@ -45,7 +48,7 @@ if llvm_src_root is None:
   if (not asan_site_cfg) or (not os.path.exists(asan_site_cfg)):
     DisplayNoConfigMessage()
 
-  lit.load_config(config, asan_site_cfg)
+  lit_config.load_config(config, asan_site_cfg)
   raise SystemExit
 
 # Setup default compiler flags used with -fsanitize=address option.
@@ -74,7 +77,7 @@ config.environment['ASAN_SYMBOLIZER_PATH'] = config.llvm_symbolizer_path
 asan_source_dir = get_required_attr(config, "asan_source_dir")
 asan_symbolize = os.path.join(asan_source_dir, "scripts", "asan_symbolize.py")
 if not os.path.exists(asan_symbolize):
-  lit.fatal("Can't find script on path %r" % asan_symbolize)
+  lit_config.fatal("Can't find script on path %r" % asan_symbolize)
 config.substitutions.append( ("%asan_symbolize", " " + asan_symbolize + " ") )
 
 # Define CHECK-%os to check for OS-dependent output.

diff --git a/compiler-rt/lib/dfsan/lit_tests/lit.cfg b/compiler-rt/lib/dfsan/lit_tests/lit.cfg
index 0daface1eb8ca6fc6da00adc02b6907075e88092..19bc97690a8600135cb95ff1051fc6d582b7ba33 100644 (file)
--- a/compiler-rt/lib/dfsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/dfsan/lit_tests/lit.cfg
@@ -2,12 +2,15 @@
 
 import os
 
+import lit.util
+
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup config name.
@@ -17,9 +20,9 @@ config.name = 'DataFlowSanitizer'
 config.test_source_root = os.path.dirname(__file__)
 
 def DisplayNoConfigMessage():
-  lit.fatal("No site specific configuration available! " +
-            "Try running your test from the build tree or running " +
-            "make check-dfsan")
+  lit_config.fatal("No site specific configuration available! " +
+                   "Try running your test from the build tree or running " +
+                   "make check-dfsan")
 
 # Figure out LLVM source root.
 llvm_src_root = getattr(config, 'llvm_src_root', None)
@@ -27,9 +30,9 @@ if llvm_src_root is None:
   # We probably haven't loaded the site-specific configuration: the user
   # is likely trying to run a test file directly, and the site configuration
   # wasn't created by the build system.
-  dfsan_site_cfg = lit.params.get('dfsan_site_config', None)
+  dfsan_site_cfg = lit_config.params.get('dfsan_site_config', None)
   if (dfsan_site_cfg) and (os.path.exists(dfsan_site_cfg)):
-    lit.load_config(config, dfsan_site_cfg)
+    lit_config.load_config(config, dfsan_site_cfg)
     raise SystemExit
 
   # Try to guess the location of site-specific configuration using llvm-config
@@ -45,7 +48,7 @@ if llvm_src_root is None:
   if (not dfsan_site_cfg) or (not os.path.exists(dfsan_site_cfg)):
     DisplayNoConfigMessage()
 
-  lit.load_config(config, dfsan_site_cfg)
+  lit_config.load_config(config, dfsan_site_cfg)
   raise SystemExit
 
 # Setup default compiler flags used with -fsanitize=dataflow option.

diff --git a/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
index d9eb836b92dcd7b04fcb9eebfa42f360a8f6df40..0cf6d6b5580f86deb48195b2ee685ee8ed2ab510 100644 (file)
--- a/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@DFSAN_SOURCE_DIR@/lit_tests/lit.cfg")
+lit_config.load_config(config, "@DFSAN_SOURCE_DIR@/lit_tests/lit.cfg")

diff --git a/compiler-rt/lib/lit.common.cfg b/compiler-rt/lib/lit.common.cfg
index b19d68708e9c416908bbc85d25d47f2fe0374a9c..4be6921549bfec7f3ffae8358699276afc0d74e4 100644 (file)
--- a/compiler-rt/lib/lit.common.cfg
+++ b/compiler-rt/lib/lit.common.cfg
@@ -6,15 +6,17 @@
 import os
 import platform
 
+import lit.formats
+
 # Setup test format
 execute_external = (platform.system() != 'Windows'
-                    or lit.getBashPath() not in [None, ""])
+                    or lit_config.getBashPath() not in [None, ""])
 config.test_format = lit.formats.ShTest(execute_external)
 
 # Setup clang binary.
 clang_path = getattr(config, 'clang', None)
 if (not clang_path) or (not os.path.exists(clang_path)):
-  lit.fatal("Can't find Clang on path %r" % clang_path)
+  lit_config.fatal("Can't find Clang on path %r" % clang_path)
 
 # Clear some environment variables that might affect Clang.
 possibly_dangerous_env_vars = ['COMPILER_PATH', 'RC_DEBUG_OPTIONS',
@@ -36,7 +38,7 @@ for name in possibly_dangerous_env_vars:
 # Tweak PATH to include llvm tools dir.
 llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
 if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)):
-  lit.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir)
+  lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir)
 path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
 config.environment['PATH'] = path
 

diff --git a/compiler-rt/lib/lit.common.configured.in b/compiler-rt/lib/lit.common.configured.in
index f7c29f62e26acf4232bd2681c5e5a7331cc3f4ec..9827a6852a1e483be22d949f14bbbf7e9bf9377b 100644 (file)
--- a/compiler-rt/lib/lit.common.configured.in
+++ b/compiler-rt/lib/lit.common.configured.in
@@ -16,10 +16,10 @@ config.compiler_rt_arch = "@COMPILER_RT_SUPPORTED_ARCH@"
 # LLVM tools dir can be passed in lit parameters, so try to
 # apply substitution.
 try:
-  config.llvm_tools_dir = config.llvm_tools_dir % lit.params
+  config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
 except KeyError,e:
   key, = e.args
-  lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
+  lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
 
 # Setup attributes common for all compiler-rt projects.
-lit.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.cfg")

diff --git a/compiler-rt/lib/lit.common.unit.configured.in b/compiler-rt/lib/lit.common.unit.configured.in
index 1eac25b2983eb0d5547f8f895ae7097f94f33c0c..88eeed1ae925fe7e8684f179d42e9074bf42c2e8 100644 (file)
--- a/compiler-rt/lib/lit.common.unit.configured.in
+++ b/compiler-rt/lib/lit.common.unit.configured.in
@@ -12,11 +12,11 @@ config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 # LLVM tools dir and build mode can be passed in lit parameters,
 # so try to apply substitution.
 try:
-  config.llvm_tools_dir = config.llvm_tools_dir % lit.params
-  config.llvm_build_mode = config.llvm_build_mode % lit.params
+  config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
+  config.llvm_build_mode = config.llvm_build_mode % lit_config.params
 except KeyError,e:
   key, = e.args
-  lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
+  lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
 
 # Setup attributes common for all compiler-rt unit tests.
-lit.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")

diff --git a/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.cfg b/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.cfg
index eb242442b0281e542f7bdc209e2a0051a3efb333..a7df8965d56ba3e791700dad296234aad3bf317b 100644 (file)
--- a/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.cfg
+++ b/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.cfg
@@ -5,16 +5,17 @@ import os
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 lsan_lit_src_root = get_required_attr(config, "lsan_lit_src_root")
 lsan_lit_cfg = os.path.join(lsan_lit_src_root, "lit.common.cfg")
 if not os.path.exists(lsan_lit_cfg):
-  lit.fatal("Can't find common LSan lit config at: %r" % lsan_lit_cfg)
-lit.load_config(config, lsan_lit_cfg)
+  lit_config.fatal("Can't find common LSan lit config at: %r" % lsan_lit_cfg)
+lit_config.load_config(config, lsan_lit_cfg)
 
 config.name = 'LeakSanitizer-AddressSanitizer'
 

diff --git a/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in b/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
index 4557d790a03327e0377178529497c79993722472..9cf6572c54b7466b4aa2df7eb8da22afa1100cbb 100644 (file)
--- a/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
@@ -1,8 +1,8 @@
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Tool-specific config options.
 config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@LSAN_LIT_SOURCE_DIR@/AsanConfig/lit.cfg")
+lit_config.load_config(config, "@LSAN_LIT_SOURCE_DIR@/AsanConfig/lit.cfg")

diff --git a/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.cfg b/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.cfg
index bc1d5481c1537b481a3f1bd11c448c47be1286b6..764bf9229ca340f21ae5e7aa69814ecbcaa468f7 100644 (file)
--- a/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.cfg
+++ b/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.cfg
@@ -5,16 +5,17 @@ import os
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 lsan_lit_src_root = get_required_attr(config, "lsan_lit_src_root")
 lsan_lit_cfg = os.path.join(lsan_lit_src_root, "lit.common.cfg")
 if not os.path.exists(lsan_lit_cfg):
-  lit.fatal("Can't find common LSan lit config at: %r" % lsan_lit_cfg)
-lit.load_config(config, lsan_lit_cfg)
+  lit_config.fatal("Can't find common LSan lit config at: %r" % lsan_lit_cfg)
+lit_config.load_config(config, lsan_lit_cfg)
 
 config.name = 'LeakSanitizer-Standalone'
 

diff --git a/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in b/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
index 8bc5c41b65a0c2b9ff88fe661c9c2063fdd46a4c..2a6d724c0436e69d2c9452adc9ad4751681ee4c2 100644 (file)
--- a/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
@@ -1,8 +1,8 @@
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Tool-specific config options.
 config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@LSAN_LIT_SOURCE_DIR@/LsanConfig/lit.cfg")
+lit_config.load_config(config, "@LSAN_LIT_SOURCE_DIR@/LsanConfig/lit.cfg")

diff --git a/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
index efe804930322159efb28121f644f3e1e23eb8240..a3a4e9ad0b139743cad59bd5d5ab09545bd2517f 100644 (file)
--- a/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'LeakSanitizer-Unit'

diff --git a/compiler-rt/lib/lsan/lit_tests/lit.common.cfg b/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
index d52f64ccf219af682e697eb790cd3835e2b5177a..11a40b550d4373f03c345bcbe027433b4d6f76cd 100644 (file)
--- a/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
+++ b/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
@@ -7,9 +7,10 @@ import os
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup source root.

diff --git a/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
index 52e171333c7662f5e1f4f2e8bd12fdf1ed8dd449..8e67f557d7fde9b640416715f92b837c28e693d5 100644 (file)
--- a/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'MemorySanitizer-Unit'

diff --git a/compiler-rt/lib/msan/lit_tests/lit.cfg b/compiler-rt/lib/msan/lit_tests/lit.cfg
index bc19b740c0de0fdaf8d365cea255afe715eb251e..093ad943ac2eb4de9ec445f9d59bef0b97e585b9 100644 (file)
--- a/compiler-rt/lib/msan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/msan/lit_tests/lit.cfg
@@ -2,12 +2,15 @@
 
 import os
 
+import lit.util
+
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup config name.
@@ -17,9 +20,9 @@ config.name = 'MemorySanitizer'
 config.test_source_root = os.path.dirname(__file__)
 
 def DisplayNoConfigMessage():
-  lit.fatal("No site specific configuration available! " +
-            "Try running your test from the build tree or running " +
-            "make check-msan")
+  lit_config.fatal("No site specific configuration available! " +
+                   "Try running your test from the build tree or running " +
+                   "make check-msan")
 
 # Figure out LLVM source root.
 llvm_src_root = getattr(config, 'llvm_src_root', None)
@@ -27,9 +30,9 @@ if llvm_src_root is None:
   # We probably haven't loaded the site-specific configuration: the user
   # is likely trying to run a test file directly, and the site configuration
   # wasn't created by the build system.
-  msan_site_cfg = lit.params.get('msan_site_config', None)
+  msan_site_cfg = lit_config.params.get('msan_site_config', None)
   if (msan_site_cfg) and (os.path.exists(msan_site_cfg)):
-    lit.load_config(config, msan_site_cfg)
+    lit_config.load_config(config, msan_site_cfg)
     raise SystemExit
 
   # Try to guess the location of site-specific configuration using llvm-config
@@ -45,7 +48,7 @@ if llvm_src_root is None:
   if (not msan_site_cfg) or (not os.path.exists(msan_site_cfg)):
     DisplayNoConfigMessage()
 
-  lit.load_config(config, msan_site_cfg)
+  lit_config.load_config(config, msan_site_cfg)
   raise SystemExit
 
 # Setup default compiler flags used with -fsanitize=memory option.

diff --git a/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
index 25d378fae271b780647e5b56eb7b3769d9e84e07..946df778f3d39fdf9e072aab8fe39e701afd1a4c 100644 (file)
--- a/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@MSAN_SOURCE_DIR@/lit_tests/lit.cfg")
+lit_config.load_config(config, "@MSAN_SOURCE_DIR@/lit_tests/lit.cfg")

diff --git a/compiler-rt/lib/sanitizer_common/tests/lit.cfg b/compiler-rt/lib/sanitizer_common/tests/lit.cfg
index 303d56c9107906252da35a45b426b2937966161a..0712746033652fe962421b4b13c7d5a20ec6c36e 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/tests/lit.cfg
+++ b/compiler-rt/lib/sanitizer_common/tests/lit.cfg
@@ -5,16 +5,17 @@ import os
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup attributes common for all compiler-rt projects.
 compiler_rt_src_root = get_required_attr(config, 'compiler_rt_src_root')
 compiler_rt_lit_unit_cfg = os.path.join(compiler_rt_src_root, "lib",
                                         "lit.common.unit.cfg")
-lit.load_config(config, compiler_rt_lit_unit_cfg)
+lit_config.load_config(config, compiler_rt_lit_unit_cfg)
 
 # Setup config name.
 config.name = 'SanitizerCommon-Unit'

diff --git a/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in b/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
index 50485aa16ec2f8776c630ceeb4a5e000242eb77d..bcd69cf40b9b5cf21e4a4f1365db4ee56d01a216 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
+++ b/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
@@ -7,10 +7,10 @@ config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
 config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 
 try:
-  config.llvm_build_mode = config.llvm_build_mode % lit.params
+  config.llvm_build_mode = config.llvm_build_mode % lit_config.params
 except KeyError,e:
   key, = e.args
-  lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
+  lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
 
 # Let the main config do the real work.
-lit.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
+lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")

diff --git a/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg b/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg
index 1b8d17585e0b4c641c612ed6f1c0db37dbcb093d..c7aa0c17c20ec21fa366d6ef94a5fd8877567c0c 100644 (file)
--- a/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg
+++ b/compiler-rt/lib/tsan/lit_tests/Unit/lit.cfg
@@ -5,9 +5,10 @@ import os
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup config name.

diff --git a/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
index 964da91ecee2740d9cdbaca3f35021f8d0b3f71a..3701a2cad74c146ee19e1a6ee3e24c6ad2481bda 100644 (file)
--- a/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/Unit/lit.cfg")
+lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/Unit/lit.cfg")

diff --git a/compiler-rt/lib/tsan/lit_tests/lit.cfg b/compiler-rt/lib/tsan/lit_tests/lit.cfg
index ce6c23a84a8208873c64c73930e7986d69bb01c3..600290d2360b77b05a16cba75e258814820c8788 100644 (file)
--- a/compiler-rt/lib/tsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/tsan/lit_tests/lit.cfg
@@ -2,12 +2,15 @@
 
 import os
 
+import lit.util
+
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup config name.
@@ -17,9 +20,9 @@ config.name = 'ThreadSanitizer'
 config.test_source_root = os.path.dirname(__file__)
 
 def DisplayNoConfigMessage():
-  lit.fatal("No site specific configuration available! " +
-            "Try running your test from the build tree or running " +
-            "make check-tsan")
+  lit_config.fatal("No site specific configuration available! " +
+                   "Try running your test from the build tree or running " +
+                   "make check-tsan")
 
 # Figure out LLVM source root.
 llvm_src_root = getattr(config, 'llvm_src_root', None)
@@ -27,9 +30,9 @@ if llvm_src_root is None:
   # We probably haven't loaded the site-specific configuration: the user
   # is likely trying to run a test file directly, and the site configuration
   # wasn't created by the build system.
-  tsan_site_cfg = lit.params.get('tsan_site_config', None)
+  tsan_site_cfg = lit_config.params.get('tsan_site_config', None)
   if (tsan_site_cfg) and (os.path.exists(tsan_site_cfg)):
-    lit.load_config(config, tsan_site_cfg)
+    lit_config.load_config(config, tsan_site_cfg)
     raise SystemExit
 
   # Try to guess the location of site-specific configuration using llvm-config
@@ -45,7 +48,7 @@ if llvm_src_root is None:
   if (not tsan_site_cfg) or (not os.path.exists(tsan_site_cfg)):
     DisplayNoConfigMessage()
 
-  lit.load_config(config, tsan_site_cfg)
+  lit_config.load_config(config, tsan_site_cfg)
   raise SystemExit
 
 # Setup environment variables for running ThreadSanitizer.

diff --git a/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
index a212393a0e5e728849286daee821af0bbe5bbe69..b0e427446eaa48c3c63ae61ca36a143102f74196 100644 (file)
--- a/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
+lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")

diff --git a/compiler-rt/lib/ubsan/lit_tests/lit.cfg b/compiler-rt/lib/ubsan/lit_tests/lit.cfg
index f3fc6464ef59fc475473dd23b9d993256194a7eb..6714a56cdea3dce6c0bd1bc116ca37e49733066d 100644 (file)
--- a/compiler-rt/lib/ubsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/ubsan/lit_tests/lit.cfg
@@ -5,9 +5,10 @@ import os
 def get_required_attr(config, attr_name):
   attr_value = getattr(config, attr_name, None)
   if not attr_value:
-    lit.fatal("No attribute %r in test configuration! You may need to run "
-              "tests from your build directory or add this attribute "
-              "to lit.site.cfg " % attr_name)
+    lit_config.fatal(
+      "No attribute %r in test configuration! You may need to run "
+      "tests from your build directory or add this attribute "
+      "to lit.site.cfg " % attr_name)
   return attr_value
 
 # Setup config name.
@@ -17,9 +18,9 @@ config.name = 'UndefinedBehaviorSanitizer'
 config.test_source_root = os.path.dirname(__file__)
 
 def DisplayNoConfigMessage():
-  lit.fatal("No site specific configuration available! " +
-            "Try running your test from the build tree or running " +
-            "make check-ubsan")
+  lit_config.fatal("No site specific configuration available! " +
+                   "Try running your test from the build tree or running " +
+                   "make check-ubsan")
 
 # Figure out LLVM source root.
 llvm_src_root = getattr(config, 'llvm_src_root', None)
@@ -27,9 +28,9 @@ if llvm_src_root is None:
   # We probably haven't loaded the site-specific configuration: the user
   # is likely trying to run a test file directly, and the site configuration
   # wasn't created by the build system or we're performing an out-of-tree build.
-  ubsan_site_cfg = lit.params.get('ubsan_site_config', None)
+  ubsan_site_cfg = lit_config.params.get('ubsan_site_config', None)
   if ubsan_site_cfg and os.path.exists(ubsan_site_cfg):
-    lit.load_config(config, ubsan_site_cfg)
+    lit_config.load_config(config, ubsan_site_cfg)
     raise SystemExit
 
   # Try to guess the location of site-specific configuration using llvm-config
@@ -45,7 +46,7 @@ if llvm_src_root is None:
   if not ubsan_site_cfg or not os.path.exists(ubsan_site_cfg):
     DisplayNoConfigMessage()
 
-  lit.load_config(config, ubsan_site_cfg)
+  lit_config.load_config(config, ubsan_site_cfg)
   raise SystemExit
 
 # Define %clang substitution to use in test RUN lines.

diff --git a/compiler-rt/lib/ubsan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/ubsan/lit_tests/lit.site.cfg.in
index a212393a0e5e728849286daee821af0bbe5bbe69..b0e427446eaa48c3c63ae61ca36a143102f74196 100644 (file)
--- a/compiler-rt/lib/ubsan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/ubsan/lit_tests/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt lit tests.
-lit.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
-lit.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
+lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")