From 832ac79edf0e0e9108f5da5b10b496a227667f40 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 21 Jun 2010 12:37:13 -0500 Subject: [PATCH 1/3] t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression Regular expressions matched by 'expr' have an implicit '^' at the beginning of them and so are anchored to the beginning of the string. Using the '^' character to mean "match at the beginning", is redundant and could produce the wrong result if 'expr' implementations interpret the '^' as a literal '^'. Additionally, GNU expr 5.97 complains like this: expr: warning: unportable BRE: `^[a-z][a-z]*$': using `^' as the first character of the basic regular expression is not portable; it is being ignored Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- t/lib-pager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib-pager.sh b/t/lib-pager.sh index f8c6025876..ba03eab14f 100644 --- a/t/lib-pager.sh +++ b/t/lib-pager.sh @@ -9,7 +9,7 @@ test_expect_success 'determine default pager' ' test -n "$less" ' -if expr "$less" : '^[a-z][a-z]*$' >/dev/null +if expr "$less" : '[a-z][a-z]*$' >/dev/null then test_set_prereq SIMPLEPAGER fi From 6a1b3fc78311f16834d885e4e0baead8e51ed631 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 21 Jun 2010 12:37:14 -0500 Subject: [PATCH 2/3] t/t7811-grep-open.sh: ensure fake "less" is made executable The fake "less" script was not being made executable. This can cause the tests that follow to fail. This failure is not apparent on platforms which have DEFAULT_PAGER set to the string "less", since lib-pager.sh will have set the $less variable to "less" and the SIMPLEPAGER prerequisite will have been set, and so the "less" script will have already been created properly and made executable in test 2 'git grep -O'. On platforms which set DEFAULT_PAGER to something like "more", no such script will have been previously created, and tests 7 and 8 will fail. So, add a call to chmod to make the fake "less" script executable. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- t/t7811-grep-open.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh index 8db4fc8b10..2e5c701566 100755 --- a/t/t7811-grep-open.sh +++ b/t/t7811-grep-open.sh @@ -84,10 +84,11 @@ test_expect_success 'git grep -O --no-index' ' ' test_expect_success 'setup: fake "less"' ' - cat >less <<-\EOF + cat >less <<-\EOF && #!/bin/sh printf "%s\n" "$@" >actual EOF + chmod +x less ' test_expect_success 'git grep -O jumps to line in less' ' From 7f5329f46dd3221618124df70aee2391aef6305a Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 21 Jun 2010 12:37:15 -0500 Subject: [PATCH 3/3] t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script The fake "less" script was already created in a previous test titled 'setup: fake "less"', so it is redundant. Additionally, it is broken since the redirection of 'cat' is to a file named 'less', but the chmod operates on the file named by the $less variable which may not contain the value 'less'. So, just remove this code, and rely on the creation of the fake "less" script performed earlier within the test script. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- t/t7811-grep-open.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh index 2e5c701566..c110441344 100755 --- a/t/t7811-grep-open.sh +++ b/t/t7811-grep-open.sh @@ -109,11 +109,6 @@ test_expect_success 'git grep -O jumps to line in less' ' test_expect_success 'modified file' ' rm -f actual && - cat >less <<-\EOF && - #!/bin/sh - printf "%s\n" "$@" >actual - EOF - chmod +x $less && cat >expect <<-\EOF && +/*enum grep_pat_token grep.h