diff --git a/js/private/bash.bzl b/js/private/bash.bzl index ac005db9c..651773124 100644 --- a/js/private/bash.bzl +++ b/js/private/bash.bzl @@ -61,13 +61,10 @@ if [ "${TEST_SRCDIR:-}" ]; then elif [ "${RUNFILES_MANIFEST_FILE:-}" ]; then RUNFILES=$(_normalize_path "$RUNFILES_MANIFEST_FILE") if [[ "${RUNFILES}" == *.runfiles_manifest ]]; then - # Newer versions of Bazel put the manifest besides the runfiles with the suffix .runfiles_manifest. + # Bazel puts the manifest besides the runfiles with the suffix .runfiles_manifest. # For example, the runfiles directory is named my_binary.runfiles then the manifest is beside the # runfiles directory and named my_binary.runfiles_manifest RUNFILES=${RUNFILES%_manifest} - elif [[ "${RUNFILES}" == */MANIFEST ]]; then - # Older versions of Bazel put the manifest file named MANIFEST in the runfiles directory - RUNFILES=${RUNFILES%/MANIFEST} else logf_fatal "Unexpected RUNFILES_MANIFEST_FILE value $RUNFILES_MANIFEST_FILE" exit 1 diff --git a/js/private/test/image/asserts.bzl b/js/private/test/image/asserts.bzl index a2aeccdde..a08d9eb8c 100644 --- a/js/private/test/image/asserts.bzl +++ b/js/private/test/image/asserts.bzl @@ -6,7 +6,7 @@ load("//js:defs.bzl", "js_image_layer") # buildifier: disable=function-docstring def assert_tar_listing(name, actual, expected): # Either of these two file sizes may be observed on a file like /js/private/test/image/bin - sanitize_cmd = "sed -E 's/239[0-9]{2}/xxxxx/g'" + sanitize_cmd = "sed -E 's/237[0-9]{2}/xxxxx/g'" actual_listing = "_{}_listing".format(name) native.genrule( name = actual_listing, diff --git a/js/private/test/image/non_ascii/custom_layer_groups_test_app.listing b/js/private/test/image/non_ascii/custom_layer_groups_test_app.listing index 46846288d..b775aa984 100644 --- a/js/private/test/image/non_ascii/custom_layer_groups_test_app.listing +++ b/js/private/test/image/non_ascii/custom_layer_groups_test_app.listing @@ -4,7 +4,7 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/ --r-xr-xr-x 0 0 0 24076 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2 +-r-xr-xr-x 0 0 0 23874 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2 drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/ @@ -14,7 +14,7 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/ -r-xr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/ㅑㅕㅣㅇ.ㄴㅅ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/bin2_/ --r-xr-xr-x 0 0 0 24076 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/bin2_/bin2 +-r-xr-xr-x 0 0 0 23874 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/bin2_/bin2 drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/bin2_node_bin/ -r-xr-xr-x 0 0 0 133 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/bin2_node_bin/node -r-xr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/_main/js/private/test/image/non_ascii/empty empty.ㄴㅅ diff --git a/js/private/test/snapshots/launcher.sh b/js/private/test/snapshots/launcher.sh index 106b436e3..57b84d18f 100644 --- a/js/private/test/snapshots/launcher.sh +++ b/js/private/test/snapshots/launcher.sh @@ -211,13 +211,10 @@ if [ "${TEST_SRCDIR:-}" ]; then elif [ "${RUNFILES_MANIFEST_FILE:-}" ]; then RUNFILES=$(_normalize_path "$RUNFILES_MANIFEST_FILE") if [[ "${RUNFILES}" == *.runfiles_manifest ]]; then - # Newer versions of Bazel put the manifest besides the runfiles with the suffix .runfiles_manifest. + # Bazel puts the manifest besides the runfiles with the suffix .runfiles_manifest. # For example, the runfiles directory is named my_binary.runfiles then the manifest is beside the # runfiles directory and named my_binary.runfiles_manifest RUNFILES=${RUNFILES%_manifest} - elif [[ "${RUNFILES}" == */MANIFEST ]]; then - # Older versions of Bazel put the manifest file named MANIFEST in the runfiles directory - RUNFILES=${RUNFILES%/MANIFEST} else logf_fatal "Unexpected RUNFILES_MANIFEST_FILE value $RUNFILES_MANIFEST_FILE" exit 1