[compiler-rt] r173926 - Use LLVM_BUILD_TYPE instead of CMAKE_BUILD_TYPE in compiler-rt unit tests to match the behavior of llvm unittests

[Alexey Samsonov]

Author: samsonov
Date: Wed Jan 30 06:18:49 2013
New Revision: 173926

URL: http://llvm.org/viewvc/llvm-project?rev=173926&view=rev
Log:
Use LLVM_BUILD_TYPE instead of CMAKE_BUILD_TYPE in compiler-rt unit tests to match the behavior of llvm unittests

Modified:
    compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in
    compiler-rt/trunk/lib/lit.common.unit.cfg
    compiler-rt/trunk/lib/msan/tests/lit.site.cfg.in
    compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in

Modified: compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in?rev=173926&r1=173925&r2=173926&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/Unit/lit.site.cfg.in Wed Jan 30 06:18:49 2013
@@ -3,8 +3,14 @@
 
 config.target_triple = "@TARGET_TRIPLE@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
-config.build_type = "@CMAKE_BUILD_TYPE@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 config.asan_binary_dir = "@ASAN_BINARY_DIR@"
 
+try:
+  config.llvm_build_mode = config.llvm_build_mode % lit.params
+except KeyError,e:
+  key, = e.args
+  lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
+
 # Let the main config do the real work.
 lit.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/Unit/lit.cfg")

Modified: compiler-rt/trunk/lib/lit.common.unit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lit.common.unit.cfg?rev=173926&r1=173925&r2=173926&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lit.common.unit.cfg (original)
+++ compiler-rt/trunk/lib/lit.common.unit.cfg Wed Jan 30 06:18:49 2013
@@ -7,8 +7,8 @@
 import os
 
 # Setup test format
-build_type = getattr(config, "build_type", "Debug")
-config.test_format = lit.formats.GoogleTest(build_type, "Test")
+llvm_build_mode = getattr(config, "llvm_build_mode", "Debug")
+config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test")
 
 # Setup test suffixes.
 config.suffixes = []

Modified: compiler-rt/trunk/lib/msan/tests/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/tests/lit.site.cfg.in?rev=173926&r1=173925&r2=173926&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/tests/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/msan/tests/lit.site.cfg.in Wed Jan 30 06:18:49 2013
@@ -1,9 +1,15 @@
 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
 
-config.build_type = "@CMAKE_BUILD_TYPE@"
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
+
+try:
+  config.llvm_build_mode = config.llvm_build_mode % lit.params
+except KeyError,e:
+  key, = e.args
+  lit.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")

Modified: compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in?rev=173926&r1=173925&r2=173926&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in (original)
+++ compiler-rt/trunk/lib/tsan/lit_tests/Unit/lit.site.cfg.in Wed Jan 30 06:18:49 2013
@@ -1,15 +1,16 @@
 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
 
-config.build_type = "@CMAKE_BUILD_TYPE@"
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"
 
 # 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_build_mode = config.llvm_build_mode % lit.params
 except KeyError,e:
   key, = e.args
   lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))