aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/shell
diff options
context:
space:
mode:
authorGravatar cpeyser <cpeyser@google.com>2017-06-26 16:46:31 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-06-26 18:43:04 +0200
commitc9ab594c1f9334fa20e70a9ec1bc0414c10d74a6 (patch)
treebafcbff6876a089a2a792a38bc21e318d8540b27 /src/test/shell
parent192422d2e554d297972c1cdc02127b1ca8be54ab (diff)
Remove usage of --ios_cpu from Bazel.
PiperOrigin-RevId: 160143322
Diffstat (limited to 'src/test/shell')
-rwxr-xr-xsrc/test/shell/bazel/apple/bazel_apple_test.sh8
-rwxr-xr-xsrc/test/shell/bazel/apple/bazel_objc_test.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/shell/bazel/apple/bazel_apple_test.sh b/src/test/shell/bazel/apple/bazel_apple_test.sh
index 703eabe990..5fbd18933a 100755
--- a/src/test/shell/bazel/apple/bazel_apple_test.sh
+++ b/src/test/shell/bazel/apple/bazel_apple_test.sh
@@ -389,11 +389,11 @@ EOF
--ios_minimum_os=8.0 \
//ios:app_test >$TEST_log 2>&1 || fail "should build"
- otool -lv bazel-bin/ios/app_test_bin \
+ otool -lv bazel-out/ios_x86_64-fastbuild/bin/ios/app_test_bin \
| grep @executable_path/Frameworks -sq \
|| fail "expected test binary to contain @executable_path in LC_RPATH"
- otool -lv bazel-bin/ios/app_test_bin \
+ otool -lv bazel-out/ios_x86_64-fastbuild/bin/ios/app_test_bin \
| grep @loader_path/Frameworks -sq \
|| fail "expected test binary to contain @loader_path in LC_RPATH"
@@ -766,8 +766,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/darwin_x86_64-fastbuild/genfiles/ios/dep/_objs/ios_dep.swiftmodule"
- expect_log "-Xlinker -add_ast_path -Xlinker bazel-out/darwin_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/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"
}
function test_swiftc_script_mode() {
diff --git a/src/test/shell/bazel/apple/bazel_objc_test.sh b/src/test/shell/bazel/apple/bazel_objc_test.sh
index 65cdd02043..955562a492 100755
--- a/src/test/shell/bazel/apple/bazel_objc_test.sh
+++ b/src/test/shell/bazel/apple/bazel_objc_test.sh
@@ -117,7 +117,7 @@ function test_ios_test() {
bazel build --test_output=all --ios_sdk_version=$IOS_SDK_VERSION \
--ios_minimum_os=8.0 \
//ios:PassingXcTest >$TEST_log 2>&1 || fail "should pass"
- ls bazel-bin/ios/PassingXcTest.ipa \
+ ls bazel-out/ios_x86_64-fastbuild/bin/ios/PassingXcTest.ipa \
|| fail "should generate PassingXcTest.ipa"
}