Author: ngie
Date: Sat Feb 21 23:39:43 2015
New Revision: 279121
URL: https://svnweb.freebsd.org/changeset/base/279121
Log:
Disguising stderr from jls generally considered harmful
Undisguising it dumps out the following logspew:
jls: unknown parameter: allow
PR: 191019
Modified:
head/bin/pkill/tests/pgrep-j_test.sh
head/bin/pkill/tests/pkill-j_test.sh
Modified: head/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- head/bin/pkill/tests/pgrep-j_test.sh Sat Feb 21 23:21:40 2015
(r279120)
+++ head/bin/pkill/tests/pgrep-j_test.sh Sat Feb 21 23:39:43 2015
(r279121)
@@ -4,7 +4,7 @@
jail_name_to_jid()
{
local check_name="$1"
- jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e
's/.*=//g'
+ jls -j "$check_name" -s | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
}
base=pgrep_j_test
@@ -38,6 +38,7 @@ for i in `seq 1 10`; do
esac
sleep 0.1
done
+sleep 0.5
pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)"
pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
Modified: head/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- head/bin/pkill/tests/pkill-j_test.sh Sat Feb 21 23:21:40 2015
(r279120)
+++ head/bin/pkill/tests/pkill-j_test.sh Sat Feb 21 23:39:43 2015
(r279121)
@@ -4,7 +4,7 @@
jail_name_to_jid()
{
local check_name="$1"
- jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e
's/.*=//g'
+ jls -j "$check_name" -s | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
}
base=pkill_j_test
@@ -40,6 +40,7 @@ for i in `seq 1 10`; do
esac
sleep 0.1
done
+sleep 0.5
if pkill -f -j "$jid" $sleep && sleep 0.5 &&
! -f ${PWD}/${base}_1_1.pid &&
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
