Skip to content

Commit 896e700

Browse files
luked99gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Luke Diamand <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f1f4c84 commit 896e700

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

t/t9814-git-p4-rename.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,9 @@ test_expect_success 'detect copies' '
226226

227227
# See if configurables can be set, and in particular if the run.move.allow
228228
# variable exists, which allows admins to disable the "p4 move" command.
229-
test_expect_success 'p4 configure command and run.move.allow are available' '
230-
p4 configure show run.move.allow >out ; retval=$? &&
231-
test $retval = 0 &&
232-
{
233-
egrep ^run.move.allow: out &&
234-
test_set_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW ||
235-
true
236-
} || true
229+
test_lazy_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW '
230+
p4 configure show run.move.allow >out &&
231+
egrep ^run.move.allow: out
237232
'
238233

239234
# If move can be disabled, turn it off and test p4 move handling

0 commit comments

Comments
 (0)