[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v3.5-6-ga588951
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v3.5-6-ga588951 |
|
Date: |
Mon, 5 Oct 2020 03:49:36 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via a588951ee04a4e8924e98c350f44586c1869f19d (commit)
via a0bc7ca891ec1b022375b634d743a6c9a09b81c3 (commit)
from 3320f8db4c7205e213dac6bc8b11ecca9de58ac0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a588951ee04a4e8924e98c350f44586c1869f19d
commit a588951ee04a4e8924e98c350f44586c1869f19d
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon Oct 5 00:26:51 2020 -0700
tests: fix tests when PCRE is not used
* tests/Makefile.am (TESTS_ENVIRONMENT):
Set PATH before setting PCRE_WORKS, so that the latter test
uses the just-built grep.
* tests/filename-lineno.pl (invalid-re-P-paren)
(invalid-re-P-star-paren): Adjust non-PCRE case to match
recently-changed behavior.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 034bd0c..cc55c7e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -224,11 +224,6 @@ TESTS_ENVIRONMENT = \
}; \
fi; \
\
- : 'set this envvar to indicate whether -P works'; \
- m=0; if err=`echo .|grep -Pq . 2>&1`; then \
- test -z "$$err" && m=1; fi; \
- export PCRE_WORKS=$$m; \
- \
: 'Test egrep/fgrep help if they use our grep.'; \
grep=`echo grep | sed -e '$(transform)'` || exit; \
if test "$$grep" = grep; then \
@@ -260,7 +255,13 @@ TESTS_ENVIRONMENT = \
PERL='$(PERL)' \
SHELL='$(SHELL)' \
PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \
- ; 9>&2
+ ; \
+ \
+ : 'set this envvar to indicate whether -P works'; \
+ m=0; if err=`echo .|grep -Pq . 2>&1`; then \
+ test -z "$$err" && m=1; fi; \
+ export PCRE_WORKS=$$m; \
+ 9>&2
LOG_COMPILER = $(SHELL)
diff --git a/tests/filename-lineno.pl b/tests/filename-lineno.pl
index 82b48cd..98780d6 100755
--- a/tests/filename-lineno.pl
+++ b/tests/filename-lineno.pl
@@ -100,13 +100,13 @@ my @Tests =
['invalid-re-P-paren', '-P ")"', {EXIT=>2},
{ERR => $ENV{PCRE_WORKS} == 1
? "$prog: unmatched parentheses\n"
- : "Perl matching not supported in a --disable-perl-regexp build\n"
+ : "$prog: Perl matching not supported in a --disable-perl-regexp
build\n"
},
],
['invalid-re-P-star-paren', '-P "a.*)"', {EXIT=>2},
{ERR => $ENV{PCRE_WORKS} == 1
- ? "$prog: unmatched parentheses\n"
- : "Perl matching not supported in a --disable-perl-regexp build\n"
+ ? "$prog: unmatched parentheses $ENV{PCRE_WORKS}\n"
+ : "$prog: Perl matching not supported in a --disable-perl-regexp
build\n"
},
],
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a0bc7ca891ec1b022375b634d743a6c9a09b81c3
commit a588951ee04a4e8924e98c350f44586c1869f19d
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon Oct 5 00:26:51 2020 -0700
tests: fix tests when PCRE is not used
* tests/Makefile.am (TESTS_ENVIRONMENT):
Set PATH before setting PCRE_WORKS, so that the latter test
uses the just-built grep.
* tests/filename-lineno.pl (invalid-re-P-paren)
(invalid-re-P-star-paren): Adjust non-PCRE case to match
recently-changed behavior.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 034bd0c..cc55c7e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -224,11 +224,6 @@ TESTS_ENVIRONMENT = \
}; \
fi; \
\
- : 'set this envvar to indicate whether -P works'; \
- m=0; if err=`echo .|grep -Pq . 2>&1`; then \
- test -z "$$err" && m=1; fi; \
- export PCRE_WORKS=$$m; \
- \
: 'Test egrep/fgrep help if they use our grep.'; \
grep=`echo grep | sed -e '$(transform)'` || exit; \
if test "$$grep" = grep; then \
@@ -260,7 +255,13 @@ TESTS_ENVIRONMENT = \
PERL='$(PERL)' \
SHELL='$(SHELL)' \
PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \
- ; 9>&2
+ ; \
+ \
+ : 'set this envvar to indicate whether -P works'; \
+ m=0; if err=`echo .|grep -Pq . 2>&1`; then \
+ test -z "$$err" && m=1; fi; \
+ export PCRE_WORKS=$$m; \
+ 9>&2
LOG_COMPILER = $(SHELL)
diff --git a/tests/filename-lineno.pl b/tests/filename-lineno.pl
index 82b48cd..98780d6 100755
--- a/tests/filename-lineno.pl
+++ b/tests/filename-lineno.pl
@@ -100,13 +100,13 @@ my @Tests =
['invalid-re-P-paren', '-P ")"', {EXIT=>2},
{ERR => $ENV{PCRE_WORKS} == 1
? "$prog: unmatched parentheses\n"
- : "Perl matching not supported in a --disable-perl-regexp build\n"
+ : "$prog: Perl matching not supported in a --disable-perl-regexp
build\n"
},
],
['invalid-re-P-star-paren', '-P "a.*)"', {EXIT=>2},
{ERR => $ENV{PCRE_WORKS} == 1
- ? "$prog: unmatched parentheses\n"
- : "Perl matching not supported in a --disable-perl-regexp build\n"
+ ? "$prog: unmatched parentheses $ENV{PCRE_WORKS}\n"
+ : "$prog: Perl matching not supported in a --disable-perl-regexp
build\n"
},
],
-----------------------------------------------------------------------
Summary of changes:
gnulib | 2 +-
tests/Makefile.am | 13 +++++++------
tests/filename-lineno.pl | 6 +++---
3 files changed, 11 insertions(+), 10 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v3.5-6-ga588951,
Paul Eggert <=