diff options
Diffstat (limited to 'src/test/shell/shell_utils_symlinks_test.sh')
| -rwxr-xr-x | src/test/shell/shell_utils_symlinks_test.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/test/shell/shell_utils_symlinks_test.sh b/src/test/shell/shell_utils_symlinks_test.sh index dc822ac620..9617320ab2 100755 --- a/src/test/shell/shell_utils_symlinks_test.sh +++ b/src/test/shell/shell_utils_symlinks_test.sh @@ -16,32 +16,32 @@ # # This test exercises Bash utility implementations. -set -euo pipefail # --- begin runfiles.bash initialization --- +set -euo pipefail 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/io_bazel/tools/bash/runfiles/runfiles.bash" ]]; then - export RUNFILES_DIR="$0.runfiles" - elif [[ -f "$TEST_SRCDIR/io_bazel/tools/bash/runfiles/runfiles.bash" ]]; then - export RUNFILES_DIR="$TEST_SRCDIR" - fi + 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}/io_bazel/tools/bash/runfiles/runfiles.bash" ]]; then - source "${RUNFILES_DIR}/io_bazel/tools/bash/runfiles/runfiles.bash" +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 "^io_bazel/tools/bash/runfiles/runfiles.bash " \ + source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \ "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)" else - echo >&2 "ERROR: cannot find //tools/bash/runfiles:runfiles.bash" + echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash" exit 1 fi # --- end runfiles.bash initialization --- -source "$(rlocation "io_bazel/src/test/shell/unittest.bash")" || { echo "Could not source unittest.bash" >&2; exit 1; } -source "$(rlocation "io_bazel/src/test/shell/shell_utils.sh")" || { echo "Could not source shell_utils.sh" >&2; exit 1; } +source "$(rlocation "io_bazel/src/test/shell/unittest.bash")" \ + || { echo "Could not source unittest.bash" >&2; exit 1; } +source "$(rlocation "io_bazel/src/test/shell/shell_utils.sh")" \ + || { echo "Could not source shell_utils.sh" >&2; exit 1; } cd "$TEST_TMPDIR" |