Virgin import of a trimmed down GNU Grep 2.4.

5 files changed, 20 insertions, 20 deletions

diff --git a/gnu/usr.bin/grep/tests/bre.awk b/gnu/usr.bin/grep/tests/bre.awk
index 3973071..9c9fef8 100644
--- a/gnu/usr.bin/grep/tests/bre.awk
+++ b/gnu/usr.bin/grep/tests/bre.awk
@@ -8,8 +8,8 @@ BEGIN {
 $0 ~ /^#/  { next; }
 
 NF == 3 {
-	printf ("echo '%s' | ${GREP} -e '%s' > /dev/null 2>&1\n",$3, $2);
-	printf ("if test $? -ne %s ; then\n", $1);
+	printf ("status=`echo '%s' | { ${GREP} -e '%s' > /dev/null 2>&1; echo $?; cat >/dev/null; }`\n",$3, $2);
+	printf ("if test $status -ne %s ; then\n", $1);
 	printf ("\techo Spencer bre test \\#%d failed\n", ++n);
 	printf ("\tfailures=1\n");
 	printf ("fi\n");
diff --git a/gnu/usr.bin/grep/tests/bre.tests b/gnu/usr.bin/grep/tests/bre.tests
index a896377..1ed159d 100644
--- a/gnu/usr.bin/grep/tests/bre.tests
+++ b/gnu/usr.bin/grep/tests/bre.tests
@@ -17,7 +17,7 @@
 2@\(\{1\}a\)@BADRPT@TO CORRECT
 0@^*@*
 2@^\{1\}@BADRPT@TO CORRECT
-2@\{@BADRPT
+0@\{@{
 1@a\(b*\)c\1d@abbcbd
 1@a\(b*\)c\1d@abbcbbbd
 1@^\(.\)\1@abc
@@ -46,7 +46,7 @@
 2@a\{,\}@BADBR
 2@a\{1,x\}@BADBR
 2@a\{1,x@EBRACE
-2@a\{300\}@BADBR@TO CORRECT
+2@a\{32768\}@BADBR
 2@a\{1,0\}@BADBR
 0@ab\{0,0\}c@abcac
 0@ab\{0,1\}c@abcac
diff --git a/gnu/usr.bin/grep/tests/ere.awk b/gnu/usr.bin/grep/tests/ere.awk
index c014fe9..8f6a5b5 100644
--- a/gnu/usr.bin/grep/tests/ere.awk
+++ b/gnu/usr.bin/grep/tests/ere.awk
@@ -8,8 +8,8 @@ BEGIN {
 $0 ~ /^#/  { next; }
 
 NF == 3 {
-	printf ("echo '%s' | ${GREP} -E -e '%s' > /dev/null 2>&1\n",$3, $2);
-	printf ("if test $? -ne %s ; then\n", $1);
+	printf ("status=`echo '%s' | { ${GREP} -E -e '%s' > /dev/null 2>&1; echo $?; cat >/dev/null; }`\n",$3, $2);
+	printf ("if test $status -ne %s ; then\n", $1);
 	printf ("\techo Spencer ere test \\#%d failed\n", ++n);
 	printf ("\tfailures=1\n");
 	printf ("fi\n");
diff --git a/gnu/usr.bin/grep/tests/ere.tests b/gnu/usr.bin/grep/tests/ere.tests
index 7d37c4e..20ef2b1 100644
--- a/gnu/usr.bin/grep/tests/ere.tests
+++ b/gnu/usr.bin/grep/tests/ere.tests
@@ -46,37 +46,37 @@
 0@a[bc]d@abd
 0@a\*c@a*c
 0@a\\b@a\b@TO CORRECT
-0@a\\\*b@a\*b
+0@a\\\*b@a\*b@SHELL TROUBLE
 0@a\bc@abc@TO CORRECT
-2@a\@EESCAPE
+2@a\@EESCAPE@SHELL TROUBLE
 0@a\\bc@a\bc@TO CORRECT
 0@a\[b@a[b
 2@a[b@EBRACK
 0@a$@a
 1@a$@a$
-1@a\$@a
-0@a\$@a$
+1@a\$@a@SHELL TROUBLE
+0@a\$@a$@SHELL TROUBLE
 1@a\\$@a
-1@a\\$@a$
-1@a\\$@a\$
-0@a\\$@a\
+1@a\\$@a$@SHELL TROUBLE
+1@a\\$@a\$@SHELL TROUBLE
+0@a\\$@a\@SHEL TROUBLE
 0@ab*c@abc
 0@ab+c@abc
 0@ab?c@abc
 0@{@{@TO CORRECT
 0@{abc@{abc@TO CORRECT
-2@{1@BADRPT
+0@{1@{1
 2@{1}@BADRPT@TO CORRECT
 0@a{b@a{b@TO CORRECT
 0@a{1}b@ab
 0@a{1,}b@ab
 0@a{1,2}b@aab
-2@a{1@EBRACE
-2@a{1a@EBRACE
-2@a{1a}@BADBR
+0@a{1@a{1
+1@a{1a@aa
+0@a{1a}@a{1a}
 0@a{,2}@a{,2}
 0@a{,}@a{,}
-2@a{1,x}@BADBR
+0@a{1,*}@a{1,,,}
 2@a{1,x@EBRACE@TO CORRECT
 2@a{300}@BADBR@TO CORRECT
 2@a{1,0}@BADBR@TO CORRECT
diff --git a/gnu/usr.bin/grep/tests/spencer1.awk b/gnu/usr.bin/grep/tests/spencer1.awk
index b66b8f5..70c6118 100644
--- a/gnu/usr.bin/grep/tests/spencer1.awk
+++ b/gnu/usr.bin/grep/tests/spencer1.awk
@@ -4,8 +4,8 @@ BEGIN {
 }
 
 $0 !~ /^#/  && NF = 3 {
-	printf ("echo '%s'|${GREP} -E -e '%s' > /dev/null 2>&1\n",$3, $2);
-	printf ("if test $? -ne %s ; then\n", $1);
+	printf ("status=`echo '%s'| { ${GREP} -E -e '%s' > /dev/null 2>&1; echo $?; cat >/dev/null; }`\n",$3, $2);
+	printf ("if test $status -ne %s ; then\n", $1);
 	printf ("\techo Spencer test \\#%d failed\n", ++n);
 	printf ("\tfailures=1\n");
 	printf ("fi\n");