Skip to content

[test] Fix three Driver tests under cross-compilation. #5694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2016
Merged

[test] Fix three Driver tests under cross-compilation. #5694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/Driver/continue-building-after-errors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: not %swiftc_driver %S/Inputs/error.swift %s 2>&1 | %FileCheck %s
// RUN: not %swiftc_driver -continue-building-after-errors %S/Inputs/error.swift %s 2>&1 | %FileCheck -check-prefix=CHECK-CONTINUE %s
// RUN: not %target-build-swift %S/Inputs/error.swift %s 2>&1 | %FileCheck %s
// RUN: not %target-build-swift -continue-building-after-errors %S/Inputs/error.swift %s 2>&1 | %FileCheck -check-prefix=CHECK-CONTINUE %s

// CHECK: self.bar = self.bar
// CHECK-NOT: self.baz = self.baz
Expand Down
4 changes: 2 additions & 2 deletions test/Driver/driver-time-compilation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %swiftc_driver -parse -driver-time-compilation %s 2>&1 | %FileCheck %s
// RUN: %swiftc_driver -parse -driver-time-compilation %s %S/../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix CHECK-MULTIPLE %s
// RUN: %target-build-swift -parse -driver-time-compilation %s 2>&1 | %FileCheck %s
// RUN: %target-build-swift -parse -driver-time-compilation %s %S/../Inputs/empty.swift 2>&1 | %FileCheck -check-prefix CHECK-MULTIPLE %s

// CHECK: Driver Time Compilation
// CHECK: Total Execution Time: {{[0-9]+}}.{{[0-9]+}} seconds ({{[0-9]+}}.{{[0-9]+}} wall clock)
Expand Down
5 changes: 3 additions & 2 deletions test/Driver/swift-version-default.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// RUN: %swiftc_driver_plain -parse -Xfrontend -verify %s
// RUN: %swiftc_driver_plain -target %target-triple -module-cache-path %t -parse -Xfrontend -verify %s

// This test should be updated to match the expected default Swift version
// when swiftc is invoked directly.
// It should /not/ follow the version specified when invoking lit.
// It should /not/ follow the version specified when invoking lit, which means
// it can't use the %swiftc_driver or %target-build-swift substitutions.

#if swift(>=3)
asdf // expected-error {{use of unresolved identifier}}
Expand Down