Skip to content

Commit fba2d2f

Browse files
authored
Merge pull request swiftlang#14951 from graydon/batch-mode-no-more-bypass-checks-in-tests
2 parents 0cd182d + bf01c4e commit fba2d2f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

test/Driver/batch_mode_parseable_output.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: touch %t/file-01.swift %t/file-02.swift %t/file-03.swift
33
// RUN: echo 'public func main() {}' >%t/main.swift
44
//
5-
// RUN: %swiftc_driver -enable-batch-mode -Xfrontend -bypass-batch-mode-checks -parseable-output -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift 2>&1 | %FileCheck %s
5+
// RUN: %swiftc_driver -enable-batch-mode -parseable-output -c -emit-module -module-name main -j 2 %t/file-01.swift %t/file-02.swift %t/file-03.swift %t/main.swift 2>&1 | %FileCheck %s
66
//
77
//
88
// CHECK: {{[1-9][0-9]*}}

test/Frontend/batch-mode.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: echo 'public func b() { }' >%t/b.swift
44
// RUN: echo 'public func c() { }' >%t/c.swift
55
// RUN: echo 'public func main() {a(); b(); c()}' >%t/main.swift
6-
// RUN: %target-swift-frontend -c -enable-batch-mode -bypass-batch-mode-checks -module-name foo -primary-file %t/a.swift -primary-file %t/b.swift -primary-file %t/c.swift -primary-file %t/main.swift -o %t/a.o -o %t/b.o -o %t/c.o -o %t/main.o
6+
// RUN: %target-swift-frontend -c -enable-batch-mode -module-name foo -primary-file %t/a.swift -primary-file %t/b.swift -primary-file %t/c.swift -primary-file %t/main.swift -o %t/a.o -o %t/b.o -o %t/c.o -o %t/main.o
77
//
88
// RUN: llvm-objdump -t %t/a.o | swift-demangle | %FileCheck -check-prefix=CHECK-A %s
99
// RUN: llvm-objdump -t %t/b.o | swift-demangle | %FileCheck -check-prefix=CHECK-B %s

test/Frontend/dependencies-selective-supplementaries.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: %empty-directory(%t)
66
// RUN: echo 'public func a() { }' >%t/a.swift
77
// RUN: echo 'public func main() {a()}' >%t/main.swift
8-
// RUN: %target-swift-frontend -c -enable-batch-mode -bypass-batch-mode-checks -module-name foo -primary-file %t/a.swift -primary-file %t/main.swift -emit-dependencies-path %t/a.d -emit-dependencies-path %t/main.d -o %t/a.o -o %t/main.o -emit-module-path %t/a.swiftmodule -emit-module-path %t/main.swiftmodule
8+
// RUN: %target-swift-frontend -c -enable-batch-mode -module-name foo -primary-file %t/a.swift -primary-file %t/main.swift -emit-dependencies-path %t/a.d -emit-dependencies-path %t/main.d -o %t/a.o -o %t/main.o -emit-module-path %t/a.swiftmodule -emit-module-path %t/main.swiftmodule
99
// RUN: %FileCheck -check-prefix=CHECK-MAIN %s <%t/main.d
1010
// RUN: %FileCheck -check-prefix=NEGATIVE-MAIN %s <%t/main.d
1111
//

0 commit comments

Comments
 (0)