Date: Fri, 25 Dec 2020 21:19:06 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d1c965f1436a - grep: tests: stop testing for a nonexistent version of grep Message-ID: <202012252119.0BPLJ64L075186@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d1c965f1436aae22127485370332555ec01b3a23 commit d1c965f1436aae22127485370332555ec01b3a23 Author: Kyle Evans <kevans@FreeBSD.org> AuthorDate: 2020-12-22 21:39:12 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2020-12-25 21:16:33 +0000 grep: tests: stop testing for a nonexistent version of grep Differential Revision: https://reviews.freebsd.org/D27732 --- usr.bin/grep/tests/grep_freebsd_test.sh | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index 52455cd1d653..0d068d5d1c65 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -28,12 +28,9 @@ # What grep(1) are we working with? # - 0 : bsdgrep -# - 1 : gnu grep 2.51 (base) -# - 2 : gnu grep (ports) +# - 1 : gnu grep (ports) GREP_TYPE_BSD=0 -GREP_TYPE_GNU_FREEBSD=1 -GREP_TYPE_GNU=2 -GREP_TYPE_UNKNOWN=3 +GREP_TYPE_GNU=1 grep_type() { @@ -44,14 +41,7 @@ grep_type() return $GREP_TYPE_BSD ;; *"GNU grep"*) - case "$grep_version" in - *2.5.1-FreeBSD*) - return $GREP_TYPE_GNU_FREEBSD - ;; - *) - return $GREP_TYPE_GNU - ;; - esac + return $GREP_TYPE_GNU ;; esac atf_fail "unknown grep type: $grep_version" @@ -87,9 +77,6 @@ gnuext_body() { grep_type _type=$? - if [ $_type -eq $GREP_TYPE_GNU_FREEBSD ]; then - atf_expect_fail "\\s and \\S are known to be buggy in base gnugrep" - fi atf_check -o save:grep_alnum.out grep -o '[[:alnum:]]' /COPYRIGHT atf_check -o file:grep_alnum.out grep -o '\w' /COPYRIGHT
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012252119.0BPLJ64L075186>