Merge Gerrit change 25820 Patch Set 12
PiperOrigin-RevId: 267595230
Change-Id: I3d960c326c913aa9f39cd92753a4c48bcfcea023
diff --git a/cc/integration/gcpkms/BUILD.bazel b/cc/integration/gcpkms/BUILD.bazel
index 7fb4f9a..21aa7f7 100644
--- a/cc/integration/gcpkms/BUILD.bazel
+++ b/cc/integration/gcpkms/BUILD.bazel
@@ -47,30 +47,29 @@
# tests
-# TODO(b/119547792): Temporarily disabling until reliability concerns are addressed.
-#cc_test(
-# name = "gcp_kms_aead_test",
-# size = "medium",
-# srcs = ["gcp_kms_aead_test.cc"],
-# deps = [
-# ":gcp_kms_aead",
-# "//cc/util:errors",
-# "//cc/util:status",
-# "//cc/util:statusor",
-# "@com_google_googletest//:gtest_main",
-# ],
-#)
-#
-#cc_test(
-# name = "gcp_kms_client_test",
-# size = "medium",
-# srcs = ["gcp_kms_client_test.cc"],
-# data = ["//testdata:credentials"],
-# deps = [
-# ":gcp_kms_client",
-# "//cc/util:errors",
-# "//cc/util:status",
-# "//cc/util:statusor",
-# "@com_google_googletest//:gtest_main",
-# ],
-#)
+cc_test(
+ name = "gcp_kms_aead_test",
+ size = "medium",
+ srcs = ["gcp_kms_aead_test.cc"],
+ deps = [
+ ":gcp_kms_aead",
+ "//cc/util:errors",
+ "//cc/util:status",
+ "//cc/util:statusor",
+ "@com_google_googletest//:gtest_main",
+ ],
+)
+
+cc_test(
+ name = "gcp_kms_client_test",
+ size = "medium",
+ srcs = ["gcp_kms_client_test.cc"],
+ data = ["//testdata:credentials"],
+ deps = [
+ ":gcp_kms_client",
+ "//cc/util:errors",
+ "//cc/util:status",
+ "//cc/util:statusor",
+ "@com_google_googletest//:gtest_main",
+ ],
+)
diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh
index 6f03c95..fe831c9 100755
--- a/kokoro/run_tests.sh
+++ b/kokoro/run_tests.sh
@@ -62,6 +62,12 @@
)
readonly DISABLE_SANDBOX_ARGS
+# TODO(b/140615798)
+DISABLE_GRPC_ON_MAC_OS=""
+if [[ "${PLATFORM}" == 'darwin' ]]; then
+ DISABLE_GRPC_ON_MAC_OS="-//cc/integration/gcpkms/..."
+fi
+
echo "using bazel binary: $(which bazel)"
bazel version
@@ -77,12 +83,14 @@
# Build all targets, except objc.
time bazel build "${DISABLE_SANDBOX_ARGS[@]}" \
-- //... \
+ ${DISABLE_GRPC_ON_MAC_OS} \
-//objc/... || ( ls -l ; df -h / ; exit 1 )
# Run all tests, except manual and objc tests.
time bazel test \
--strategy=TestRunner=standalone --test_output=all \
-- //... \
+ ${DISABLE_GRPC_ON_MAC_OS} \
-//objc/... || ( ls -l ; df -h / ; exit 1 )
}
diff --git a/tools/testing/cc/BUILD.bazel b/tools/testing/cc/BUILD.bazel
index 1842559..ab2ecb6 100644
--- a/tools/testing/cc/BUILD.bazel
+++ b/tools/testing/cc/BUILD.bazel
@@ -150,16 +150,17 @@
tags = ["no_rbe"],
)
-# TODO(b/119547792): Temporarily disabling until reliability concerns are addressed.
-#sh_test(
-# name = "gcp_kms_aead_test",
-# size = "medium",
-# srcs = [
-# "gcp_kms_aead_test.sh",
-# ],
-# data = [
-# ":gcp_kms_aead_cli",
-# "//testdata:credentials",
-# "//tools/testing/cross_language:test_lib",
-# ],
-#)
+sh_test(
+ name = "gcp_kms_aead_test",
+ size = "medium",
+ srcs = [
+ "gcp_kms_aead_test.sh",
+ ],
+ data = [
+ ":gcp_kms_aead_cli",
+ "//testdata:credentials",
+ "//tools/testing/cross_language:test_lib",
+ "@google_root_pem//file",
+ ],
+ tags = ["no_rbe"],
+)
diff --git a/tools/testing/cc/gcp_kms_aead_test.sh b/tools/testing/cc/gcp_kms_aead_test.sh
index 836f80e..bde4aed 100755
--- a/tools/testing/cc/gcp_kms_aead_test.sh
+++ b/tools/testing/cc/gcp_kms_aead_test.sh
@@ -12,7 +12,6 @@
# limitations under the License.
################################################################################
-
ROOT_DIR="$TEST_SRCDIR/tink"
GCP_KMS_AEAD_CLI="$ROOT_DIR/tools/testing/cc/gcp_kms_aead_cli"
GCP_KEY_NAME_FILE="$ROOT_DIR/testdata/gcp_key_name.txt"
@@ -22,6 +21,10 @@
TEST_UTIL="$ROOT_DIR/tools/testing/cross_language/test_util.sh"
associated_data="some associated data"
+# Roots for GRPC
+# (https://github.com/grpc/grpc/blob/master/doc/environment_variables.md)
+export GRPC_DEFAULT_SSL_ROOTS_FILE_PATH="$TEST_SRCDIR/google_root_pem/file/downloaded"
+
source $TEST_UTIL || exit 1
#############################################################################
