test: Set lit features appropriately when using asan and ubsan together

The asan/not_asan and ubsan/not_ubsan features weren't being set
correctly when LLVM_USE_SANITIZER is set to 'Address;Undefined'. Fix
this by doing substring instead of exact matching. Also simplify the
msan check for consistency.

llvm-svn: 240314

diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index 51e1e4f..0e947dd 100644 (file)
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -452,14 +452,13 @@ if lit.util.which('xmllint'):
     config.available_features.add('xmllint')
 
 # Sanitizers.
-if config.llvm_use_sanitizer == "Address":
+if 'Address' in config.llvm_use_sanitizer:
     config.available_features.add("asan")
 else:
     config.available_features.add("not_asan")
-if (config.llvm_use_sanitizer == "Memory" or
-        config.llvm_use_sanitizer == "MemoryWithOrigins"):
+if 'Memory' in config.llvm_use_sanitizer:
     config.available_features.add("msan")
-if config.llvm_use_sanitizer == "Undefined":
+if 'Undefined' in config.llvm_use_sanitizer:
     config.available_features.add("ubsan")
 else:
     config.available_features.add("not_ubsan")