diff options
author | 2017-07-21 10:09:35 +0200 | |
---|---|---|
committer | 2017-07-24 09:50:45 +0200 | |
commit | 170f496af96d20bac4a4cb6507b0916622bb5e41 (patch) | |
tree | c076186bc8fca29247d4ea85ddca16e51884cade /src/test/shell/bazel/apple | |
parent | 63dabb6cfd55febc14e221ec51b18120558bc23c (diff) |
Make all test cases pass with --noexperimental_separate_genfiles_directory.
RELNOTES: None.
PiperOrigin-RevId: 162715619
Diffstat (limited to 'src/test/shell/bazel/apple')
-rwxr-xr-x | src/test/shell/bazel/apple/bazel_apple_test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/shell/bazel/apple/bazel_apple_test.sh b/src/test/shell/bazel/apple/bazel_apple_test.sh index 72cb42550d..932413ddd9 100755 --- a/src/test/shell/bazel/apple/bazel_apple_test.sh +++ b/src/test/shell/bazel/apple/bazel_apple_test.sh @@ -211,7 +211,7 @@ EOF bazel build --verbose_failures --objccopt=-DCOPTS_FOO=1 -s \ --xcode_version=$XCODE_VERSION \ //ios:swift_lib >$TEST_log 2>&1 || fail "should build" - expect_log "-module-cache-path bazel-out/darwin_x86_64-fastbuild/genfiles/_objc_module_cache" + expect_log "-module-cache-path bazel-out/darwin_x86_64-fastbuild/.*/_objc_module_cache" } function test_swift_import_objc_framework() { @@ -759,8 +759,8 @@ EOF bazel build --verbose_failures --xcode_version=$XCODE_VERSION -s \ //ios:bin >$TEST_log 2>&1 || fail "should build" - expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/ios_x86_64-fastbuild/genfiles/ios/dep/_objs/ios_dep.swiftmodule" - expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/ios_x86_64-fastbuild/genfiles/ios/swift_lib/_objs/ios_swift_lib.swiftmodule" + expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/ios_x86_64-fastbuild/.*/ios/dep/_objs/ios_dep.swiftmodule" + expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/ios_x86_64-fastbuild/.*/ios/swift_lib/_objs/ios_swift_lib.swiftmodule" } function test_swiftc_script_mode() { |