aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts/ci
diff options
context:
space:
mode:
authorGravatar Marcel Hlopko <hlopko@google.com>2017-08-17 22:13:39 +0200
committerGravatar Irina Iancu <elenairina@google.com>2017-08-18 09:01:55 +0200
commitf426544e67170d31b9d228ecf4cdc4b6ce1ba00d (patch)
treeec1aa7baa28ed4773817a597d2010246346fd20d /scripts/ci
parentca1e9fb2bb103f2ee84f3ed36c293ca1e194e73b (diff)
Fix osx_cc_wrapper.sh for multiple rpaths
osx_cc_wrapper.sh was not working correctly in cases when multiple rpaths were specified on linking command line. This cl modifies the wrapper to record all rpaths, and use the rpath that corresponds to a particular library when updating libraries install name. Fixes #3450 RELNOTES: None. Change-Id: I614694a792b6724a1db9814ee25af1802560c463 PiperOrigin-RevId: 165618946
Diffstat (limited to 'scripts/ci')
-rw-r--r--scripts/ci/bazel-tests.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json
index 535459dec4..d0a81d599e 100644
--- a/scripts/ci/bazel-tests.json
+++ b/scripts/ci/bazel-tests.json
@@ -86,7 +86,8 @@
"//scripts/...",
"filter(\"^(?!//src/test/docker).*$\", //src/test/...)",
"//third_party/ijar/...",
- "//tools/android/..."
+ "//tools/android/...",
+ "//src/test/shell/bazel:cpp_darwin_integration_test"
],
"targets": []
}