svn commit: r330332 - stable/11/bin/pkill/tests

[Eitan Adler]

Author: eadler
Date: Sat Mar  3 11:17:05 2018
New Revision: 330332
URL: https://svnweb.freebsd.org/changeset/base/330332

Log:
  MFC r307519,r307629:
  
  Increase timeout so low-end platforms have a chance to complete test
  procedures.
  
  This fixes operation in QEMU/MIPS64.

Modified:
  stable/11/bin/pkill/tests/pgrep-j_test.sh
  stable/11/bin/pkill/tests/pkill-j_test.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- stable/11/bin/pkill/tests/pgrep-j_test.sh	Sat Mar  3 11:12:09 2018	(r330331)
+++ stable/11/bin/pkill/tests/pgrep-j_test.sh	Sat Mar  3 11:17:05 2018	(r330332)
@@ -20,12 +20,13 @@ sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 
 name="pgrep -j <jid>"
-sleep_amount=5
+sleep_amount=15
 jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
 
 jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
+sleep 0.5
 
 for i in `seq 1 10`; do
 	jid1=$(jail_name_to_jid ${base}_1_1)
@@ -53,7 +54,7 @@ fi
 wait
 
 name="pgrep -j any"
-sleep_amount=6
+sleep_amount=16
 jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
 
@@ -74,7 +75,7 @@ fi
 wait
 
 name="pgrep -j none"
-sleep_amount=7
+sleep_amount=17
 daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount &
 jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
@@ -91,7 +92,7 @@ wait
 
 # test 4 is like test 1 except with jname instead of jid.
 name="pgrep -j <jname>"
-sleep_amount=8
+sleep_amount=18
 jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount &
 

Modified: stable/11/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- stable/11/bin/pkill/tests/pkill-j_test.sh	Sat Mar  3 11:12:09 2018	(r330331)
+++ stable/11/bin/pkill/tests/pkill-j_test.sh	Sat Mar  3 11:17:05 2018	(r330332)
@@ -20,7 +20,7 @@ sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 
 name="pkill -j <jid>"
-sleep_amount=5
+sleep_amount=15
 jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
 
@@ -54,7 +54,7 @@ fi 2>/dev/null
 wait
 
 name="pkill -j any"
-sleep_amount=6
+sleep_amount=16
 jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
 
@@ -76,7 +76,7 @@ fi 2>/dev/null
 wait
 
 name="pkill -j none"
-sleep_amount=7
+sleep_amount=17
 daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount
 jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
@@ -94,7 +94,7 @@ wait
 
 # test 4 is like test 1 except with jname instead of jid.
 name="pkill -j <jname>"
-sleep_amount=8
+sleep_amount=18
 jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \
     command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount &