Skip to content

Commit 1bdce7c

Browse files
rintarorintaro
committed
[lit] Add substitutions: %utils and %line-directive
%utils => ${SWIFT_SOURCE_DIR}/utils %line-directive => ${SWIFT_SOURCE_DIR}/utils/line-directive
1 parent c8bbd63 commit 1bdce7c

File tree

182 files changed

+527
-523
lines changed

Some content is hidden

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

182 files changed

+527
-523
lines changed

‎test/1_stdlib/ArrayTraps.swift.gyb

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t
22
// RUN: mkdir -p %t
3-
// RUN: %S/../../utils/gyb %s -o %t/ArrayTraps.swift
4-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Debug
5-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Release -O
3+
// RUN: %gyb %s -o %t/ArrayTraps.swift
4+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Debug
5+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Release -O
66
//
7-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Debug
8-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Release
7+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Debug
8+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Release
99
// REQUIRES: executable_test
1010

1111
import StdlibUnittest

‎test/1_stdlib/ArrayTrapsObjC.swift.gyb

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: rm -rf %t
22
// RUN: mkdir -p %t
3-
// RUN: %S/../../utils/gyb %s -o %t/ArrayTraps.swift
4-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Debug
5-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Release -O
3+
// RUN: %gyb %s -o %t/ArrayTraps.swift
4+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Debug
5+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-build-swift %t/ArrayTraps.swift -o %t/a.out_Release -O
66
//
7-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Debug
8-
// RUN: %S/../../utils/line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Release
7+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Debug
8+
// RUN: %line-directive %t/ArrayTraps.swift -- %target-run %t/a.out_Release
99
// REQUIRES: executable_test
1010
// REQUIRES: objc_interop
1111

‎test/1_stdlib/BridgeStorage.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
// distinguish these cases efficiently.
1616
//
1717
//===----------------------------------------------------------------------===//
18-
// RUN: rm -rf %t && mkdir -p %t && %S/../../utils/gyb %s -o %t/out.swift
19-
// RUN: %S/../../utils/line-directive %t/out.swift -- %target-build-swift -parse-stdlib %t/out.swift -o %t/a.out
20-
// RUN: %S/../../utils/line-directive %t/out.swift -- %target-run %t/a.out
18+
// RUN: rm -rf %t && mkdir -p %t && %gyb %s -o %t/out.swift
19+
// RUN: %line-directive %t/out.swift -- %target-build-swift -parse-stdlib %t/out.swift -o %t/a.out
20+
// RUN: %line-directive %t/out.swift -- %target-run %t/a.out
2121
// REQUIRES: executable_test
2222

2323
// REQUIRES: objc_interop

‎test/1_stdlib/CastTraps.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// -*- swift -*-
22
// RUN: rm -rf %t ; mkdir -p %t
3-
// RUN: %S/../../utils/gyb %s -o %t/CastTraps.swift
4-
// RUN: %S/../../utils/line-directive %t/CastTraps.swift -- %target-build-swift %t/CastTraps.swift -o %t/a.out
5-
// RUN: %S/../../utils/line-directive %t/CastTraps.swift -- %target-run %t/a.out
3+
// RUN: %gyb %s -o %t/CastTraps.swift
4+
// RUN: %line-directive %t/CastTraps.swift -- %target-build-swift %t/CastTraps.swift -o %t/a.out
5+
// RUN: %line-directive %t/CastTraps.swift -- %target-run %t/a.out
66
// REQUIRES: executable_test
77

88
// FIXME: Casting.cpp has dozens of places to fail a cast. This test does not

‎test/1_stdlib/FloatingPoint.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: rm -rf %t && mkdir -p %t && %S/../../utils/gyb %s -o %t/FloatingPoint.swift
2-
// RUN: %S/../../utils/line-directive %t/FloatingPoint.swift -- %target-build-swift -parse-stdlib -Xfrontend -disable-access-control %t/FloatingPoint.swift -o %t/a.out
3-
// RUN: %S/../../utils/line-directive %t/FloatingPoint.swift -- %target-run %t/a.out
1+
// RUN: rm -rf %t && mkdir -p %t && %gyb %s -o %t/FloatingPoint.swift
2+
// RUN: %line-directive %t/FloatingPoint.swift -- %target-build-swift -parse-stdlib -Xfrontend -disable-access-control %t/FloatingPoint.swift -o %t/a.out
3+
// RUN: %line-directive %t/FloatingPoint.swift -- %target-run %t/a.out
44
// REQUIRES: executable_test
55

66
%{

‎test/1_stdlib/InputStream.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
//===----------------------------------------------------------------------===//
1212
// -*- swift -*-
1313
// RUN: rm -rf %t ; mkdir -p %t
14-
// RUN: %S/../../utils/gyb %s -o %t/InputStream.swift
15-
// RUN: %S/../../utils/line-directive %t/InputStream.swift -- %target-build-swift %t/InputStream.swift -o %t/a.out
16-
// RUN: %S/../../utils/line-directive %t/InputStream.swift -- %target-run %t/a.out
14+
// RUN: %gyb %s -o %t/InputStream.swift
15+
// RUN: %line-directive %t/InputStream.swift -- %target-build-swift %t/InputStream.swift -o %t/a.out
16+
// RUN: %line-directive %t/InputStream.swift -- %target-run %t/a.out
1717
// REQUIRES: executable_test
1818

1919
import StdlibUnittest

‎test/1_stdlib/NumericParsing.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
//===----------------------------------------------------------------------===//
1212
// -*- swift -*-
1313
// RUN: rm -rf %t ; mkdir -p %t
14-
// RUN: %S/../../utils/gyb -DCMAKE_SIZEOF_VOID_P=%target-ptrsize %s -o %t/NumericParsing.swift
15-
// RUN: %S/../../utils/line-directive %t/NumericParsing.swift -- %target-build-swift %t/NumericParsing.swift -o %t/a.out
16-
// RUN: %S/../../utils/line-directive %t/NumericParsing.swift -- %target-run %t/a.out
14+
// RUN: %gyb -DCMAKE_SIZEOF_VOID_P=%target-ptrsize %s -o %t/NumericParsing.swift
15+
// RUN: %line-directive %t/NumericParsing.swift -- %target-build-swift %t/NumericParsing.swift -o %t/a.out
16+
// RUN: %line-directive %t/NumericParsing.swift -- %target-run %t/a.out
1717
// REQUIRES: executable_test
1818
%{
1919
from SwiftIntTypes import all_integer_types

‎test/1_stdlib/Tuple.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: rm -f %t.swift %t.out
22

3-
// RUN: %S/../../utils/gyb %s -o %t.swift
4-
// RUN: %S/../../utils/line-directive %t.swift -- %target-build-swift %t.swift -o %t.out
5-
// RUN: %S/../../utils/line-directive %t.swift -- %target-run %t.out
3+
// RUN: %gyb %s -o %t.swift
4+
// RUN: %line-directive %t.swift -- %target-build-swift %t.swift -o %t.out
5+
// RUN: %line-directive %t.swift -- %target-run %t.out
66
// REQUIRES: executable_test
77

88
import StdlibUnittest

‎test/1_stdlib/UnsafePointer.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: rm -rf %t && mkdir -p %t && %S/../../utils/gyb %s -o %t/UnsafePointer.swift
2-
// RUN: %S/../../utils/line-directive %t/UnsafePointer.swift -- %target-build-swift %t/UnsafePointer.swift -o %t/a.out
3-
// RUN: %S/../../utils/line-directive %t/UnsafePointer.swift -- %target-run %t/a.out
1+
// RUN: rm -rf %t && mkdir -p %t && %gyb %s -o %t/UnsafePointer.swift
2+
// RUN: %line-directive %t/UnsafePointer.swift -- %target-build-swift %t/UnsafePointer.swift -o %t/a.out
3+
// RUN: %line-directive %t/UnsafePointer.swift -- %target-run %t/a.out
44
// REQUIRES: executable_test
55

66
import StdlibUnittest

‎test/1_stdlib/simd.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: rm -f %t.swift %t.out
22

3-
// RUN: %S/../../utils/gyb %s -o %t.swift
4-
// RUN: %S/../../utils/line-directive %t.swift -- %target-build-swift %t.swift -o %t.out
5-
// RUN: %S/../../utils/line-directive %t.swift -- %target-run %t.out
3+
// RUN: %gyb %s -o %t.swift
4+
// RUN: %line-directive %t.swift -- %target-build-swift %t.swift -o %t.out
5+
// RUN: %line-directive %t.swift -- %target-run %t.out
66
// REQUIRES: executable_test
77

88
// FIXME: No simd module on linux rdar://problem/20795411

‎test/ClangModules/mapped-integers.swift.gyb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: rm -rf %t && mkdir -p %t
2-
// RUN: %S/../../utils/gyb %s -o %t/mapped-integers.swift
2+
// RUN: %gyb %s -o %t/mapped-integers.swift
33
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -verify %t/mapped-integers.swift
44

55
import ctypes

‎test/InterfaceHash/added_function.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/added_method.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/added_private_class_property.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/added_private_method.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/added_private_struct_property.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/changed_private_var_type.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/changed_var_name.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/changed_var_type.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: not cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/edited_function_body.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/edited_method_body.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: cmp %t/a.hash %t/b.hash

‎test/InterfaceHash/edited_property_getter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mkdir -p %t
2-
// RUN: %S/../../utils/split_file.py -o %t %s
2+
// RUN: %utils/split_file.py -o %t %s
33
// RUN: %target-swift-frontend -dump-interface-hash %t/a.swift 2> %t/a.hash
44
// RUN: %target-swift-frontend -dump-interface-hash %t/b.swift 2> %t/b.hash
55
// RUN: cmp %t/a.hash %t/b.hash

‎test/Parse/pointer_conversion.swift.gyb

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: rm -rf %t && mkdir -p %t
22

3-
// RUN: %S/../../utils/gyb -DOPT_KIND=None %s -o %t/pointer_conversion.swift
4-
// RUN: %S/../../utils/line-directive %t/pointer_conversion.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion.swift
3+
// RUN: %gyb -DOPT_KIND=None %s -o %t/pointer_conversion.swift
4+
// RUN: %line-directive %t/pointer_conversion.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion.swift
55

6-
// RUN: %S/../../utils/gyb -DOPT_KIND=Optional %s -o %t/pointer_conversion_opt.swift
7-
// RUN: %S/../../utils/line-directive %t/pointer_conversion_opt.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_opt.swift
6+
// RUN: %gyb -DOPT_KIND=Optional %s -o %t/pointer_conversion_opt.swift
7+
// RUN: %line-directive %t/pointer_conversion_opt.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_opt.swift
88

9-
// RUN: %S/../../utils/gyb -DOPT_KIND=ImplicitlyUnwrappedOptional %s -o %t/pointer_conversion_iuo.swift
10-
// RUN: %S/../../utils/line-directive %t/pointer_conversion_iuo.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_iuo.swift
9+
// RUN: %gyb -DOPT_KIND=ImplicitlyUnwrappedOptional %s -o %t/pointer_conversion_iuo.swift
10+
// RUN: %line-directive %t/pointer_conversion_iuo.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_iuo.swift
1111

1212
%{
1313
if OPT_KIND == 'Optional':

‎test/Parse/pointer_conversion_objc.swift.gyb

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: rm -rf %t && mkdir -p %t
22

3-
// RUN: %S/../../utils/gyb -DOPT_KIND=None %s -o %t/pointer_conversion.swift
4-
// RUN: %S/../../utils/line-directive %t/pointer_conversion.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion.swift
3+
// RUN: %gyb -DOPT_KIND=None %s -o %t/pointer_conversion.swift
4+
// RUN: %line-directive %t/pointer_conversion.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion.swift
55

6-
// RUN: %S/../../utils/gyb -DOPT_KIND=Optional %s -o %t/pointer_conversion_opt.swift
7-
// RUN: %S/../../utils/line-directive %t/pointer_conversion_opt.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_opt.swift
6+
// RUN: %gyb -DOPT_KIND=Optional %s -o %t/pointer_conversion_opt.swift
7+
// RUN: %line-directive %t/pointer_conversion_opt.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_opt.swift
88

9-
// RUN: %S/../../utils/gyb -DOPT_KIND=ImplicitlyUnwrappedOptional %s -o %t/pointer_conversion_iuo.swift
10-
// RUN: %S/../../utils/line-directive %t/pointer_conversion_iuo.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_iuo.swift
9+
// RUN: %gyb -DOPT_KIND=ImplicitlyUnwrappedOptional %s -o %t/pointer_conversion_iuo.swift
10+
// RUN: %line-directive %t/pointer_conversion_iuo.swift -- %target-swift-frontend -parse -verify %t/pointer_conversion_iuo.swift
1111

1212
// REQUIRES: objc_interop
1313

‎test/Prototypes/FloatingPoint.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: rm -rf %t && mkdir -p %t
2-
// RUN: %S/../../utils/line-directive %s -- %target-build-swift -parse-stdlib %s -o %t/a.out
3-
// RUN: %S/../../utils/line-directive %s -- %target-run %t/a.out
2+
// RUN: %line-directive %s -- %target-build-swift -parse-stdlib %s -o %t/a.out
3+
// RUN: %line-directive %s -- %target-run %t/a.out
44
// REQUIRES: executable_test
55
import Swift
66

‎test/Prototypes/Integers.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
// RUN: rm -rf %t && mkdir -p %t && %S/../../utils/gyb -DWORD_BITS=%target-ptrsize %s -o %t/out.swift
13-
// RUN: %S/../../utils/line-directive %t/out.swift -- %target-build-swift -parse-stdlib %t/out.swift -o %t/a.out -Onone
14-
// RUN: %S/../../utils/line-directive %t/out.swift -- %target-run %t/a.out
12+
// RUN: rm -rf %t && mkdir -p %t && %gyb -DWORD_BITS=%target-ptrsize %s -o %t/out.swift
13+
// RUN: %line-directive %t/out.swift -- %target-build-swift -parse-stdlib %t/out.swift -o %t/a.out -Onone
14+
// RUN: %line-directive %t/out.swift -- %target-run %t/a.out
1515
// --stdlib-unittest-filter DoubleWidth/
1616

1717
// REQUIRES: executable_test

‎test/Runtime/backtrace.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: rm -rf %t
22
// RUN: mkdir -p %t
33
// RUN: %target-build-swift %s -o %t/a.out
4-
// RUN: not --crash %t/a.out 2>&1 | %S/../../utils/backtrace-check
4+
// RUN: not --crash %t/a.out 2>&1 | %utils/backtrace-check
55

66
// This is not supported on watchos, ios, or tvos
77
// UNSUPPORTED: OS=watchos

‎test/expr/unary/selector/fixits.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// RUN: mkdir -p %t.remapping
2121
// RUN: cp %s %t.sources/fixits.swift
2222
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t.overlays) -parse %t.sources/fixits.swift -fixit-all -emit-fixits-path %t.remapping/fixits.remap
23-
// RUN: %S/../../../../utils/apply-fixit-edits.py %t.remapping
23+
// RUN: %utils/apply-fixit-edits.py %t.remapping
2424
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t.overlays) -parse %t.sources/fixits.swift 2> %t.result
2525

2626
// RUN: FileCheck %s < %t.result

‎test/lit.cfg

+6-2
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,10 @@ config.swift_llvm_opt = inferSwiftBinary('swift-llvm-opt')
289289
config.llvm_profdata = inferSwiftBinary('llvm-profdata')
290290
config.llvm_cov = inferSwiftBinary('llvm-cov')
291291

292-
config.gyb = os.path.join(config.swift_src_root, 'utils', 'gyb')
293-
config.rth = os.path.join(config.swift_src_root, 'utils', 'rth') # Resilience test helper
292+
config.swift_utils = os.path.join(config.swift_src_root, 'utils')
293+
config.line_directive = os.path.join(config.swift_utils, 'line-directive')
294+
config.gyb = os.path.join(config.swift_utils, 'gyb')
295+
config.rth = os.path.join(config.swift_utils, 'rth') # Resilience test helper
294296
config.swift_lib_dir = os.path.join(os.path.dirname(os.path.dirname(config.swift)), 'lib')
295297

296298
# Find the resource directory. Assume it's near the swift compiler if not set.
@@ -851,6 +853,8 @@ config.substitutions.append(('%target-ld', config.target_ld))
851853
if hasattr(config, 'target_cc_options'):
852854
config.substitutions.append(('%target-cc-options', config.target_cc_options))
853855

856+
config.substitutions.append(('%utils', config.swift_utils))
857+
config.substitutions.append(('%line-directive', config.line_directive))
854858
config.substitutions.append(('%gyb', config.gyb))
855859
config.substitutions.append(('%rth', config.rth))
856860

‎validation-test/Python/cmpcodesize.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
// RUN: %{python} -m unittest discover -s %S/../../utils/cmpcodesize
1+
// RUN: %{python} -m unittest discover -s %utils/cmpcodesize

‎validation-test/Python/line-directive.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
// RUN: %{python} %S/../../utils/line-directive
1+
// RUN: %{python} %utils/line-directive

‎validation-test/Python/swift_build_support.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
// RUN: %{python} -m unittest discover -s %S/../../utils/swift_build_support
1+
// RUN: %{python} -m unittest discover -s %utils/swift_build_support

‎validation-test/StdlibUnittest/Assertions.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: rm -rf %t
22
// RUN: mkdir -p %t
3-
// RUN: %S/../../utils/gyb %s -o %t/Assertions.swift
4-
// RUN: %S/../../utils/line-directive %t/Assertions.swift -- %target-build-swift %t/Assertions.swift -o %t/a.out
3+
// RUN: %gyb %s -o %t/Assertions.swift
4+
// RUN: %line-directive %t/Assertions.swift -- %target-build-swift %t/Assertions.swift -o %t/a.out
55
//
6-
// RUN: %S/../../utils/line-directive %t/Assertions.swift -- %target-run %t/a.out
6+
// RUN: %line-directive %t/Assertions.swift -- %target-run %t/a.out
77
// REQUIRES: executable_test
88

99
import StdlibUnittest

‎validation-test/StdlibUnittest/SequencesCollections.swift.gyb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// -*- swift -*-
22
// RUN: rm -rf %t ; mkdir -p %t
3-
// RUN: %S/../../utils/gyb %s -o %t/StdlibUnittestSequencesCollections.swift
4-
// RUN: %S/../../utils/line-directive %t/StdlibUnittestSequencesCollections.swift -- %target-build-swift %t/StdlibUnittestSequencesCollections.swift -o %t/a.out
5-
// RUN: %S/../../utils/line-directive %t/StdlibUnittestSequencesCollections.swift -- %target-run %t/a.out
3+
// RUN: %gyb %s -o %t/StdlibUnittestSequencesCollections.swift
4+
// RUN: %line-directive %t/StdlibUnittestSequencesCollections.swift -- %target-build-swift %t/StdlibUnittestSequencesCollections.swift -o %t/a.out
5+
// RUN: %line-directive %t/StdlibUnittestSequencesCollections.swift -- %target-run %t/a.out
66
// REQUIRES: executable_test
77

88
%{

‎validation-test/stdlib/ArrayNew.swift.gyb

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// RUN: rm -rf %t
22
// RUN: mkdir -p %t
33
//
4-
// RUN: %S/../../utils/gyb %s -o %t/main.swift
4+
// RUN: %gyb %s -o %t/main.swift
55
// RUN: if [ %target-runtime == "objc" ]; then \
66
// RUN: %target-clang -fobjc-arc %S/Inputs/SlurpFastEnumeration/SlurpFastEnumeration.m -c -o %t/SlurpFastEnumeration.o; \
7-
// RUN: %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Array -Xfrontend -disable-access-control; \
7+
// RUN: %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %S/Inputs/DictionaryKeyValueTypesObjC.swift %t/main.swift -I %S/Inputs/SlurpFastEnumeration/ -Xlinker %t/SlurpFastEnumeration.o -o %t/Array -Xfrontend -disable-access-control; \
88
// RUN: else \
9-
// RUN: %S/../../utils/line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Array -Xfrontend -disable-access-control; \
9+
// RUN: %line-directive %t/main.swift -- %target-build-swift %S/Inputs/DictionaryKeyValueTypes.swift %t/main.swift -o %t/Array -Xfrontend -disable-access-control; \
1010
// RUN: fi
11-
// RUN: %S/../../utils/line-directive %t/main.swift -- %target-run %t/Array
11+
// RUN: %line-directive %t/main.swift -- %target-run %t/Array
1212
// REQUIRES: executable_test
1313

1414
import StdlibUnittest

0 commit comments

Comments
 (0)