grep branch, master, updated. v2.16-3-gc53ed7b

[Paul Eggert]

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  c53ed7be03da564fc45836048324ee184f4541f1 (commit)
      from  442ae29b4f9a69f8e747ab8f8cd9b95d847942a3 (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=c53ed7be03da564fc45836048324ee184f4541f1


commit c53ed7be03da564fc45836048324ee184f4541f1
Author: Paul Eggert <address@hidden>
Date:   Tue Jan 7 21:47:04 2014 -0800

    tests: port Solaris 10 /bin/sh patch back to GNU/Linux
    
    Problem reported by Jim Meyering.
    * tests/bre, tests/ere, tests/spencer1-locale:
    Prefer re_shell, not re_shell_.
    * tests/init.sh (re_shell): New var, which is exported instead of
    re_shell_.

diff --git a/tests/bre b/tests/bre
index 4a00af4..4c0eb13 100755
--- a/tests/bre
+++ b/tests/bre
@@ -16,6 +16,6 @@ fail=0
 ${AWK-awk} -f $abs_top_srcdir/tests/bre.awk $abs_top_srcdir/tests/bre.tests \
     > bre.script || fail=1
 
-${re_shell_-${SHELL-sh}} ./bre.script || fail=1
+${re_shell-${SHELL-sh}} ./bre.script || fail=1
 
 Exit $fail
diff --git a/tests/ere b/tests/ere
index 03aec36..6ad7982 100755
--- a/tests/ere
+++ b/tests/ere
@@ -16,6 +16,6 @@ fail=0
 ${AWK-awk} -f $abs_top_srcdir/tests/ere.awk $abs_top_srcdir/tests/ere.tests \
   > ere.script || fail=1
 
-${re_shell_-${SHELL-sh}} ere.script || fail=1
+${re_shell-${SHELL-sh}} ere.script || fail=1
 
 Exit $fail
diff --git a/tests/init.sh b/tests/init.sh
index e07c39c..fbd293d 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -201,7 +201,8 @@ else
       *x*) opts_=-x ;;
       *) opts_= ;;
     esac
-    export re_shell_
+    re_shell=$re_shell_
+    export re_shell
     exec "$re_shell_" $opts_ "$0" --no-reexec "$@"
     echo "$ME_: exec failed" 1>&2
     exit 127
diff --git a/tests/spencer1-locale b/tests/spencer1-locale
index 6484490..e8deeac 100755
--- a/tests/spencer1-locale
+++ b/tests/spencer1-locale
@@ -18,6 +18,6 @@ ${AWK-awk} -v extra_locale=$LOCALE_FR_UTF8 \
     -f "$abs_srcdir/spencer1-locale.awk" "$abs_srcdir/spencer1.tests" \
   > spencer1-locale.script || fail=1
 
-${re_shell_-${SHELL-sh}} spencer1-locale.script || fail=1
+${re_shell-${SHELL-sh}} spencer1-locale.script || fail=1
 
 Exit $fail

-----------------------------------------------------------------------

Summary of changes:
 tests/bre             |    2 +-
 tests/ere             |    2 +-
 tests/init.sh         |    3 ++-
 tests/spencer1-locale |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep