diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2022-02-28 16:23:04 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2022-02-28 16:25:32 +0100 |
| commit | a9dc24c9ce15bb5bdedf5773024d966333de3e84 (patch) | |
| tree | 0930723451ed639a7788e9661687a0bf66b6ab1c /test/end-to-end/actions | |
| parent | 5581e163c36003a78f283e585f5338ecd3327a35 (diff) | |
| download | justbuild-a9dc24c9ce15bb5bdedf5773024d966333de3e84.tar.gz | |
action-equality test: improve conditions
Use the log functionality instead of relying on stderr being
precisely the log. Also check for the number of processed
actions instead of any number of actions that might be
reported in the log. While there, redirect stderr to stdout
to have a unified cronological log.
Diffstat (limited to 'test/end-to-end/actions')
| -rwxr-xr-x | test/end-to-end/actions/action-equality.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/end-to-end/actions/action-equality.sh b/test/end-to-end/actions/action-equality.sh index f0ce86b3..72762f30 100755 --- a/test/end-to-end/actions/action-equality.sh +++ b/test/end-to-end/actions/action-equality.sh @@ -46,14 +46,14 @@ cat > TARGETS <<'EOI' EOI -bin/tool-under-test build -J 1 --local_build_root .tool-root 2>log -cat log +bin/tool-under-test build -J 1 --local_build_root .tool-root -f build.log 2>&1 +cat build.log echo -grep '4 actions' log -grep '1 cache hit' log +grep 'Processed.* 4 actions' build.log +grep '1 cache hit' build.log echo -bin/tool-under-test analyse --dump_graph graph.json +bin/tool-under-test analyse --dump_graph graph.json 2>&1 echo matching_targets=$(cat graph.json | jq -acM '.actions | [ .[] | .origins | [ .[] | .target]] | sort') echo "${matching_targets}" |