diff mbox series

t7508: avoid non POSIX BRE

Message ID 20210801215300.53781-1-carenas@gmail.com (mailing list archive)
State Accepted
Commit 87e2b70ba1639a77d15bda6808857f47ff5554c0
Headers show
Series t7508: avoid non POSIX BRE | expand

Commit Message

Carlo Marcelo Arenas Belón Aug. 1, 2021, 9:53 p.m. UTC
24c30e0b6 (wt-status: tolerate dangling marks, 2020-09-01) adds a test
that uses a BRE which breaks at least with OpenBSD's grep.

switch to an ERE as it is done for similar checks and while at it, remove
the now obsolete test_i18ngrep call.

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 t/t7508-status.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Junio C Hamano Aug. 2, 2021, 2:37 a.m. UTC | #1
Carlo Marcelo Arenas Belón  <carenas@gmail.com> writes:

> 24c30e0b6 (wt-status: tolerate dangling marks, 2020-09-01) adds a test
> that uses a BRE which breaks at least with OpenBSD's grep.
>
> switch to an ERE as it is done for similar checks and while at it, remove
> the now obsolete test_i18ngrep call.

Thanks, obviously correct.

I wonder if we can more automate detection of such a bug---it is
unfortunate that it has become very hard to avoid GNUisms as
everybody, even Windows folks, is more likely to be with GNU tools
than BSD tools X-<.

>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> ---
>  t/t7508-status.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t7508-status.sh b/t/t7508-status.sh
> index 2b72451ba3..05c6c02435 100755
> --- a/t/t7508-status.sh
> +++ b/t/t7508-status.sh
> @@ -882,7 +882,7 @@ test_expect_success 'status shows detached HEAD properly after checking out non-
>  	git clone upstream downstream &&
>  	git -C downstream checkout @{u} &&
>  	git -C downstream status >actual &&
> -	test_i18ngrep "HEAD detached at [0-9a-f]\\+" actual
> +	grep -E "HEAD detached at [0-9a-f]+" actual
>  '
>  
>  test_expect_success 'setup status submodule summary' '
diff mbox series

Patch

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 2b72451ba3..05c6c02435 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -882,7 +882,7 @@  test_expect_success 'status shows detached HEAD properly after checking out non-
 	git clone upstream downstream &&
 	git -C downstream checkout @{u} &&
 	git -C downstream status >actual &&
-	test_i18ngrep "HEAD detached at [0-9a-f]\\+" actual
+	grep -E "HEAD detached at [0-9a-f]+" actual
 '
 
 test_expect_success 'setup status submodule summary' '