diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-10-08 16:31:56 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-10-08 16:35:46 +0200 |
| commit | 9956e8369abf6e4735a78e30a78d010e562bea9d (patch) | |
| tree | 46f6ade7cce5b34689f4d115e78452da4a7881ef /test/end-to-end/git-import/deduplicate.sh | |
| parent | 8798a8bdf82c87a136c07410d65267859f92e851 (diff) | |
| download | justbuild-9956e8369abf6e4735a78e30a78d010e562bea9d.tar.gz | |
tests: use --dump-plain-graph to simplify equality check
Diffstat (limited to 'test/end-to-end/git-import/deduplicate.sh')
| -rwxr-xr-x | test/end-to-end/git-import/deduplicate.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/end-to-end/git-import/deduplicate.sh b/test/end-to-end/git-import/deduplicate.sh index dce77fbe..ec7e614c 100755 --- a/test/end-to-end/git-import/deduplicate.sh +++ b/test/end-to-end/git-import/deduplicate.sh @@ -20,7 +20,6 @@ readonly DEDUPLICATE="${PWD}/bin/deduplicate-tool-under-test" readonly GIT_IMPORT="${PWD}/bin/git-import-under-test" readonly JUST="${PWD}/bin/tool-under-test" readonly JUST_MR="${PWD}/bin/mr-tool-under-test" -readonly ACTIONS_EQUAL="${PWD}/bin/actions-graph-equal" readonly LBR="${TEST_TMPDIR}/local-build-root" readonly OUT="${TEST_TMPDIR}/build-output" readonly REPO_DIRS="${TEST_TMPDIR}/repos" @@ -102,7 +101,7 @@ cat repos-full.json echo "${JUST_MR}" -C repos-full.json --norc --just "${JUST}" \ --local-build-root "${LBR}" analyse \ - --dump-graph actions-full.json 2>&1 + --dump-plain-graph actions-full.json 2>&1 echo cat repos-full.json | "${DEDUPLICATE}" > repos.json cat repos.json @@ -110,11 +109,11 @@ echo "${JUST_MR}" -C repos.json --norc --just "${JUST}" \ --local-build-root "${LBR}" analyse \ - --dump-graph actions.json 2>&1 + --dump-plain-graph actions.json 2>&1 # Verify that we reduced the number of repositories, but did # not change the action graph (except for the origins of the actions). [ $(jq -aM '.repositories | length' repos.json) -lt $(jq -aM '.repositories | length' repos-full.json) ] -"${ACTIONS_EQUAL}" actions-full.json actions.json +cmp actions-full.json actions.json echo "OK" |