[TSan][libdispatch] Configure libdispatch lit tests

llvm-svn: 356311

diff --git a/compiler-rt/test/tsan/libdispatch/lit.local.cfg b/compiler-rt/test/tsan/libdispatch/lit.local.cfg
index b312a3a..4e02669 100644 (file)
--- a/compiler-rt/test/tsan/libdispatch/lit.local.cfg
+++ b/compiler-rt/test/tsan/libdispatch/lit.local.cfg
@@ -8,4 +8,9 @@ root = getRoot(config)
 if 'libdispatch' not in root.available_features:
   config.unsupported = True
 
-config.target_cflags += ' -fblocks'
+# libdispatch is not yet compiled with TSan
+config.environment['TSAN_OPTIONS'] += ':ignore_noninstrumented_modules=1'
+
+for index, (template, replacement) in enumerate(config.substitutions):
+  if template in ['%clang_tsan ', '%clangxx_tsan ']:
+    config.substitutions[index] = (template, replacement + ' -fblocks ')