summaryrefslogtreecommitdiff
path: root/test/end-to-end/computed-roots/basic.sh
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-11-21 15:11:55 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-11-21 17:44:26 +0100
commit6a54ab1e83648e7ad5bb4dec53f1b8aeb821da9c (patch)
treed5d7421c14514e70aad32ef1905ec772a98d8980 /test/end-to-end/computed-roots/basic.sh
parent0281f711a821785d04dfd26424979a9ab4e4a33a (diff)
downloadjustbuild-6a54ab1e83648e7ad5bb4dec53f1b8aeb821da9c.tar.gz
Computed-roots evaluation: improve reporting
For subcomputations add the log to CAS and only report the blob identifier. Also, indicate at the beginning, that computed roots are to be computed. While there, simplify code by using the ToString() method of computed roots.
Diffstat (limited to 'test/end-to-end/computed-roots/basic.sh')
-rw-r--r--test/end-to-end/computed-roots/basic.sh17
1 files changed, 16 insertions, 1 deletions
diff --git a/test/end-to-end/computed-roots/basic.sh b/test/end-to-end/computed-roots/basic.sh
index 70ed2948..20fec921 100644
--- a/test/end-to-end/computed-roots/basic.sh
+++ b/test/end-to-end/computed-roots/basic.sh
@@ -111,10 +111,25 @@ echo Building a different computed root, without reference build
echo
"${JUST}" install -L '["env", "PATH='"${PATH}"'"]' \
--local-build-root "${LBRDIR}" -C repo-config.json \
- --log-limit 4 --main 'other derived' -o "${OUT}/other-derived" 2>&1
+ --log-limit 4 -f "${OUT}/log" \
+ --main 'other derived' -o "${OUT}/other-derived" 2>&1
echo
[ "$(cat "${OUT}/other-derived/out" | wc -l)" -eq 78 ]
+echo
+echo Sanity-check of the log
+echo
+grep '[Rr]oot.*base.*evaluted.*' "${OUT}/log" > "${TMPDIR}/log_line"
+cat "${TMPDIR}/log_line"
+sed -i 's/.*log //' "${TMPDIR}/log_line"
+"${JUST}" install-cas --local-build-root "${LBRDIR}" \
+ -o "${OUT}/log.root" $(cat "${TMPDIR}/log_line")
+echo
+cat "${OUT}/log.root"
+echo
+grep 'COUNT.*12' "${OUT}/log.root"
+grep '[Dd]iscovered.*1 action' "${OUT}/log.root"
+grep '0 cache hit' "${OUT}/log.root"
echo OK