diff options
Diffstat (limited to 'test/end-to-end/built-in-rules')
| -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 |