summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-03-06 10:57:06 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-03-07 10:04:35 +0100
commitb958c67a9270063ada8d6800e022e3489ff3d205 (patch)
tree559dcb5e5f9c6d7d03b97160a8a61f7f9b833100
parent05f3f2c1c0d0d39562fee09afd201b7bc9a9db4b (diff)
downloadjustbuild-b958c67a9270063ada8d6800e022e3489ff3d205.tar.gz
Add test verifying reporting levels
... in particular, verify that no error is reported on successfull command completion.
-rw-r--r--test/end-to-end/just-mr/TARGETS11
-rw-r--r--test/end-to-end/just-mr/reporting-verbosity.sh85
2 files changed, 96 insertions, 0 deletions
diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS
index cdf668f4..203f79c4 100644
--- a/test/end-to-end/just-mr/TARGETS
+++ b/test/end-to-end/just-mr/TARGETS
@@ -193,6 +193,16 @@
, "deps":
[["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
}
+, "reporting-verbosity":
+ { "type": ["end-to-end", "with remote"]
+ , "name": ["reporting-verbosity"]
+ , "test": ["reporting-verbosity.sh"]
+ , "deps":
+ [ ["end-to-end", "tool-under-test"]
+ , ["end-to-end", "mr-tool-under-test"]
+ , "fetch-absent (data)"
+ ]
+ }
, "TESTS":
{ "type": "install"
, "tainted": ["test"]
@@ -216,6 +226,7 @@
, "defaults"
, "absent-roots"
, "foreign-file"
+ , "reporting-verbosity"
]
, { "type": "if"
, "cond": {"type": "var", "name": "TEST_COMPATIBLE_REMOTE"}
diff --git a/test/end-to-end/just-mr/reporting-verbosity.sh b/test/end-to-end/just-mr/reporting-verbosity.sh
new file mode 100644
index 00000000..040a68d7
--- /dev/null
+++ b/test/end-to-end/just-mr/reporting-verbosity.sh
@@ -0,0 +1,85 @@
+#!/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 -eu
+
+env
+
+readonly JUST="${PWD}/bin/tool-under-test"
+readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
+readonly LBR="${TEST_TMPDIR}/local-build-root"
+readonly OUT="${TEST_TMPDIR}/out"
+readonly LOG="${TEST_TMPDIR}/log"
+
+COMPAT=""
+if [ "${COMPATIBLE:-}" = "YES" ]; then
+ COMPAT="--compatible"
+fi
+
+ARCHIVE_CONTENT=$(git hash-object src/data.tar)
+echo "Archive has content $ARCHIVE_CONTENT"
+
+mkdir work
+cd work
+touch ROOT
+cat > repos.json <<EOF
+{ "repositories":
+ { "archive":
+ { "repository":
+ { "type": "archive"
+ , "content": "${ARCHIVE_CONTENT}"
+ , "fetch": "http://non-existent.example.org/data.tar"
+ }
+ }
+ , "targets": {"repository": {"type": "file", "path": "targets"}}
+ , "":
+ { "repository": {"type": "distdir", "repositories": ["archive"]}
+ , "target_root": "targets"
+ }
+ }
+}
+EOF
+mkdir targets
+cat > targets/TARGETS <<'EOF'
+{ "":
+ { "type": "generic"
+ , "outs": ["archive_id"]
+ , "cmds": ["git hash-object data.tar > archive_id"]
+ , "deps": ["data.tar"]
+ }
+}
+EOF
+
+echo
+cat repos.json
+echo
+mkdir -p "${LOG}"
+"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${LBR}" \
+ -r "${REMOTE_EXECUTION_ADDRESS}" ${COMPAT} \
+ -f "${LOG}/log" \
+ --distdir ../src \
+ install -o "${OUT}" 2>&1
+echo
+cat "${OUT}/archive_id"
+[ $(cat "${OUT}/archive_id") = "${ARCHIVE_CONTENT}" ]
+echo
+# As the build succeeded, there should not be any error reported
+cat "${LOG}/log"
+echo
+grep ERROR "${LOG}/log" && exit 1 || :
+
+echo
+echo OK