.gitlab-ci.yml

 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk@v1.0.0-alpha.1"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.2"
 
 default:
   tags:

CHANGELOG.md

+# [1.0.0-alpha.14](https://git.gitlab.arm.com/bazel/rules_toolchain/compare/v1.0.0-alpha.13...v1.0.0-alpha.14) (2024-01-09)
+
+### Bug Fixes
+
+- **symlink/target:** forward on target runfiles ([8b64cee](https://git.gitlab.arm.com/bazel/rules_toolchain/commit/8b64cee2c9b323bc94def46806f81f7de00b88f3))
+- **test:** add executable to runfiles ([57e2621](https://git.gitlab.arm.com/bazel/rules_toolchain/commit/57e2621953afaa8762609527b24eb89ae7788c1b))
+- **test:** correct TAP output for diff comparison ([e965777](https://git.gitlab.arm.com/bazel/rules_toolchain/commit/e965777bb2c9854d1e022b45ddc4d3f35596855b))
+- **test:** forward on runfiles ([e832606](https://git.gitlab.arm.com/bazel/rules_toolchain/commit/e832606d803aeb654a876ff53ba56a7b35df952a))
+
 # [1.0.0-alpha.13](https://git.gitlab.arm.com/bazel/rules_toolchain/compare/v1.0.0-alpha.12...v1.0.0-alpha.13) (2023-12-13)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "rules_toolchain",
-    version = "1.0.0-alpha.13",
+    version = "1.0.0-alpha.14",
     bazel_compatibility = [
         ">=7.0.0",
     ],

e2e/MODULE.bazel.lock

@@ -848,7 +848,7 @@
   "moduleExtensions": {
     "//:MODULE.bazel%_repo_rules": {
       "general": {
-        "bzlTransitiveDigest": "KG6uDVyujU4kHPLqmUqLHrJ+KilOeP/GNTvxhBrLob8=",
+        "bzlTransitiveDigest": "DcS7hkCR97tWU6RFIoqiRZfRyhn8MoWr0X40xcNtOZg=",
         "accumulatedFileDigests": {},
         "envVariables": {},
         "generatedRepoSpecs": {

toolchain/symlink/target/rule.bzl

@@ -83,10 +83,13 @@ def implementation(ctx):
         variable: executable.path,
     })
 
+    runfiles = ctx.runfiles(ctx.attr.data + [executable])
+    runfiles = runfiles.merge(ctx.attr.target.default_runfiles)
+
     default = DefaultInfo(
         executable = executable,
         files = depset([executable]),
-        runfiles = ctx.runfiles(ctx.attr.data + [executable]),
+        runfiles = runfiles,
     )
 
     toolchain = platform_common.ToolchainInfo(

toolchain/test/posix.tmpl.sh

@@ -111,7 +111,7 @@ diff() (
     fi
   done 3<"${FILEPATH}" 4<"${EXPECTED}"
 
-  printf >&2 'ok %s - %s was a non-empty file\n' "${INDEX}" "${FILEPATH}"
+  printf >&2 'ok %s - %s was equal to %s\n' "${INDEX}" "${FILEPATH}" "${EXPECTED}"
   printf '  <testcase name="%s"/>\n' "${FILEPATH}"
 )
 
@@ -177,3 +177,4 @@ while IFS= read -r LINE; do
     exit 1
   fi
 done <"${JUNIT}"
+

toolchain/test/rule.bzl

@@ -8,6 +8,7 @@ Can be set to the following values for special handling:
 
 - `@rules_toolchain//toolchain/test:non-empty`: accept any non-empty output
 - `@rules_toolchain//toolchain/test:empty`: require empty output
+- `@rules_toolchain//toolchain/test:any`: require any output
 """,
         default = ":non-empty",
         allow_single_file = True,
@@ -19,6 +20,7 @@ Can be set to the following values for special handling:
 
 - `@rules_toolchain//toolchain/test:non-empty`: accept any non-empty output
 - `@rules_toolchain//toolchain/test:empty`: require empty output
+- `@rules_toolchain//toolchain/test:any`: require any output
 """,
         default = ":empty",
         allow_single_file = True,
@@ -61,10 +63,13 @@ def implementation(ctx):
         is_executable = True,
     )
 
+    runfiles = ctx.runfiles([executable, toolchain.executable, ctx.file.stdout, ctx.file.stderr])
+    runfiles = runfiles.merge(toolchain.default.default_runfiles)
+
     return DefaultInfo(
         executable = executable,
         files = depset([executable]),
-        runfiles = ctx.runfiles([toolchain.executable, ctx.file.stdout, ctx.file.stderr]),
+        runfiles = runfiles,
     )
 
 toolchain_test = rule(