undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: t9814: prevent --chain-lint failure

Browse Source 
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>
This commit is contained in:
Luke Diamand 2015-04-28 08:21:22 +01:00 committed by Junio C Hamano
parent f1f4c84dcc
commit 896e700ad9
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/t9814-git-p4-rename.sh
View File

@ -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