Fail in reversed-range-endpoints test after egrep and fgrep go back to
shell scripts.  I seem that the program name doesn't remove correctly.

Norihiro
>From f937bbb04826b0fb36aaeb96d95e0ac2a7ac3e33 Mon Sep 17 00:00:00 2001
From: Norihiro Tanaka <[email protected]>
Date: Wed, 26 Mar 2014 23:06:30 +0900
Subject: [PATCH] tests: failure in reversed-range-endpoints test after egrep
 and fgrep go back to shell scripts

* tests/reversed-range-endpoints: Fix it.
---
 tests/reversed-range-endpoints | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/reversed-range-endpoints b/tests/reversed-range-endpoints
index a20f0a2..80a47d2 100755
--- a/tests/reversed-range-endpoints
+++ b/tests/reversed-range-endpoints
@@ -11,7 +11,7 @@ for prog in grep egrep 'grep -E'; do
   test $? = 2 || fail=1
 
   # Remove "$prog: " prefix from actual output.
-  sed 's/^[grep]*: //' out > k && mv k out
+  sed 's/^\([A-Za-z]:\)\{0,1\}[^: ]*: //' out > k && mv k out
 
   compare exp out || fail=1
 done
-- 
1.9.1

++ initial_cwd_=/home/staff/t/grep/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /home/staff/t/grep/tests gt-reversed-range-endpoints.XXXX
+++ case $# in
+++ destdir_=/home/staff/t/grep/tests
+++ template_=gt-reversed-range-endpoints.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
+++ d=/home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
+++ case $d in
+++ test -d /home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
++++ ls -dgo /home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
++++ tr S -
+++ perms='drwx------ 2 4096 Mar 26 23:13 
/home/staff/t/grep/tests/gt-reversed-range-endpoints.0486'
+++ case $perms in
+++ test 0 = 0
+++ echo /home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
+++ return
++ test_dir_=/home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
++ cd /home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
++ gl_init_sh_nl_='
'
++ IFS='        
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ../src
+ test 1 '!=' 0
+ path_dir_=../src
+ case $path_dir_ in
+ abs_path_dir_=/home/staff/t/grep/tests/../src
+ case $abs_path_dir_ in
+ 
PATH=/home/staff/t/grep/tests/../src:/home/staff/t/grep/src:/home/staff/bin:/opt/git/bin:/opt/java/bin:/opt/python/bin:/opt/perl/bin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+ create_exe_shims_ /home/staff/t/grep/tests/../src
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ fail=0
+ printf 'Invalid range end\n'
+ for prog in grep egrep ''\''grep -E'\'''
+ grep '[b-a]'
+ test 2 = 2
+ sed 's/^[grep]*: //' out
+ mv k out
+ compare exp out
+ compare_dev_null_ exp out
+ test 2 = 2
+ test xexp = x/dev/null
+ test xout = x/dev/null
+ return 2
+ case $? in
+ compare_ exp out
+ diff -u exp out
+ for prog in grep egrep ''\''grep -E'\'''
+ egrep '[b-a]'
+ test 2 = 2
+ sed 's/^[grep]*: //' out
+ mv k out
+ compare exp out
+ compare_dev_null_ exp out
+ test 2 = 2
+ test xexp = x/dev/null
+ test xout = x/dev/null
+ return 2
+ case $? in
+ compare_ exp out
+ diff -u exp out
--- exp 2014-03-26 23:13:28.000000000 +0900
+++ out 2014-03-26 23:13:28.000000000 +0900
@@ -1 +1 @@
-Invalid range end
+/home/staff/t/grep/tests/../src/grep: Invalid range end
+ fail=1
+ for prog in grep egrep ''\''grep -E'\'''
+ grep -E '[b-a]'
+ test 2 = 2
+ sed 's/^[grep]*: //' out
+ mv k out
+ compare exp out
+ compare_dev_null_ exp out
+ test 2 = 2
+ test xexp = x/dev/null
+ test xout = x/dev/null
+ return 2
+ case $? in
+ compare_ exp out
+ diff -u exp out
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /home/staff/t/grep/tests
+ chmod -R u+rwx /home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
+ rm -rf /home/staff/t/grep/tests/gt-reversed-range-endpoints.0486
+ exit 1

Reply via email to