tests: disable COW checking by default, and enable it for specific tests

eeckstein · shahmishal · commit 96e0cb49b754 · 2021-08-16T08:35:28.000-07:00
COW checking needs that all libraries are consistently compiled with asserts enabled. This is not the case for the Foundation overlay anymore. Therefore it does not work with some tests which interop with Foundation. The solution here is to disable COW checking by default, but enable it for Array tests which do not interop with Foundation. (cherry picked from commit 0831240)
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -2128,6 +2128,13 @@ config.substitutions.append(('%FileCheck', run_filecheck))
 config.substitutions.append(('%raw-FileCheck', shell_quote(config.filecheck)))
 config.substitutions.append(('%import-libdispatch', getattr(config, 'import_libdispatch', '')))
 
+# Disabe COW sanity checks in the swift runtime by default.
+# (But it's required to set this environment variable to something)
+config.environment['SWIFT_DEBUG_ENABLE_COW_CHECKS'] = 'false'
+
+# Add this to the command which runs an executable to enable COW checks in the swift runtime.
+config.substitutions.append(('%enable-cow-checking', TARGET_ENV_PREFIX + 'SWIFT_DEBUG_ENABLE_COW_CHECKS=true;'))
+
 if config.lldb_build_root != "":
     lldb_python_path = get_lldb_python_path(config.lldb_build_root)
     lldb_python_interpreter = get_lldb_python_interpreter(config.lldb_build_root)
@@ -2152,9 +2159,6 @@ config.environment[TARGET_ENV_PREFIX + 'SWIFT_DETERMINISTIC_HASHING'] = '1'
 # Enable malloc scribble during tests by default.
 config.environment[TARGET_ENV_PREFIX + 'SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE'] = 'YES'
 
-# Enable COW sanity checks in the swift runtime by default.
-config.environment['SWIFT_DEBUG_ENABLE_COW_CHECKS'] = 'true'
-
 # Run lsb_release on the target to be tested and return the results.
 def linux_get_lsb_release():
     lsb_release_path = '/usr/bin/lsb_release'
diff --git a/validation-test/stdlib/Array.swift.gyb b/validation-test/stdlib/Array.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swiftgyb
+// RUN: %enable-cow-checking %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 import StdlibUnittest
diff --git a/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_MutableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_MutableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_MutableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_MutableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_RangeReplaceableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_RangeReplaceableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_RangeReplaceableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/ArraySliceWithNonZeroStartIndex_RangeReplaceableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySlice_MutableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/ArraySlice_MutableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySlice_MutableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/ArraySlice_MutableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySlice_RangeReplaceableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/ArraySlice_RangeReplaceableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ArraySlice_RangeReplaceableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/ArraySlice_RangeReplaceableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/Array_MutableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/Array_MutableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/Array_MutableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/Array_MutableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/Array_RangeReplaceableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/Array_RangeReplaceableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/Array_RangeReplaceableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/Array_RangeReplaceableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ContiguousArray_MutableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/ContiguousArray_MutableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ContiguousArray_MutableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/ContiguousArray_MutableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ContiguousArray_RangeReplaceableRandomAccessCollectionRef.swift b/validation-test/stdlib/Array/ContiguousArray_RangeReplaceableRandomAccessCollectionRef.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/ContiguousArray_RangeReplaceableRandomAccessCollectionVal.swift b/validation-test/stdlib/Array/ContiguousArray_RangeReplaceableRandomAccessCollectionVal.swift
@@ -3,7 +3,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Array/Inputs/ArrayConformanceTests.swift.gyb b/validation-test/stdlib/Array/Inputs/ArrayConformanceTests.swift.gyb
@@ -23,7 +23,7 @@
 // Do Not Edit Directly!
 //===----------------------------------------------------------------------===//
 
-// RUN: %target-run-simple-swift
+// RUN: %enable-cow-checking %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 
diff --git a/validation-test/stdlib/Arrays.swift.gyb b/validation-test/stdlib/Arrays.swift.gyb
@@ -4,7 +4,8 @@
 // RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o
 // RUN: %line-directive %t/main.swift -- %target-build-swift %t/main.swift %S/Inputs/DictionaryKeyValueTypes.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Arrays -Xfrontend -disable-access-control
 //
-// RUN: %target-codesign %t/Arrays && %line-directive %t/main.swift -- %target-run %t/Arrays
+// RUN: %target-codesign %t/Arrays
+// RUN: %enable-cow-checking %line-directive %t/main.swift -- %target-run %t/Arrays
 // REQUIRES: executable_test
 
 import Swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-run-simple-swiftgyb`
	`1`	`+// RUN: %enable-cow-checking %target-run-simple-swiftgyb`
`2`	`2`	`// REQUIRES: executable_test`
`3`	`3`
`4`	`4`	`import StdlibUnittest`