From dd76c272b8a4c1a2c966c03f732f0344f9a18e21 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 9 Nov 2015 01:05:31 +0000 Subject: [PATCH] Add some basic tests that exercise cputime limits with limits(1) MFC after: 1 week Sponsored by: EMC / Isilon Storage Division --- etc/mtree/BSD.tests.dist | 2 + usr.bin/limits/Makefile | 6 +++ usr.bin/limits/tests/Makefile | 5 +++ usr.bin/limits/tests/limits_test.sh | 65 +++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 usr.bin/limits/tests/Makefile create mode 100755 usr.bin/limits/tests/limits_test.sh diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8cdc2fc2345a..c0cd8b87bd94 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -554,6 +554,8 @@ .. lastcomm .. + limits + .. m4 .. mkimg diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile index 13ea5970cf2b..9b5f8476fd6d 100644 --- a/usr.bin/limits/Makefile +++ b/usr.bin/limits/Makefile @@ -1,6 +1,12 @@ # $FreeBSD$ +.include + PROG= limits LIBADD= util +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/usr.bin/limits/tests/Makefile b/usr.bin/limits/tests/Makefile new file mode 100644 index 000000000000..54bf8921a27f --- /dev/null +++ b/usr.bin/limits/tests/Makefile @@ -0,0 +1,5 @@ +# $FreeBSD$ + +ATF_TESTS_SH+= limits_test + +.include diff --git a/usr.bin/limits/tests/limits_test.sh b/usr.bin/limits/tests/limits_test.sh new file mode 100755 index 000000000000..63f60e8eedf5 --- /dev/null +++ b/usr.bin/limits/tests/limits_test.sh @@ -0,0 +1,65 @@ +# +# Copyright 2015 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * 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 COPYRIGHT HOLDERS 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 COPYRIGHT +# OWNER 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$ +# + +# Make sure time(1) is consistent with the FreeBSD time command and not the +# shell interpretation of time(1) +TIME=/usr/bin/time + +atf_test_case cputime_hard_flag +cputime_hard_flag_body() +{ + + atf_check -e empty -o match:'cputime[[:space:]]+3 secs' -s exit:0 \ + limits -H -t 3 limits -H + atf_check -e empty -o match:'cputime[[:space:]]+3 secs' -s exit:0 \ + limits -H -t 3 limits -S + atf_check -e match:'real[[:space:]]+[34]\.[0-9][0-9]' -o empty -s signal:sigkill \ + limits -H -t 3 $TIME -p sh -c 'while : ; do : ; done' +} + +SIGXCPU=24 # atf_check doesn't know sigxcpu + +atf_test_case cputime_soft_flag +cputime_soft_flag_body() +{ + + atf_check -e empty -o match:'cputime-max[[:space:]]+infinity secs' -s exit:0 \ + limits -S -t 3 limits -H + atf_check -e empty -o match:'cputime-cur[[:space:]]+3 secs' -s exit:0 \ + limits -S -t 3 limits -S + atf_check -e match:'real[[:space:]]+[34]\.[0-9][0-9]' -o empty -s signal:$SIGXCPU \ + limits -S -t 3 $TIME -p sh -c 'while : ; do : ; done' +} + +atf_init_test_cases() +{ + + atf_add_test_case cputime_hard_flag + atf_add_test_case cputime_soft_flag +}