]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t9834: remove use of `test_might_fail p4`
authorDenton Liu <liu.denton@gmail.com>
Tue, 7 Jul 2020 06:04:37 +0000 (02:04 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 20:07:27 +0000 (13:07 -0700)
The test_must_fail() family of functions (including test_might_fail())
should only be used on git commands. Replace test_might_fail() with
a compound command wrapping the old p4 invocation that always returns 0.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9834-git-p4-file-dir-bug.sh

index 031e1f8668110c754cb1c1b108b1354efbfcc7de..dac67e89d7d720a916eec8a533d9b1f05101525a 100755 (executable)
@@ -10,7 +10,7 @@ repository.'
 
 test_expect_success 'start p4d' '
        start_p4d &&
-       test_might_fail p4 configure set submit.collision.check=0
+       { p4 configure set submit.collision.check=0 || :; }
 '
 
 test_expect_success 'init depot' '