Merge pull request #11780 from slavapestov/fix-resilience-tests-in-simulator

Get resilience tests working on iOS again

Author: slavapestov

test/Interpreter/class_resilience.swift

@@ -3,18 +3,19 @@
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension
 // RUN: %target-build-swift -emit-module-path %t/resilient_class.swiftmodule -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_class.swift -I %t/ -L %t/ -lresilient_struct -module-name resilient_class -emit-library -o %t/libresilient_class.%target-dylib-extension
 // RUN: %target-build-swift %s -lresilient_struct -lresilient_class -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
+// RUN: %target-codesign %t/libresilient_class.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension -whole-module-optimization
 // RUN: %target-build-swift -emit-module-path %t/resilient_class.swiftmodule -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_class.swift -I %t/ -L %t/ -lresilient_struct -module-name resilient_class -emit-library -o %t/libresilient_class.%target-dylib-extension -whole-module-optimization
 // RUN: %target-build-swift %s -lresilient_struct -lresilient_class -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
+// RUN: %target-codesign %t/libresilient_class.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // REQUIRES: executable_test
 
-// <rdar://problem/34148403>
-// REQUIRES: OS=macosx
-
 import StdlibUnittest
 
 

test/Interpreter/enum_resilience.swift

@@ -3,18 +3,19 @@
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_enum.swift -emit-module-path %t/resilient_enum.swiftmodule -module-name resilient_enum -emit-library -o %t/libresilient_enum.%target-dylib-extension -I %t -L %t -lresilient_struct
 // RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -lresilient_enum -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
+// RUN: %target-codesign %t/libresilient_enum.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension -whole-module-optimization
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_enum.swift -emit-module-path %t/resilient_enum.swiftmodule -module-name resilient_enum -emit-library -o %t/libresilient_enum.%target-dylib-extension -I %t -L %t -lresilient_struct -whole-module-optimization
 // RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -lresilient_enum -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
+// RUN: %target-codesign %t/libresilient_enum.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // REQUIRES: executable_test
 
-// <rdar://problem/34148403>
-// REQUIRES: OS=macosx
-
 import StdlibUnittest
 
 

test/Interpreter/global_resilience.swift

@@ -3,18 +3,19 @@
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_global.swift -emit-module-path %t/resilient_global.swiftmodule -module-name resilient_global -emit-library -o %t/libresilient_global.%target-dylib-extension
 // RUN: %target-build-swift %s -lresilient_global -lresilient_struct -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
+// RUN: %target-codesign %t/libresilient_global.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension -whole-module-optimization
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_global.swift -emit-module-path %t/resilient_global.swiftmodule -module-name resilient_global -emit-library -o %t/libresilient_global.%target-dylib-extension -whole-module-optimization
 // RUN: %target-build-swift %s -lresilient_global -lresilient_struct -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
+// RUN: %target-codesign %t/libresilient_global.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // REQUIRES: executable_test
 
-// <rdar://problem/34148403>
-// REQUIRES: OS=macosx
-
 import StdlibUnittest
 
 

test/Interpreter/objc_runtime_visible.swift

@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 
 // RUN: %clang %target-cc-options -isysroot %sdk -fobjc-arc %S/Inputs/objc_runtime_visible.m -fmodules -nodefaultlibs -lc -dynamiclib -o %t/libobjc_runtime_visible.dylib -install_name @executable_path/libobjc_runtime_visible.dylib
-// RUN: codesign -f -s - %t/libobjc_runtime_visible.dylib
+// RUN: %target-codesign %t/libobjc_runtime_visible.dylib
 // RUN: nm -g %t/libobjc_runtime_visible.dylib | %FileCheck %s
 // RUN: %target-build-swift -import-objc-header %S/Inputs/objc_runtime_visible.h %t/libobjc_runtime_visible.dylib %s -o %t/main
 // RUN: %target-run %t/main %t/libobjc_runtime_visible.dylib

test/Interpreter/protocol_resilience.swift

@@ -1,8 +1,15 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -emit-library -Xfrontend -enable-resilience -c %S/../Inputs/resilient_protocol.swift -o %t/resilient_protocol.o
-// RUN: %target-build-swift -emit-module -Xfrontend -enable-resilience -c %S/../Inputs/resilient_protocol.swift -o %t/resilient_protocol.o
-// RUN: %target-build-swift %s -Xlinker %t/resilient_protocol.o -I %t -L %t -o %t/main
+
+// RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_protocol.swift -emit-module-path %t/resilient_protocol.swiftmodule -module-name resilient_protocol -emit-library -o %t/libresilient_protocol.%target-dylib-extension
+// RUN: %target-build-swift %s -lresilient_protocol -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_protocol.%target-dylib-extension
+// RUN: %target-run %t/main
+
+// RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_protocol.swift -emit-module-path %t/resilient_protocol.swiftmodule -module-name resilient_protocol -emit-library -o %t/libresilient_protocol.%target-dylib-extension -whole-module-optimization
+// RUN: %target-build-swift %s -lresilient_protocol -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_protocol.%target-dylib-extension
 // RUN: %target-run %t/main
+
 // REQUIRES: executable_test
 
 //

test/Interpreter/struct_resilience.swift

@@ -2,17 +2,16 @@
 
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension
 // RUN: %target-build-swift %s -lresilient_struct -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // RUN: %target-build-swift -emit-module -parse-as-library -Xfrontend -enable-resilience %S/../Inputs/resilient_struct.swift -emit-module-path %t/resilient_struct.swiftmodule -module-name resilient_struct -emit-library -o %t/libresilient_struct.%target-dylib-extension -whole-module-optimization
 // RUN: %target-build-swift %s -lresilient_struct -I %t -L %t -o %t/main -Xlinker -rpath -Xlinker %t
+// RUN: %target-codesign %t/libresilient_struct.%target-dylib-extension
 // RUN: %target-run %t/main
 
 // REQUIRES: executable_test
 
-// <rdar://problem/34148403>
-// REQUIRES: OS=macosx
-
 import StdlibUnittest
 
 

test/lit.cfg

@@ -544,6 +544,7 @@ if run_vendor == 'apple':
     config.target_swiftdoc_name = run_cpu + ".swiftdoc"
     config.target_object_format = "macho"
     config.target_dylib_extension = "dylib"
+    config.target_codesign = "codesign -f -s -"
     config.target_runtime = "objc"
 
     xcrun_prefix = (
@@ -721,6 +722,8 @@ if run_vendor == 'apple':
         (xcrun_prefix, config.target_cc_options))
 
 elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'windows-gnu']:
+    config.target_codesign = "echo"
+
     # Linux/FreeBSD/Cygwin
     if run_os == 'windows-cygnus':
       lit_config.note("Testing Cygwin " + config.variant_triple)
@@ -799,6 +802,7 @@ elif run_os == 'linux-androideabi':
     config.target_dylib_extension = "so"
     config.target_runtime = "native"
     config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
+    config.target_codesign = "echo"
     config.target_sdk_name = "android"
     android_linker_opt = "-L {libcxx} -L {libgcc}".format(
         libcxx=os.path.join(config.android_ndk_path,
@@ -1052,6 +1056,8 @@ config.substitutions.append(('%target-swiftdoc-name', config.target_swiftdoc_nam
 config.substitutions.append(('%target-object-format', config.target_object_format))
 config.substitutions.append(('%target-dylib-extension', config.target_dylib_extension))
 
+config.substitutions.append(('%target-codesign', config.target_codesign))
+
 config.substitutions.append(('%target-resilience-test-wmo', config.target_resilience_test_wmo))
 config.substitutions.append(('%target-resilience-test', config.target_resilience_test))