Skip to content

Commit

Permalink
fix discard_graph_edges_test to properly depend on $(JAVABASE)
Browse files Browse the repository at this point in the history
- no longer uses $bazel_javabase from testenv.sh
- works with absolute $(JAVABASE) paths and JDK's other than loc

Progress towards bazelbuild#8033
  • Loading branch information
buchgr committed Apr 15, 2019
1 parent 6f90d01 commit 9b2432e
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/test/shell/integration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,15 @@ sh_test(
name = "discard_graph_edges_test",
size = "medium",
srcs = ["discard_graph_edges_test.sh"],
args = ["$(JAVABASE)"],
data = [
":discard_graph_edges_lib.sh",
":test-deps",
"@bazel_tools//tools/bash/runfiles",
],
shard_count = 6,
tags = ["no_windows"],
toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
)

sh_test(
Expand Down
47 changes: 45 additions & 2 deletions src/test/shell/integration/discard_graph_edges_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,49 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
source "${CURRENT_DIR}/discard_graph_edges_lib.sh" \
|| { echo "${CURRENT_DIR}/discard_graph_edges_lib.sh not found!" >&2; exit 1; }

# --- begin runfiles.bash initialization ---
if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
if [[ -f "$0.runfiles_manifest" ]]; then
export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest"
elif [[ -f "$0.runfiles/MANIFEST" ]]; then
export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST"
elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
export RUNFILES_DIR="$0.runfiles"
fi
fi
if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash"
elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \
"$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)"
else
echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash"
exit 1
fi
# --- end runfiles.bash initialization ---

IS_WINDOWS=false
case "$(uname | tr [:upper:] [:lower:])" in
msys*|mingw*|cygwin*)
IS_WINDOWS=true
esac

if "$IS_WINDOWS"; then
EXE_EXT=".exe"
else
EXE_EXT=""
fi

javabase="$1"
if [[ $javabase = /* || $javabase =~ [A-Za-z]:[/\\] ]]; then
jmaptool="$1/bin/jmap${EXE_EXT}"
else
if [[ $javabase = external/* ]]; then
javabase=${javabase#external/}
fi
jmaptool="$(rlocation "${javabase}/bin/jmap${EXE_EXT}")"
fi

#### SETUP #############################################################

set -e
Expand Down Expand Up @@ -167,7 +210,7 @@ genrule(name = 'histodump',
local = 1,
tools = [':cclib'],
cmd = 'server_pid=\$\$(cat $server_pid_fifo) ; ' +
'${bazel_javabase}/bin/jmap -histo:live \$\$server_pid > ' +
'${jmaptool} -histo:live \$\$server_pid > ' +
'\$(location histo.txt) ' +
'|| echo "server_pid in genrule: \$\$server_pid"'
)
Expand Down Expand Up @@ -365,7 +408,7 @@ EOF

bazel build $BUILD_FLAGS //foo:foo \
>& "$TEST_log" || fail "Expected success"
"${bazel_javabase}/bin/jmap" -histo:live "$(bazel info server_pid)" > histo.txt
"$jmaptool" -histo:live "$(bazel info server_pid)" > histo.txt
genrule_action_count="$(extract_histogram_count histo.txt \
'GenRuleAction$')"
if [[ "$genrule_action_count" -lt 1 ]]; then
Expand Down

0 comments on commit 9b2432e

Please sign in to comment.