Merge commit 'fe84acba00da' from apple/stable/20190619 into swift/master

Author: git apple-llvm automerger

compiler-rt/test/lsan/lit.common.cfg

@@ -78,3 +78,8 @@ if re.search('mthumb', config.target_cflags) is not None:
   config.unsupported = True
 
 config.suffixes = ['.c', '.cc', '.cpp', '.mm']
+
+# Apple-Clang: Disable LSan
+if config.host_os == 'Darwin':
+  lit_config.note('Disabling LSan tests on Darwin')
+  config.unsupported = True

compiler-rt/test/sanitizer_common/lit.common.cfg

@@ -73,3 +73,9 @@ if config.host_os not in ['Linux', 'Darwin', 'NetBSD', 'FreeBSD']:
 
 if not config.parallelism_group:
   config.parallelism_group = 'shadow-memory'
+
+# Apple-internal: Disable LSan sanitizer_common tests
+# because AppleClang doesn't support LSan (rdar://problem/47381908).
+if config.tool_name == 'lsan' and config.host_os == 'Darwin':
+  lit_config.note('LSan sanitizer_common tests disabled')
+  config.unsupported = True