Skip to content

Commit 6509f78

Browse files
CodaFiCodaFi
committedJun 4, 2017
tests: replace remaining 'mkdir -p' calls with %empty-directory(...)'
These changes were made manually.
1 parent 984210a commit 6509f78

38 files changed

+102
-111
lines changed
 

‎docs/Testing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ Other substitutions:
399399

400400
* ``%empty-directory(`` *directory-name* ``)``: ensures that the given
401401
directory exists and is empty. Equivalent to
402-
``rm -rf directory-name && rm -rf directory-name``.
402+
``rm -rf directory-name && mkdir -p directory-name``.
403403

404404
When writing a test where output (or IR, SIL) depends on the bitness of the
405405
target CPU, use this pattern::

‎test/ClangImporter/MixedSource/broken-modules.swift

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
<<<<<<< HEAD:test/ClangImporter/MixedSource/broken-modules.swift
2-
// RUN: rm -rf %t && mkdir -p %t
3-
// RUN: not %target-swift-frontend -typecheck %s -I %S/Inputs/broken-modules/ -enable-source-import -show-diagnostics-after-fatal 2> %t/err.txt
4-
=======
51
// RUN: %empty-directory(%t)
6-
// RUN: not %target-swift-frontend -parse %s -I %S/Inputs/broken-modules/ -enable-source-import -show-diagnostics-after-fatal 2> %t/err.txt
7-
>>>>>>> tests: replace 'rm -rf %t && mkdir -p %t' with '%empty-directory(%t)':test/ClangModules/MixedSource/broken-modules.swift
2+
// RUN: not %target-swift-frontend -typecheck %s -I %S/Inputs/broken-modules/ -enable-source-import -show-diagnostics-after-fatal 2> %t/err.txt
83
// RUN: %FileCheck -check-prefix CHECK -check-prefix CLANG-CHECK %s < %t/err.txt
94

105
// RUN: not %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/broken-modules/BrokenClangModule.h -enable-source-import 2> %t/err.bridging-header.txt

‎test/Driver/linker.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
// the Swift driver really thinks it's been moved.
251251

252252
// RUN: rm -rf %t
253-
// RUN: mkdir -p %t/DISTINCTIVE-PATH/usr/bin/
253+
// RUN: %empty-directory(%t/DISTINCTIVE-PATH/usr/bin)
254254
// RUN: touch %t/DISTINCTIVE-PATH/usr/bin/ld
255255
// RUN: chmod +x %t/DISTINCTIVE-PATH/usr/bin/ld
256256
// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/DISTINCTIVE-PATH/usr/bin/swiftc)
@@ -263,8 +263,8 @@
263263
// Also test arclite detection. This uses xcrun to find arclite when it's not
264264
// next to Swift.
265265

266-
// RUN: mkdir -p %t/ANOTHER-DISTINCTIVE-PATH/usr/bin
267-
// RUN: mkdir -p %t/ANOTHER-DISTINCTIVE-PATH/usr/lib/arc
266+
// RUN: %empty-directory(%t/ANOTHER-DISTINCTIVE-PATH/usr/bin)
267+
// RUN: %empty-directory(%t/ANOTHER-DISTINCTIVE-PATH/usr/lib/arc)
268268
// RUN: cp %S/Inputs/xcrun-return-self.sh %t/ANOTHER-DISTINCTIVE-PATH/usr/bin/xcrun
269269

270270
// RUN: env PATH=%t/ANOTHER-DISTINCTIVE-PATH/usr/bin %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | %FileCheck -check-prefix=XCRUN_ARCLITE %s
@@ -273,7 +273,7 @@
273273
// XCRUN_ARCLITE: /ANOTHER-DISTINCTIVE-PATH/usr/lib/arc/libarclite_macosx.a
274274
// XCRUN_ARCLITE: -o {{[^ ]+}}
275275

276-
// RUN: mkdir -p %t/DISTINCTIVE-PATH/usr/lib/arc
276+
// RUN: %empty-directory(%t/DISTINCTIVE-PATH/usr/lib/arc)
277277

278278
// RUN: env PATH=%t/ANOTHER-DISTINCTIVE-PATH/usr/bin %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | %FileCheck -check-prefix=RELATIVE_ARCLITE %s
279279

‎test/Driver/options-repl-darwin.swift

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
// like the Xcode installation environment. We use hard links to make sure
55
// the Swift driver really thinks it's been moved.
66

7-
// RUN: rm -rf %t
8-
// RUN: mkdir -p %t/usr/bin/
7+
// RUN: %empty-directory(%t/usr/bin/)
98
// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/usr/bin/swift)
109

1110
// RUN: %t/usr/bin/swift -repl -### | %FileCheck -check-prefix=INTEGRATED %s
@@ -16,7 +15,7 @@
1615
// RUN: %t/usr/bin/swift -repl -### | %FileCheck -check-prefix=LLDB %s
1716
// RUN: %t/usr/bin/swift -### | %FileCheck -check-prefix=LLDB %s
1817

19-
// RUN: mkdir -p %t/Toolchains/Test.xctoolchain/usr/bin/
18+
// RUN: %empty-directory(%t/Toolchains/Test.xctoolchain/usr/bin)
2019
// RUN: mv %t/usr/bin/swift %t/Toolchains/Test.xctoolchain/usr/bin/swift
2120
// RUN: %t/Toolchains/Test.xctoolchain/usr/bin/swift -repl -### | %FileCheck -check-prefix=LLDB %s
2221

‎test/Driver/output.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: mkdir -p %t/sub
2+
// RUN: %empty-directory(%t/sub)
33
// RUN: cd %t
44

55
// RUN: %target-swift-frontend -emit-bc %s

‎test/Driver/sdk-apple.swift

+38-37
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// XFAIL: freebsd, linux
22

33
// Test SDK detection for immediate mode.
4-
// RUN: %empty-directory(%t)/usr/bin/
4+
// RUN: %empty-directory(%t)
5+
// RUN: %empty-directory(%t/usr/bin)
56

67
// RUN: cp %S/Inputs/xcrun-bad.sh %t/usr/bin/xcrun
78
// RUN: env PATH=%t/usr/bin %swift_driver_plain -deprecated-integrated-repl -### | %FileCheck -check-prefix=NOSDK %s
@@ -22,15 +23,15 @@
2223
// ROOT-SDK: -sdk /{{ |$}}
2324

2425
// RUN: %empty-directory(%t)
25-
// RUN: mkdir -p %t/MacOSX10.8.sdk && not %swift_driver -sdk %t/MacOSX10.8.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
26-
// RUN: mkdir -p %t/MacOSX10.9.sdk && not %swift_driver -sdk %t/MacOSX10.9.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
27-
// RUN: mkdir -p %t/MacOSX10.9.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
28-
// RUN: mkdir -p %t/MacOSX10.10.sdk && not %swift_driver -sdk %t/MacOSX10.10.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
29-
// RUN: mkdir -p %t/MacOSX10.10.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
30-
// RUN: mkdir -p %t/MacOSX10.11.sdk && not %swift_driver -sdk %t/MacOSX10.11.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
31-
// RUN: mkdir -p %t/MacOSX10.11.Internal.sdk && not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
32-
// RUN: mkdir -p %t/MacOSX10.12.sdk && %swift_driver -sdk %t/MacOSX10.12.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
33-
// RUN: mkdir -p %t/OSX12.sdk && %swift_driver -sdk %t/OSX12.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
26+
// RUN: %empty-directory(%t/MacOSX10.8.sdk) && not %swift_driver -sdk %t/MacOSX10.8.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
27+
// RUN: %empty-directory(%t/MacOSX10.9.sdk) && not %swift_driver -sdk %t/MacOSX10.9.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
28+
// RUN: %empty-directory(%t/MacOSX10.9.Internal.sdk) && not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
29+
// RUN: %empty-directory(%t/MacOSX10.10.sdk) && not %swift_driver -sdk %t/MacOSX10.10.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
30+
// RUN: %empty-directory(%t/MacOSX10.10.Internal.sdk) && not %swift_driver -sdk %t/MacOSX10.10.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
31+
// RUN: %empty-directory(%t/MacOSX10.11.sdk) && not %swift_driver -sdk %t/MacOSX10.11.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
32+
// RUN: %empty-directory(%t/MacOSX10.11.Internal.sdk) && not %swift_driver -sdk %t/MacOSX10.11.Internal.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
33+
// RUN: %empty-directory(%t/MacOSX10.12.sdk) && %swift_driver -sdk %t/MacOSX10.12.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
34+
// RUN: %empty-directory(%t/OSX12.sdk) && %swift_driver -sdk %t/OSX12.sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
3435

3536
// RUN: not %swift_driver -sdk %t/MacOSX10.9.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
3637
// RUN: not %swift_driver -sdk %t/MacOSX10.9.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
@@ -41,33 +42,33 @@
4142
// RUN: %swift_driver -sdk %t/MacOSX10.12.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
4243
// RUN: %swift_driver -sdk %t/MacOSX10.12.Internal.sdk/ -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
4344

44-
// RUN: mkdir -p %t/iPhoneOS7.0.sdk && not %swift_driver -sdk %t/iPhoneOS7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
45-
// RUN: mkdir -p %t/iPhoneOS7.0.Internal.sdk && not %swift_driver -sdk %t/iPhoneOS7.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
46-
// RUN: mkdir -p %t/iPhoneOS8.0.sdk && not %swift_driver -sdk %t/iPhoneOS8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
47-
// RUN: mkdir -p %t/iPhoneOS8.0.Internal.sdk && not %swift_driver -sdk %t/iPhoneOS8.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
48-
// RUN: mkdir -p %t/iPhoneOS9.0.sdk && not %swift_driver -sdk %t/iPhoneOS9.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
49-
// RUN: mkdir -p %t/iPhoneOS10.0.sdk && %swift_driver -sdk %t/iPhoneOS10.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
50-
51-
// RUN: mkdir -p %t/tvOS8.0.sdk && not %swift_driver -sdk %t/tvOS8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
52-
// RUN: mkdir -p %t/tvOS8.0.Internal.sdk && not %swift_driver -sdk %t/tvOS8.0.Internal.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
53-
// RUN: mkdir -p %t/tvOS9.0.sdk && not %swift_driver -sdk %t/tvOS9.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
54-
// RUN: mkdir -p %t/tvOS10.0.sdk && %swift_driver -sdk %t/tvOS10.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
55-
56-
// RUN: mkdir -p %t/watchOS1.0.sdk && not %swift_driver -sdk %t/watchOS1.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
57-
// RUN: mkdir -p %t/watchOS1.0.Internal.sdk && not %swift_driver -sdk %t/watchOS1.0.Internal.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
58-
// RUN: mkdir -p %t/watchOS2.0.sdk && not %swift_driver -sdk %t/watchOS2.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
59-
// RUN: mkdir -p %t/watchOS3.0.sdk && %swift_driver -sdk %t/watchOS3.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
60-
61-
// RUN: mkdir -p %t/iPhoneSimulator7.0.sdk && not %swift_driver -sdk %t/iPhoneSimulator7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
62-
// RUN: mkdir -p %t/iPhoneSimulator8.0.sdk && not %swift_driver -sdk %t/iPhoneSimulator8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
63-
// RUN: mkdir -p %t/AppleTVSimulator8.0.sdk && not %swift_driver -sdk %t/AppleTVSimulator8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
64-
// RUN: mkdir -p %t/WatchSimulator1.0.sdk && not %swift_driver -sdk %t/WatchSimulator1.0.sdk -target i386-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
65-
66-
// RUN: mkdir -p %t/iPhoneOS.sdk && %swift_driver -sdk %t/iPhoneOS.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
67-
// RUN: mkdir -p %t/tvOS.sdk && %swift_driver -sdk %t/tvOS.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
68-
// RUN: mkdir -p %t/watchOS.sdk && %swift_driver -sdk %t/watchOS.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
69-
70-
// RUN: mkdir -p %t/custom-sdk && %swift_driver -sdk %t/custom-sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
45+
// RUN: %empty-directory(%t/iPhoneOS7.0.sdk) && not %swift_driver -sdk %t/iPhoneOS7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
46+
// RUN: %empty-directory(%t/iPhoneOS7.0.Internal.sdk) && not %swift_driver -sdk %t/iPhoneOS7.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
47+
// RUN: %empty-directory(%t/iPhoneOS8.0.sdk) && not %swift_driver -sdk %t/iPhoneOS8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
48+
// RUN: %empty-directory(%t/iPhoneOS8.0.Internal.sdk) && not %swift_driver -sdk %t/iPhoneOS8.0.Internal.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
49+
// RUN: %empty-directory(%t/iPhoneOS9.0.sdk) && not %swift_driver -sdk %t/iPhoneOS9.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
50+
// RUN: %empty-directory(%t/iPhoneOS10.0.sdk) && %swift_driver -sdk %t/iPhoneOS10.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
51+
52+
// RUN: %empty-directory(%t/tvOS8.0.sdk) && not %swift_driver -sdk %t/tvOS8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
53+
// RUN: %empty-directory(%t/tvOS8.0.Internal.sdk) && not %swift_driver -sdk %t/tvOS8.0.Internal.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
54+
// RUN: %empty-directory(%t/tvOS9.0.sdk) && not %swift_driver -sdk %t/tvOS9.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
55+
// RUN: %empty-directory(%t/tvOS10.0.sdk) && %swift_driver -sdk %t/tvOS10.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
56+
57+
// RUN: %empty-directory(%t/watchOS1.0.sdk) && not %swift_driver -sdk %t/watchOS1.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
58+
// RUN: %empty-directory(%t/watchOS1.0.Internal.sdk) && not %swift_driver -sdk %t/watchOS1.0.Internal.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
59+
// RUN: %empty-directory(%t/watchOS2.0.sdk) && not %swift_driver -sdk %t/watchOS2.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
60+
// RUN: %empty-directory(%t/watchOS3.0.sdk) && %swift_driver -sdk %t/watchOS3.0.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
61+
62+
// RUN: %empty-directory(%t/iPhoneSimulator7.0.sdk) && not %swift_driver -sdk %t/iPhoneSimulator7.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
63+
// RUN: %empty-directory(%t/iPhoneSimulator8.0.sdk) && not %swift_driver -sdk %t/iPhoneSimulator8.0.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
64+
// RUN: %empty-directory(%t/AppleTVSimulator8.0.sdk) && not %swift_driver -sdk %t/AppleTVSimulator8.0.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
65+
// RUN: %empty-directory(%t/WatchSimulator1.0.sdk) && not %swift_driver -sdk %t/WatchSimulator1.0.sdk -target i386-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-TOO-OLD %s
66+
67+
// RUN: %empty-directory(%t/iPhoneOS.sdk) && %swift_driver -sdk %t/iPhoneOS.sdk -target x86_64-apple-ios7 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
68+
// RUN: %empty-directory(%t/tvOS.sdk) && %swift_driver -sdk %t/tvOS.sdk -target x86_64-apple-tvos9 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
69+
// RUN: %empty-directory(%t/watchOS.sdk) && %swift_driver -sdk %t/watchOS.sdk -target x86_64-apple-watchos2 -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
70+
71+
// RUN: %empty-directory(%t/custom-sdk) && %swift_driver -sdk %t/custom-sdk -### 2>&1 | %FileCheck -check-prefix=SDK-OKAY %s
7172

7273
// SDK-TOO-OLD: error: Swift does not support the SDK '{{.+}}.sdk'{{$}}
7374
// SDK-OKAY: -sdk {{.*}}/{{[^/ ]+}}sdk

‎test/Driver/subcommands.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
// (for shebang line use). We have to run these since we can't get the driver to
1818
// dump what it is doing and test the argv[1] processing.
1919
//
20-
// RUN: mkdir -p %t.dir/subpath
20+
// RUN: %empty-directory(%t.dir)
21+
// RUN: %empty-directory(%t.dir/subpath)
2122
// RUN: echo "print(\"exec: \" + #file)" > %t.dir/stdin
2223
// RUN: echo "print(\"exec: \" + #file)" > %t.dir/t.swift
2324
// RUN: echo "print(\"exec: \" + #file)" > %t.dir/subpath/build
@@ -31,8 +32,7 @@
3132

3233
// Check that 'swift foo' invokes 'swift-foo'.
3334
//
34-
// RUN: rm -rf %t.dir
35-
// RUN: mkdir -p %t.dir
35+
// RUN: %empty-directory(%t.dir)
3636
// RUN: echo "#!/bin/sh" > %t.dir/swift-foo
3737
// RUN: echo "echo \"exec: \$0\"" >> %t.dir/swift-foo
3838
// RUN: chmod +x %t.dir/swift-foo

‎test/Driver/temp-files.swift

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
// REQUIRES: objc_interop
22
// FIXME: actually, this test requires Mach-O.
33

4-
// RUN: %empty-directory(%t)/tmp/ && touch %t/tmp/dummy
4+
// RUN: %empty-directory(%t)
5+
// RUN: %empty-directory(%t/tmp)
6+
// RUN: touch %t/tmp/dummy
57
// RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main
68
// RUN: ls %t/main
79
// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s
810

911
// EMPTY-NOT: .{{(o|swiftmodule|swiftdoc)}}
1012

11-
// RUN: %empty-directory(%t)/tmp/ && touch %t/tmp/dummy
13+
// RUN: %empty-directory(%t) && %empty-directory(%t/tmp) && touch %t/tmp/dummy
1214
// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main2 -emit-module-path %t/main2.swiftmodule
1315
// RUN: ls %t/main2
1416
// RUN: ls %t/main2.swiftmodule
1517
// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s
1618

17-
// RUN: %empty-directory(%t)/tmp/ && touch %t/tmp/dummy
19+
// RUN: %empty-directory(%t) && %empty-directory(%t/tmp) && touch %t/tmp/dummy
1820
// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main3 -g
1921
// RUN: ls %t/main3
2022
// RUN: ls %t/tmp | %FileCheck -check-prefix=EMPTY %s
2123

22-
// RUN: %empty-directory(%t)/tmp/ && touch %t/tmp/dummy
24+
// RUN: %empty-directory(%t) && %empty-directory(%t/tmp) && touch %t/tmp/dummy
2325
// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main4 -emit-module-path %t/main4.swiftmodule -g
2426
// RUN: ls %t/main4
2527
// RUN: ls %t/main4.swiftmodule
@@ -29,7 +31,7 @@
2931
// MAIN4-macho: main4.dSYM
3032
// MAIN4-elf-NOT: .dSYM
3133

32-
// RUN: %empty-directory(%t)/tmp/ && touch %t/tmp/dummy
34+
// RUN: %empty-directory(%t) && %empty-directory(%t/tmp) && touch %t/tmp/dummy
3335
// RUN: echo "{\"%s\": {\"object\": \"%t/main5.o\"}}" > %t.json
3436
// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main5 -output-file-map %t.json -g
3537
// RUN: ls %t/main5
@@ -40,7 +42,7 @@
4042
// MAIN5-macho: main5.dSYM
4143
// MAIN5-elf-NOT: .dSYM
4244

43-
// RUN: %empty-directory(%t)/tmp/ && touch %t/tmp/dummy
45+
// RUN: %empty-directory(%t) && %empty-directory(%t/tmp) && touch %t/tmp/dummy
4446
// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main6 -g -save-temps
4547
// RUN: ls %t/main6
4648
// RUN: ls %t | %FileCheck -check-prefix=MAIN6-%target-object-format %s

‎test/IRGen/clang_inline.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %empty-directory(%t)
77
// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -Xcc -O3 -emit-ir | %FileCheck %s
88

9-
// RUN: mkdir -p %t/Empty.framework/Modules/Empty.swiftmodule
9+
// RUN: %empty-directory(%t/Empty.framework/Modules/Empty.swiftmodule)
1010
// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -emit-module-path %t/Empty.framework/Modules/Empty.swiftmodule/%target-swiftmodule-name %S/../Inputs/empty.swift -module-name Empty
1111
// RUN: %target-swift-frontend -assume-parsing-unqualified-ownership-sil -sdk %S/Inputs -primary-file %s -F %t -DIMPORT_EMPTY -Xcc -O3 -emit-ir > %t.ll
1212
// RUN: %FileCheck %s < %t.ll
@@ -16,7 +16,7 @@
1616
// XFAIL: linux
1717

1818
#if IMPORT_EMPTY
19-
import Empty
19+
import Empty
2020
#endif
2121

2222
import gizmo
@@ -81,5 +81,5 @@ func testStaticButNotInline() -> CInt {
8181

8282
// CHECK: attributes [[INLINEHINT_SSP_UWTABLE]] = { inlinehint ssp {{.*}}}
8383
// CHECK: attributes [[SSP]] = { ssp {{.*}} }
84-
// CHECK: attributes [[INNER_ZERO_ATTR]] = { inlinehint nounwind ssp
84+
// CHECK: attributes [[INNER_ZERO_ATTR]] = { inlinehint nounwind ssp
8585
// CHECK: attributes [[GET_INT_ATTR]] = {

‎test/Interpreter/SDK/object_literals.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %empty-directory(%t)/Test.app/Contents/MacOS
1+
// RUN: %empty-directory(%t)
2+
// RUN: %empty-directory(%t/Test.app/Contents/MacOS)
23
// RUN: cp -r %S/Inputs/object_literals-Resources %t/Test.app/Contents/Resources
34
// RUN: %target-build-swift %s -o %t/Test.app/Contents/MacOS/main
45
// RUN: %target-run %t/Test.app/Contents/MacOS/main

‎test/Interpreter/builtin.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift %s -parse-stdlib -Xfrontend -disable-access-control -o %t/a.out
33
// RUN: %target-run %t/a.out | %FileCheck %s
44
// REQUIRES: executable_test

‎test/Interpreter/nested_generics.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mkdir -p %t
1+
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift %s -o %t/a.out
33
// RUN: %target-run %t/a.out | %FileCheck %s
44
// REQUIRES: executable_test

‎test/SIL/Serialization/perf_inline_without_inline_all.swift

+1-1
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: %target-swift-frontend -emit-module %S/Inputs/nontransparent.swift -O -sil-serialize-all -parse-stdlib -parse-as-library -emit-module -o %t/Swift.swiftmodule -module-name=Swift -module-link-name swiftCore
33
// RUN: %target-swift-frontend %s -O -I %t -emit-sil -o - | %FileCheck %s
44

0 commit comments

Comments
 (0)