Merge pull request swiftlang#29470 from davezarzycki/pr29470

swift-ci · web-flow · commit 1766f1f0575a · 2020-01-27T05:02:21.000-08:00
diff --git a/test/Sanitizers/scudo.swift b/test/Sanitizers/scudo.swift
@@ -2,6 +2,7 @@
 // RUN: not %target-run %t_scudo-binary 2>&1 | %FileCheck %s
 // REQUIRES: executable_test
 // REQUIRES: OS=linux-gnu
+// REQUIRES: scudo_runtime
 
 let allocated = UnsafeMutableRawPointer.allocate(byteCount: 128, alignment: 1)
 allocated.deallocate()
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -1452,6 +1452,7 @@ runtime_libs = {
     'profile': 'profile_runtime',
     'asan': 'asan_runtime',
     'ubsan': 'ubsan_runtime',
+    'scudo': 'scudo_runtime',
     'safestack': 'safestack_runtime',
     'fuzzer': 'fuzzer_runtime'
 }

Original file line number	Diff line number	Diff line change
`@@ -1452,6 +1452,7 @@ runtime_libs = {`
`1452`	`1452`	`'profile': 'profile_runtime',`
`1453`	`1453`	`'asan': 'asan_runtime',`
`1454`	`1454`	`'ubsan': 'ubsan_runtime',`
	`1455`	`+ 'scudo': 'scudo_runtime',`
`1455`	`1456`	`'safestack': 'safestack_runtime',`
`1456`	`1457`	`'fuzzer': 'fuzzer_runtime'`
`1457`	`1458`	`}`