Index: user/pho/stress2/misc/swap6.sh =================================================================== --- user/pho/stress2/misc/swap6.sh (revision 359741) +++ user/pho/stress2/misc/swap6.sh (revision 359742) @@ -1,53 +1,52 @@ #!/bin/sh # # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # # Copyright (c) 2020 Peter Holm # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ # Verify that the VM pressure generated is sufficient for stress testing. # Regression test for OOM fix in r357253 . ../default.cfg [ `sysctl -n vm.swap_total` -eq 0 ] && exit 0 min=5 # percent swap usage -(cd ../testcases/swap; ./swap -t 5m -i 20 -l 100 -h > /dev/null) & -sleep 5 +(cd ../testcases/swap; ./swap -t 10m -i 40 -l 100 -h > /dev/null) & mx=0 while pgrep -q swap; do n=`swapinfo | tail -1 | sed 's/.* //; s/%//'` [ $n -gt $mx ] && mx=$n [ $mx -ge $min ] && pkill swap - sleep 2 done wait if [ $mx -lt $min ]; then echo "FAIL Only $mx% swap used" exit 1 else + echo "$mx% swap used" exit 0 fi