diff options
| -rw-r--r-- | examples/shell/BUILD | 11 | ||||
| -rwxr-xr-x | examples/shell/bin.sh | 28 | ||||
| -rwxr-xr-x | examples/shell/lib.sh | 28 | ||||
| -rwxr-xr-x | examples/shell/test.sh | 30 | ||||
| -rwxr-xr-x | src/test/shell/bazel/bazel_example_test.sh | 2 |
5 files changed, 78 insertions, 21 deletions
diff --git a/examples/shell/BUILD b/examples/shell/BUILD index 4b51df1cb3..095cea4725 100644 --- a/examples/shell/BUILD +++ b/examples/shell/BUILD @@ -3,7 +3,10 @@ package(default_visibility = ["//visibility:public"]) sh_binary( name = "bin", srcs = ["bin.sh"], - deps = [":lib"], + deps = [ + ":lib", + "@bazel_tools//tools/bash/runfiles", + ], ) sh_library( @@ -12,6 +15,7 @@ sh_library( "data/file.txt", "lib.sh", ], + deps = ["@bazel_tools//tools/bash/runfiles"], ) sh_test( @@ -19,7 +23,10 @@ sh_test( size = "small", srcs = ["test.sh"], data = ["data/test_file.txt"], - deps = [":lib"], + deps = [ + ":lib", + "@bazel_tools//tools/bash/runfiles", + ], ) filegroup( diff --git a/examples/shell/bin.sh b/examples/shell/bin.sh index 5b51ccf06c..9131503b91 100755 --- a/examples/shell/bin.sh +++ b/examples/shell/bin.sh @@ -14,12 +14,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -eu +set -euo pipefail +# --- 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 --- -# This allows the script to be both a binary and a library script. If our binary has defined -# RUNFILES then we use it, otherwise we look for our own runfiles. -RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} - -source "${RUNFILES}/examples/shell/lib.sh" +source "$(rlocation io_bazel/examples/shell/lib.sh)" showfile diff --git a/examples/shell/lib.sh b/examples/shell/lib.sh index 495ef3d422..c70918aef0 100755 --- a/examples/shell/lib.sh +++ b/examples/shell/lib.sh @@ -14,12 +14,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -eu - -# This allows the script to be both a binary and a library script. If our binary has defined -# RUNFILES then we use it, otherwise we look for our own runfiles. -RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} +set -euo pipefail +# --- 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 --- function showfile { - cat "${RUNFILES}/examples/shell/data/file.txt" + cat "$(rlocation io_bazel/examples/shell/data/file.txt)" } diff --git a/examples/shell/test.sh b/examples/shell/test.sh index 6b7ba90e37..b4c7bf821b 100755 --- a/examples/shell/test.sh +++ b/examples/shell/test.sh @@ -14,17 +14,33 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -eu +set -euo pipefail +# --- 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 --- -# This allows RUNFILES to be declared outside the script it you want. -# RUNFILES for test is the directory of the script. -RUNFILES=${RUNFILES:-$($(cd $(dirname ${BASH_SOURCE[0]})); pwd)} - -source "${RUNFILES}/examples/shell/lib.sh" +source "$(rlocation io_bazel/examples/shell/lib.sh)" function test_output { OUTPUT=$(showfile) - EXPECTED_OUTPUT=$(cat "${RUNFILES}/examples/shell/data/test_file.txt") + EXPECTED_OUTPUT=$(cat "$(rlocation io_bazel/examples/shell/data/test_file.txt)") if [ "${OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then # This would be a failure case. diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh index 4cc954c685..0ed4dc1bd3 100755 --- a/src/test/shell/bazel/bazel_example_test.sh +++ b/src/test/shell/bazel/bazel_example_test.sh @@ -118,6 +118,8 @@ function test_native_python_with_zip() { function test_shell() { assert_build "//examples/shell:bin" + unset RUNFILES_DIR + unset RUNFILES_MANIFEST_FILE assert_bazel_run "//examples/shell:bin" "Hello Bazel!" assert_test_ok "//examples/shell:test" } |