diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-02-21 23:39:43 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-02-21 23:39:43 +0000 |
| commit | 7a2065efd74f926db87a2447a9a9ebb01b23ff40 (patch) | |
| tree | a2df170b664d3124702e6ece7f111b4a1f45d4cb /bin/pkill | |
| parent | c6014c739cb8aed9d2c98c6e61035a41e117fbe5 (diff) | |
| download | src-7a2065efd74f926db87a2447a9a9ebb01b23ff40.tar.gz src-7a2065efd74f926db87a2447a9a9ebb01b23ff40.zip | |
Notes
Diffstat (limited to 'bin/pkill')
| -rw-r--r-- | bin/pkill/tests/pgrep-j_test.sh | 3 | ||||
| -rw-r--r-- | bin/pkill/tests/pkill-j_test.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/pkill/tests/pgrep-j_test.sh b/bin/pkill/tests/pgrep-j_test.sh index 4830ace39aa9..e24e5c2ff5fe 100644 --- a/bin/pkill/tests/pgrep-j_test.sh +++ b/bin/pkill/tests/pgrep-j_test.sh @@ -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)" \ diff --git a/bin/pkill/tests/pkill-j_test.sh b/bin/pkill/tests/pkill-j_test.sh index 5635df35882c..26e185fc8988 100644 --- a/bin/pkill/tests/pkill-j_test.sh +++ b/bin/pkill/tests/pkill-j_test.sh @@ -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 && |