Re: [PATCH] Kill bashizm in t/t3200-branch.sh and t/t7201-co.sh.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Adam Golebiowski <adamg@xxxxxxxxxxxxx> writes:

> On systems with /bin/sh being different than /bin/bash, make test fails due
> to some bash-specific constructs. This patch makes it possible to run the
> test-suite systems with on /bin/sh pointing to /bin/ksh.
>
> Signed-off-by: Adam Golebiowski <adamg@xxxxxxxxxxxxx>
> ---
>  t/t3200-branch.sh |    2 +-
>  t/t7201-co.sh     |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index cb5f7a4..e8ff82f 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -200,7 +200,7 @@ test_expect_success \
>  
>  test_expect_success \
>      'branch from non-branch HEAD w/--track causes failure' \
> -    '!(git branch --track my10 HEAD^)'
> +    '! git branch --track my10 HEAD^'

I do not think you need a subshell for this particular test, so your
change would not be making anything worse, but I do not see a point.

It is a plain vanilla POSIX shell construct; "! ( compound_list )" is not a
bash-ism at all.

http://www.opengroup.org/onlinepubs/000095399/utilities/xcu_chap02.html#tag_02_10

> diff --git a/t/t7201-co.sh b/t/t7201-co.sh
> index 3111baa..51a9928 100755
> --- a/t/t7201-co.sh
> +++ b/t/t7201-co.sh
> @@ -335,6 +335,6 @@ test_expect_success \
>      git checkout -b delete-me master &&
>      rm .git/refs/heads/delete-me &&
>      test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
> -    !(git checkout --track -b track)'
> +    ! git checkout --track -b track'

Same comments apply.

Having said that, as both of these tests are trying to make sure that the
command fails gracefully (iow, say "failure" and refuse, instead of
barfing and dumping core), they could probably use test_must_fail, like
this:

     git checkout -b delete-me master &&
     rm .git/refs/heads/delete-me &&
     test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-    !(git checkout --track -b track)'
+    test_must_fail git checkout --track -b track'

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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux