diff options
author | Dmitry Shevchenko <dmishe@google.com> | 2016-07-08 17:42:25 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-07-11 09:39:24 +0000 |
commit | 9551686e94e7344ce08fbee5b9c7b4a47d01e872 (patch) | |
tree | b7ebcfe245c833995df9f331b561c63a9f0ab0c5 | |
parent | cc7712f0acff385046d76b9012eeb342452d93ac (diff) |
Enable @testable import in swift_library
* Debug and fastbuild compilation modes now pass -enable-testing flag enabling internal symbol imports in test code.
--
MOS_MIGRATED_REVID=126925229
-rwxr-xr-x | src/test/shell/bazel/bazel_apple_test.sh | 13 | ||||
-rw-r--r-- | tools/build_defs/apple/swift.bzl | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/test/shell/bazel/bazel_apple_test.sh b/src/test/shell/bazel/bazel_apple_test.sh index efa81ffa57..6eb6ca265a 100755 --- a/src/test/shell/bazel/bazel_apple_test.sh +++ b/src/test/shell/bazel/bazel_apple_test.sh @@ -391,11 +391,19 @@ EOF function test_swift_tests() { make_app + cat >ios/internal.swift <<EOF +internal class InternalClass { + func foo() -> String { return "bar" } +} +EOF + cat >ios/tests.swift <<EOF import XCTest + @testable import ios_SwiftMain class FooTest: XCTestCase { func testFoo() { XCTAssertEqual(2, 3) } + func testInternalClass() { XCTAssertEqual(InternalClass().foo(), "bar") } } EOF @@ -403,7 +411,7 @@ EOF load("//tools/build_defs/apple:swift.bzl", "swift_library") swift_library(name = "SwiftMain", - srcs = ["app.swift"]) + srcs = ["app.swift", "internal.swift"]) objc_binary(name = "bin", srcs = ["//tools/objc:dummy.c"], @@ -414,7 +422,8 @@ ios_application(name = "app", infoplist = 'App-Info.plist') swift_library(name = "SwiftTest", - srcs = ["tests.swift"]) + srcs = ["tests.swift"], + deps = [":SwiftMain"]) ios_test(name = "app_test", srcs = ["//tools/objc:dummy.c"], diff --git a/tools/build_defs/apple/swift.bzl b/tools/build_defs/apple/swift.bzl index 7df084208b..42cf00d18c 100644 --- a/tools/build_defs/apple/swift.bzl +++ b/tools/build_defs/apple/swift.bzl @@ -37,9 +37,9 @@ def _swift_compilation_mode_flags(ctx): """Returns additional swiftc flags for the current compilation mode.""" mode = ctx.var["COMPILATION_MODE"] if mode == "dbg": - return ["-Onone", "-DDEBUG", "-g"] + return ["-Onone", "-DDEBUG", "-g", "-enable-testing"] elif mode == "fastbuild": - return ["-Onone", "-DDEBUG"] + return ["-Onone", "-DDEBUG", "-enable-testing"] elif mode == "opt": return ["-O", "-DNDEBUG"] |