aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Laszlo Csomor <laszlocsomor@google.com>2018-06-15 01:54:36 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-15 01:55:36 -0700
commit46cdba80eeaa9df62faea23700c066956bc40d1c (patch)
tree2d10c475778e81c87b11ca312301671ebf709fa9 /src/test
parent68aa410229cb36ceedc910c803a0aff2db6d027f (diff)
shell, testenv.sh, BUILD: remove unused target
Change-Id: I1039371e326dc260f2e70b32c9f4e2fd0dc0d7a6 Closes #5395. Change-Id: I002ba4f0944594ab62a7dd7a3ed4b4e7438328c0 PiperOrigin-RevId: 200686443
Diffstat (limited to 'src/test')
-rw-r--r--src/test/shell/bazel/BUILD21
-rwxr-xr-xsrc/test/shell/bazel/remote/remote_execution_http_test.sh2
-rwxr-xr-xsrc/test/shell/bazel/remote/remote_execution_sandboxing_test.sh2
-rwxr-xr-xsrc/test/shell/bazel/remote/remote_execution_test.sh2
-rwxr-xr-xsrc/test/shell/testenv.sh3
5 files changed, 3 insertions, 27 deletions
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 450b3c6902..045f33ed19 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -207,27 +207,6 @@ sh_test(
],
)
-# TODO(bazel-team): zip is non-deterministic because of file timestamp,
-# we should use a custom zip version (SingleJar?).
-genrule(
- name = "doc-srcs",
- testonly = 1,
- srcs = [
- "//src/java_tools/singlejar:srcs",
- "//src/main/java/com/google/devtools/build/lib/actions:srcs",
- "//src/main/java/com/google/devtools/build/lib/rules/genquery:srcs",
- "//src/main/java/com/google/devtools/build/lib/sandbox:srcs",
- "//src/main/java/com/google/devtools/build/lib/standalone:srcs",
- "//src/main/java/com/google/devtools/build/lib/worker:srcs",
- "//src/main/java/com/google/devtools/build/lib:srcs",
- "//src/main/protobuf:srcs",
- "//src/tools/xcode-common:srcs",
- "//third_party:srcs",
- ],
- outs = ["doc-srcs.zip"],
- cmd = "echo $(SRCS) | tr ' ' '\n' | zip -q@ $@",
-)
-
sh_test(
name = "bazel_docgen_test",
size = "large",
diff --git a/src/test/shell/bazel/remote/remote_execution_http_test.sh b/src/test/shell/bazel/remote/remote_execution_http_test.sh
index 4b8741fcb2..2a7c6e76f3 100755
--- a/src/test/shell/bazel/remote/remote_execution_http_test.sh
+++ b/src/test/shell/bazel/remote/remote_execution_http_test.sh
@@ -30,7 +30,7 @@ function set_up() {
(( attempts++ ))
worker_port=$(pick_random_unused_tcp_port) || fail "no port found"
hazelcast_port=$(pick_random_unused_tcp_port) || fail "no port found"
- "${bazel_data}/src/tools/remote/worker" \
+ "${BAZEL_RUNFILES}/src/tools/remote/worker" \
--work_path="${work_path}" \
--listen_port=${worker_port} \
--hazelcast_standalone_listen_port=${hazelcast_port} \
diff --git a/src/test/shell/bazel/remote/remote_execution_sandboxing_test.sh b/src/test/shell/bazel/remote/remote_execution_sandboxing_test.sh
index 7ebe7e448e..e5b9efe8b2 100755
--- a/src/test/shell/bazel/remote/remote_execution_sandboxing_test.sh
+++ b/src/test/shell/bazel/remote/remote_execution_sandboxing_test.sh
@@ -30,7 +30,7 @@ function set_up() {
readonly_path=$(mktemp -d "${TEST_TMPDIR}/remote.XXXXXXXX")
pid_file=$(mktemp -u "${TEST_TMPDIR}/remote.XXXXXXXX")
worker_port=$(pick_random_unused_tcp_port) || fail "no port found"
- "${bazel_data}/src/tools/remote/worker" \
+ "${BAZEL_RUNFILES}/src/tools/remote/worker" \
--work_path="${work_path}" \
--listen_port=${worker_port} \
--sandboxing \
diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh
index f56b5fb36d..d5e0b9fad9 100755
--- a/src/test/shell/bazel/remote/remote_execution_test.sh
+++ b/src/test/shell/bazel/remote/remote_execution_test.sh
@@ -30,7 +30,7 @@ function set_up() {
while [ $attempts -le 5 ]; do
(( attempts++ ))
worker_port=$(pick_random_unused_tcp_port) || fail "no port found"
- "${bazel_data}/src/tools/remote/worker" \
+ "${BAZEL_RUNFILES}/src/tools/remote/worker" \
--work_path="${work_path}" \
--listen_port=${worker_port} \
--cas_path=${cas_path} \
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index cbafb2b33c..d1a2dd33b0 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -82,9 +82,6 @@ BAZEL_RUNFILES="$TEST_SRCDIR/io_bazel"
workspace_file="${BAZEL_RUNFILES}/WORKSPACE"
distdir_bzl_file="${BAZEL_RUNFILES}/distdir.bzl"
-# Bazel
-bazel_data="${BAZEL_RUNFILES}"
-
# Java
if is_windows; then
jdk_dir="$(cygpath -m $(cd $(rlocation local_jdk/bin/java.exe)/../..; pwd))"