Skip to content

Commit 1b6e691

Browse files
authored
Merge pull request swiftlang#15020 from compnerd/empty
test: convert rm -rf && mkdir -p into %empty-directory
2 parents 6229450 + 645a326 commit 1b6e691

File tree

216 files changed

+260
-333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+260
-333
lines changed

test/ClangImporter/private_frameworks.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: rm -rf %t
2-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
32

43
// FIXME: BEGIN -enable-source-import hackaround
54
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift

test/ClangImporter/system-framework-search-path.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// The clang module triggers a warning, make sure that -Fsystem has the effect of importing as system, which will suppress the warning.
22

3-
// RUN: rm -rf %t
4-
// RUN: mkdir -p %t
3+
// RUN: %empty-directory(%t)
54

65
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -F %S/Inputs/systemframeworks -module-cache-path %t/mcp1 %s 2> %t/stderr-as-user.txt
76
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -Fsystem %S/Inputs/systemframeworks -module-cache-path %t/mcp2 %s 2> %t/stderr-as-system.txt

test/Compatibility/MixAndMatch/witness_change.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: rm -rf %t
2-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
32
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t/SomeObjCModule.swiftmodule -module-name SomeObjCModule -I %t -I %S/Inputs -swift-version 3 %S/Inputs/SomeObjCModuleX.swift
43
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t/SomeSwift3Module.swiftmodule -module-name SomeSwift3Module -I %t -I %S/Inputs -swift-version 3 %s
54
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t/SomeSwift4Module.swiftmodule -module-name SomeSwift4Module -I %t -I %S/Inputs -swift-version 4 %S/Inputs/witness_change_swift4.swift

test/Compatibility/bridging-nsnumber-and-nsvalue.swift.gyb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: rm -rf %t
2-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
32
// RUN: %gyb %s -o %t/bridging-nsnumber-and-nsvalue.swift
43
// RUN: %target-swift-frontend -typecheck -verify %t/bridging-nsnumber-and-nsvalue.swift -swift-version 3
54

test/Constraints/bridging-nsnumber-and-nsvalue.swift.gyb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: rm -rf %t
2-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
32
// RUN: %gyb %s -o %t/bridging-nsnumber-and-nsvalue.swift
43
// RUN: %target-swift-frontend -typecheck -verify %t/bridging-nsnumber-and-nsvalue.swift -swift-version 4
54

test/Frontend/sil-merge-partial-modules.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: rm -rf %t
2-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
32

43
// RUN: %target-swift-frontend -emit-module -primary-file %s %S/Inputs/sil-merge-partial-modules-other.swift -module-name test -enable-resilience -o %t/partial.a.swiftmodule
54
// RUN: %target-swift-frontend -emit-module %s -primary-file %S/Inputs/sil-merge-partial-modules-other.swift -module-name test -enable-resilience -o %t/partial.b.swiftmodule

test/IRGen/autolink-coff-x86.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: rm -rf %t
2-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
32

43
// RUN: %swift -target x86_64--windows-gnu -parse-as-library -parse-stdlib -emit-module-path %t/module.swiftmodule -module-name module -module-link-name module %s
54
// RUN: %swift -target x86_64--windows-gnu -parse-as-library -parse-stdlib -module-name autolink -I %t -D MAIN_MODULE -emit-ir -o - %s | %FileCheck %s -check-prefix CHECK-GNU-IR

test/IRGen/cf.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: rm -rf %t && mkdir -p %t
1+
// RUN: %empty-directory(%t)
22
// RUN: %utils/chex.py < %s > %t/cf.sil
33
// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs %t/cf.sil -emit-ir -import-cf-types | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize %t/cf.sil
44

test/IRGen/generic_classes.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: rm -rf %t && mkdir -p %t
1+
// RUN: %empty-directory(%t)
22
// RUN: %utils/chex.py < %s > %t/generic_classes.sil
33
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
44
// RUN: %target-swift-frontend -Osize %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=OSIZE

test/IRGen/generic_structs.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: rm -rf %t && mkdir -p %t
1+
// RUN: %empty-directory(%t)
22
// RUN: %utils/chex.py < %s > %t/generic_structs.sil
33
// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil %t/generic_structs.sil -emit-ir | %FileCheck %t/generic_structs.sil
44

0 commit comments

Comments
 (0)