Merge pull request #18197 from nkcsgexi/mig-test-mig-2

Author: swift-ci

test/Migrator/no_double_edit_ast_pass.swift

@@ -1,8 +1,8 @@
 // REQUIRES: OS=macosx
 // REQUIRES: objc_interop
-// RUN: %target-swift-frontend -typecheck %s -F %S/mock-sdk -swift-version 3
+// RUN: %target-swift-frontend -typecheck %s -F %S/mock-sdk
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -swift-version 3 -o /dev/null
+// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -o /dev/null
 // RUN: diff -u %s.expected %t/no_double_edit_ast_pass.result
 
 import Bar

test/Migrator/no_double_edit_ast_pass.swift.expected

@@ -1,8 +1,8 @@
 // REQUIRES: OS=macosx
 // REQUIRES: objc_interop
-// RUN: %target-swift-frontend -typecheck %s -F %S/mock-sdk -swift-version 3
+// RUN: %target-swift-frontend -typecheck %s -F %S/mock-sdk
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -swift-version 3 -o /dev/null
+// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -o /dev/null
 // RUN: diff -u %s.expected %t/no_double_edit_ast_pass.result
 
 import Bar

test/Migrator/no_duplicate_aarch64_use_tbi.swift

@@ -1,9 +1,9 @@
 // REQUIRES: OS=ios
 // REQUIRES: CPU=arm64
-// RUN: %target-swift-frontend -typecheck %s -swift-version 3
+// RUN: %target-swift-frontend -typecheck %s
 // RUN: %empty-directory(%t)
-// RUN: cd %t && %target-swiftc_driver -c -update-code -output-file-map %S/Inputs/no_duplicate_aarch64_use_tbi_ofm.json -swift-version 3 %s -v
-// RUN: cd %t && %target-swiftc_driver -c -update-code -output-file-map %S/Inputs/no_duplicate_aarch64_use_tbi_ofm.json -swift-version 3 %s -### > %t/driver_actions.txt
+// RUN: cd %t && %target-swiftc_driver -c -update-code -output-file-map %S/Inputs/no_duplicate_aarch64_use_tbi_ofm.json %s -v
+// RUN: cd %t && %target-swiftc_driver -c -update-code -output-file-map %S/Inputs/no_duplicate_aarch64_use_tbi_ofm.json %s -### > %t/driver_actions.txt
 // RUN: %FileCheck --check-prefix=CHECK-REMAP %s < %t/no_duplicate_aarch64_use_tbi.remap
 // RUN: %FileCheck --check-prefix=CHECK-ACTIONS %s < %t/driver_actions.txt
 

test/Migrator/swift_version_change.swift

@@ -1,5 +1,5 @@
 // REQUIRES: OS=macosx
-// RUN: %empty-directory(%t) && %target-swift-frontend -typecheck -update-code -primary-file %s -emit-migrated-file-path %t/dummpy.result -swift-version 3
-// RUN: %target-swift-frontend -typecheck -update-code -primary-file %s -emit-migrated-file-path %t/dummpy.result -swift-version 4
+// RUN: %empty-directory(%t) && %target-swift-frontend -typecheck -update-code -primary-file %s -emit-migrated-file-path %t/dummpy.result -swift-version 4
+// RUN: %target-swift-frontend -typecheck -update-code -primary-file %s -emit-migrated-file-path %t/dummpy.result -swift-version 5
 
 func foo() {}