Re: [PATCH] git-p4: prevent --chain-lint failure

[Jeff King]

On Mon, Apr 27, 2015 at 11:20:28PM +0100, Luke Diamand wrote:

 t9814 has a test that simply sets up a pre-requisite for
 another test, and as such, always succeeds. The way it was
 written doesn't quite work with the test lint checks introduced
 with the --chain-lint option.
 
 Add an additional layer of {} to prevent the --chain-lint
 code getting confused.

Thanks for looking into this. I tried to fix any existing tests I could,
but I missed ones whose prerequisites aren't met on my system.

Using {} is reasonable in general; that's how the fixes in 9ddc5ac (t:
wrap complicated expect_code users in a block, 2015-03-20) worked.
However, I think your case is somewhat simpler, in that you really just
want a big conditional to set a prereq based on whether or not a command
succeeds.

Would it make sense to convert this whole thing to just:

  test_lazy_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW '
p4 configure show run.move.allow out 
egrep ^run.move.allow: out
  '

?

-Peff
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] git-p4: prevent --chain-lint failure

[Luke Diamand]

t9814 has a test that simply sets up a pre-requisite for
another test, and as such, always succeeds. The way it was
written doesn't quite work with the test lint checks introduced
with the --chain-lint option.

Add an additional layer of {} to prevent the --chain-lint
code getting confused.

Signed-off-by: Luke Diamand l...@diamand.org
---
 t/t9814-git-p4-rename.sh | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 99bb71b..14f9dc3 100755
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4-rename.sh
@@ -227,13 +227,15 @@ 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
+{
+   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
+}
 '
 
 # If move can be disabled, turn it off and test p4 move handling
-- 
2.3.4.48.g223ab37

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html