Skip to content

Commit f5a08e4

Browse files
committed
Interop: restore -std=c++11 for a few tests
Restore the explicit C++ standard for these tests as the C++ compiler invocation on Darwin uses the system compiler rather than the just built clang, which may be sufficiently different to have different default standards. This will be cleaned up with the next change to introduce a new `%target-clangxx` to control the C++ standard.
1 parent 21732c9 commit f5a08e4

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

test/Interop/Cxx/operators/member-out-of-line.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-clang -c %S/Inputs/member-out-of-line.cpp -I %S/Inputs -o %t/member-out-of-line.o
2+
// RUN: %target-clang -std=c++11 -c %S/Inputs/member-out-of-line.cpp -I %S/Inputs -o %t/member-out-of-line.o
33
// RUN: %target-build-swift %s -I %S/Inputs -o %t/member-out-of-line %t/member-out-of-line.o -Xfrontend -enable-cxx-interop
44
// RUN: %target-codesign %t/member-out-of-line
55
// RUN: %target-run %t/member-out-of-line

test/Interop/Cxx/operators/non-member-out-of-line.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-clang -c %S/Inputs/non-member-out-of-line.cpp -I %S/Inputs -o %t/non-member-out-of-line.o
2+
// RUN: %target-clang -std=c++11 -c %S/Inputs/non-member-out-of-line.cpp -I %S/Inputs -o %t/non-member-out-of-line.o
33
// RUN: %target-build-swift %s -I %S/Inputs -o %t/non-member-out-of-line %t/non-member-out-of-line.o -Xfrontend -enable-cxx-interop
44
// RUN: %target-codesign %t/non-member-out-of-line
55
// RUN: %target-run %t/non-member-out-of-line

test/Interop/Cxx/reference/reference.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-clang -c %S/Inputs/reference.cpp -I %S/Inputs -o %t/reference.o
2+
// RUN: %target-clang -std=c++11 -c %S/Inputs/reference.cpp -I %S/Inputs -o %t/reference.o
33
// RUN: %target-build-swift %s -I %S/Inputs -o %t/reference %t/reference.o -Xfrontend -enable-cxx-interop
44
// RUN: %target-codesign %t/reference
55
// RUN: %target-run %t/reference

test/Interop/Cxx/static/constexpr-static-member-var.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-clang -c %S/Inputs/static-member-var.cpp -I %S/Inputs -o %t/static-member-var.o
2+
// RUN: %target-clang -std=c++11 -c %S/Inputs/static-member-var.cpp -I %S/Inputs -o %t/static-member-var.o
33
// NOTE: we must use `-O` here to ensure that the constexpr value is inlined and no undefined reference remains.
44
// RUN: %target-build-swift -O %s -I %S/Inputs -o %t/statics %t/static-member-var.o -Xfrontend -enable-cxx-interop
55
// RUN: %target-codesign %t/statics

test/Interop/Cxx/static/static-member-var.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-clang -c %S/Inputs/static-member-var.cpp -I %S/Inputs -o %t/static-member-var.o
2+
// RUN: %target-clang -std=c++11 -c %S/Inputs/static-member-var.cpp -I %S/Inputs -o %t/static-member-var.o
33
// RUN: %target-build-swift %s -I %S/Inputs -o %t/statics %t/static-member-var.o -Xfrontend -enable-cxx-interop
44
// RUN: %target-codesign %t/statics
55
// RUN: %target-run %t/statics

0 commit comments

Comments
 (0)