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>
Luke Diamand committed
Apr 28, 2015 at 08:21 UTC
896e700ad92890b59568a52b88e9bd22eec6f9e7
1 file changed
+3
-8
t/t9814-git-p4-rename.sh
+3
-8
@@ -226,14 +226,9 @@ test_expect_success 'detect copies' '
226
227
# See if configurables can be set, and in particular if the run.move.allow
228
# 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
232
'
233
234
# If move can be disabled, turn it off and test p4 move handling