diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-02-26 15:01:09 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-02-26 15:05:20 +0100 |
| commit | 23c3e9cc24c7b20b55e3fa67c4d1fd599abc6e1a (patch) | |
| tree | a2226527e125242bbca7ea8761580ed9003635e8 /tests/init.sh | |
| parent | 9894f828d474e73b81c3c7a33323a9ca0c9914c2 (diff) | |
| download | grep-23c3e9cc24c7b20b55e3fa67c4d1fd599abc6e1a.tar.gz | |
build: update submodule, bootstrap, tests/init.sh from gnulib
* gl/lib/regcomp.c.diff: Adjust.
* bootstrap: Update from gnulib.
* tests/init.sh: Update from gnulib.
Diffstat (limited to 'tests/init.sh')
| -rw-r--r-- | tests/init.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/init.sh b/tests/init.sh index 5985552a..ae867144 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -255,7 +255,10 @@ compare_dev_null_ () return 2 } -if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then +if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \ + && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then + # diff accepts the -u option and does not (like AIX 7 'diff') produce an + # extra space on column 1 of every content line. if test -z "$diff_out_"; then compare_ () { diff -u "$@"; } else |