diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-04-23 09:33:56 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-04-23 09:33:56 +0200 |
| commit | a045db67a4b9e388e66dc80f33e8548465546fc4 (patch) | |
| tree | 9f1dd8eb9f68c2b64469286fe1031ac1005319d1 /test/end-to-end/built-in-rules/generic_conflict.sh | |
| parent | a212d87be891c5146021b6442063ed39a4a1cd4a (diff) | |
| download | justbuild-a045db67a4b9e388e66dc80f33e8548465546fc4.tar.gz | |
Make end-to-end tests independent of the user's configuration
End-to-end tests should, like all tests, be independent of any
non-project files the user has in their home directory. This also
applies when running the tests locally. In particular, end-to-end
tests should not read the user's ~/.just-mrrc. Therefore, properly
set --norc in all end-to-end tests (where this is not already
the case).
Diffstat (limited to 'test/end-to-end/built-in-rules/generic_conflict.sh')
| -rw-r--r-- | test/end-to-end/built-in-rules/generic_conflict.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/end-to-end/built-in-rules/generic_conflict.sh b/test/end-to-end/built-in-rules/generic_conflict.sh index fbb8470c..6d9f8ca0 100644 --- a/test/end-to-end/built-in-rules/generic_conflict.sh +++ b/test/end-to-end/built-in-rules/generic_conflict.sh @@ -59,13 +59,13 @@ EOF echo echo local file should analyse fine echo -"${JUST_MR}" --just "${JUST}" --local-build-root "${LBRDIR}" \ +"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${LBRDIR}" \ analyse data 2>&1 echo echo The default target should detect a staging conflict echo -"${JUST_MR}" --just "${JUST}" --local-build-root "${LBRDIR}" \ +"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${LBRDIR}" \ analyse -f log --dump-actions - 2>&1 && exit 1 || : echo |