2 files changed, 65 insertions, 0 deletions
diff --git a/test/end-to-end/actions/TARGETS b/test/end-to-end/actions/TARGETS
index 80478a9f..25a05ea5 100644
--- a/test/end-to-end/actions/TARGETS
+++ b/test/end-to-end/actions/TARGETS
@@ -52,6 +52,12 @@
   , "test": ["incomplete-retry.sh"]
   , "deps": [["end-to-end", "tool-under-test"]]
   }
+, "error-reporting":
+  { "type": ["@", "rules", "shell/test", "script"]
+  , "name": ["error-reporting"]
+  , "test": ["error-reporting.sh"]
+  , "deps": [["end-to-end", "tool-under-test"]]
+  }
 , "TESTS":
   { "type": "install"
   , "tainted": ["test"]
@@ -62,6 +68,7 @@
     , "trees"
     , "conflicts"
     , "incomplete-retry"
+    , "error-reporting"
     ]
   }
 }
diff --git a/test/end-to-end/actions/error-reporting.sh b/test/end-to-end/actions/error-reporting.sh
new file mode 100644
index 00000000..7518fe53
--- /dev/null
+++ b/test/end-to-end/actions/error-reporting.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+# Copyright 2024 Huawei Cloud Computing Technology Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+readonly ROOT="$(pwd)"
+readonly LBR="${TMPDIR}/local-build-root"
+readonly OUT="${TMPDIR}/out"
+readonly JUST="${ROOT}/bin/tool-under-test"
+readonly LOCAL_TOOLS="${TMPDIR}/tools"
+
+touch ROOT
+cat > TARGETS <<EOF
+{ "theTargetCausingTheFailure":
+  { "type": "generic"
+  , "outs": ["a.txt"]
+  , "cmds":
+    ["echo -n stdout-of-; echo failing-target", "touch a.txt", "exit 42"]
+  }
+}
+EOF
+cat TARGETS
+echo
+
+# Verify tat a failing build provides enough meaningful
+# information at log-level ERROR.
+mkdir -p "${OUT}"
+"${JUST}" build --local-build-root "${LBR}" \
+          -f "${OUT}/log" --log-limit 0 \
+          2>&1 && exit 1 || :
+
+# The exit code should be reported
+grep 42 "${OUT}/log"
+
+# The target name should be reported
+grep theTargetCausingTheFailure "${OUT}/log"
+
+# At default level we should also find stdout of the target
+echo
+"${JUST}" build --local-build-root "${LBR}" \
+          -f "${OUT}/log.default" \
+          2>&1 && exit 1 || :
+
+grep stdout-of-failing-target "${OUT}/log.default"
+
+echo OK