summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authorAlexander Pyhalov <apyhalov@gmail.com>2017-12-19 08:48:38 +0300
committerDan McDonald <danmcd@joyent.com>2018-01-09 14:12:32 -0500
commitd2d52addd50254d1b7c318c6784172d8d7de20c6 (patch)
tree0c378517379e7cd6076434359ca24fc303fbb66b /usr/src/lib
parentda61ddb06d5ac64f86b2dfb126769267c1ebcd67 (diff)
downloadillumos-joyent-d2d52addd50254d1b7c318c6784172d8d7de20c6.tar.gz
8858 /usr/bin/grep doesn't support -E option
4580 /usr/bin/grep can't handle multibyte characters 8929 8868 tests are not delivered with system/test/utiltest 8860 Example in grep(1) is incorrect Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libsaveargs/tests/functional/test.sh2
-rw-r--r--usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh2
-rw-r--r--usr/src/lib/libshell/misc/shell_styleguide.docbook6
3 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/lib/libsaveargs/tests/functional/test.sh b/usr/src/lib/libsaveargs/tests/functional/test.sh
index dea1059b2c..e4a8e2688a 100644
--- a/usr/src/lib/libsaveargs/tests/functional/test.sh
+++ b/usr/src/lib/libsaveargs/tests/functional/test.sh
@@ -20,7 +20,7 @@ function tester {
./$prog >/dev/null &
pid=$!
- if (/usr/bin/amd64/pstack $pid | /usr/xpg4/bin/grep -q "${pattern}"); then
+ if (/usr/bin/amd64/pstack $pid | /usr/bin/grep -q "${pattern}"); then
echo "pass: ${prog}"
else
echo "FAIL: ${prog}"
diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh
index f302f6379e..93e559c0a7 100644
--- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh
+++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh
@@ -172,7 +172,7 @@ out="$(unset VMALLOC_OPTIONS VMDEBUG ; cat_test | ${SHELL} 2>&1)" || err_exit "U
[[ "${out}" != "" ]] || err_exit "No output from test"
# filter output and check it
-out2="$(/usr/xpg4/bin/egrep -v '^((read-seq|read-rand|syncread-seq|syncread-seq)[[:space:][:blank:]]*)*$' <<<"${out}")"
+out2="$(/usr/bin/egrep -v '^((read-seq|read-rand|syncread-seq|syncread-seq)[[:space:][:blank:]]*)*$' <<<"${out}")"
[[ "${out2}" == "" ]] || err_exit "Unexpected output '${out2}'"
diff --git a/usr/src/lib/libshell/misc/shell_styleguide.docbook b/usr/src/lib/libshell/misc/shell_styleguide.docbook
index 0376912d1f..74bc7501b5 100644
--- a/usr/src/lib/libshell/misc/shell_styleguide.docbook
+++ b/usr/src/lib/libshell/misc/shell_styleguide.docbook
@@ -352,9 +352,9 @@ done
At least
<simplelist type="inline">
<member>print</member>
- <member>/usr/bin/fgrep</member><member>/usr/xpg4/bin/fgrep</member>
- <member>/usr/bin/grep</member> <member>/usr/xpg4/bin/grep</member>
- <member>/usr/bin/egrep</member><member>/usr/xpg4/bin/egrep</member>
+ <member>/usr/bin/fgrep</member>
+ <member>/usr/bin/grep</member>
+ <member>/usr/bin/egrep</member>
</simplelist>
support <literal>--</literal> as "end of arguments"-terminator.
</para></note>