diff options
| author |  Luke Diamand <luke@diamand.org> | 2015-04-28 08:21:22 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-04-28 12:16:01 -0700 |
| commit | 896e700ad92890b59568a52b88e9bd22eec6f9e7 (patch) | |
| tree | 896bad0a030cfaf77f90618972aeac40be19e159 | |
| parent | t9814: guarantee only one source exists in git-p4 copy tests (diff) | |
| download | tgif-896e700ad92890b59568a52b88e9bd22eec6f9e7.tar.xz | |
git-p4: t9814: prevent --chain-lint failure
Use test_lazy_prereq to setup prerequisites for the p4 move
test. This both makes the test simpler and clearer, and also
means it no longer fails the new --chain-lint tests.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9814-git-p4-rename.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh index 99bb71b89c..c89992cf95 100755 --- a/t/t9814-git-p4-rename.sh +++ b/t/t9814-git-p4-rename.sh @@ -226,14 +226,9 @@ test_expect_success 'detect copies' ' # See if configurables can be set, and in particular if the run.move.allow # variable exists, which allows admins to disable the "p4 move" command. -test_expect_success 'p4 configure command and run.move.allow are available' ' - p4 configure show run.move.allow >out ; retval=$? && - test $retval = 0 && - { - egrep ^run.move.allow: out && - test_set_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW || - true - } || true +test_lazy_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW ' + p4 configure show run.move.allow >out && + egrep ^run.move.allow: out ' # If move can be disabled, turn it off and test p4 move handling |