From nobody Thu Aug 25 20:07:33 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MDDXP52Qkz4ZPJW; Thu, 25 Aug 2022 20:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MDDXP1kh6z3jlC; Thu, 25 Aug 2022 20:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661458053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZOnTBELoHcTQDhlxVNPdr4R7wJKBZJBFXe6rs0UYXZg=; b=XZn91snKE5dO5uCs7/EEbZZ+P/QTRSKOmb08XA+fK6Rn+IjTOKEL0Jfh8LEkacSeFKKrnr o+Syf7Wilz4ie7dJH8lIJYxwqsYyZa4nFR+y/z3eGaOzbLcs3QQ160yjDdhW4u5zc3sVXo ORJNGXIcKX8qtHfJZbDIRB0cCD9TFTcYJtGuQXY5im3B3YdI4/DK91moPwlWubUobDxV+h 2cBEzb2CGJAXTIHnpqlhR7hFI7qVu3UcYuTBGdbcd/Ip0JHULpJeStt885qMcpsPZ2XSNH QZeWpKntYlYZoTkKUwJSt9vMKrv/SO+yg6JbSX23ds2Wjrrsksrrsaw8cm8UBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MDDXP0qQxz10sf; Thu, 25 Aug 2022 20:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PK7Xpj059427; Thu, 25 Aug 2022 20:07:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PK7XIS059426; Thu, 25 Aug 2022 20:07:33 GMT (envelope-from git) Date: Thu, 25 Aug 2022 20:07:33 GMT Message-Id: <202208252007.27PK7XIS059426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 7ccdad905f30 - main - renice: add unit tests. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ccdad905f30e90606e11104d46e39c9a6405279 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661458053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZOnTBELoHcTQDhlxVNPdr4R7wJKBZJBFXe6rs0UYXZg=; b=iCGwhIe3y5OAeuC3xnV2Z4hs13oEyrjmELpGIMr1mcdc6tsBvmYmcV2X9iO4gRxVcfsByW ViCmgrtpzPcwFezRGrs4QRp5LTePRJ8x2l23Sx9r1HKAXO8JPU8Vr/xhma6T87cPc/JfQ2 UZlMXQNFPEXgMteCLFu1N74yyzkrmloUzuE/np7f3ipUt8yVe/S38a+L9hdTs35oRUo9sf Jfie/Oc5rOrjDyvjnETEr/G6+MenoJu+5d+DlLOx7ip9JkCJrhLNpYVn9jdctNRe3H3pMp 5nS7prGw2UnYMtrPKAoRLEkMNY6pxamqxBY/PD5pDPfY6ptjBrqUx9rQB6mWYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661458053; a=rsa-sha256; cv=none; b=YApWkVSt2XZv1BVhGIaeNl8dZ98XXtUqsEwtWtfOHvsi+hoJgtypSOtpVvprtGpjJG/G2v nadvsnNaPxahMcHHmQ8iB5X9SOhpmPlAXxnIgJsHoo0gaHhP2m23k/D9S4DxL7B9y9n5UE BwsU6UHSi/Rv3dq1Wxk9D5l1curCsZt+pWLUxcyjBZDlKr4NnlkCOR7YswRmAWjsWADTqk 853JrJ2XIuqOK2EGmXh5pJwHLaN4BgK+IlkRAfOhyJqND7qSM/m2CKl30byfgA0k5dIPLh tuRezFbe86AWVW27+L0pX2cIhp0D+7D2KufpxnPLnnmuEq6yryXZy5GR7XkBjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7ccdad905f30e90606e11104d46e39c9a6405279 commit 7ccdad905f30e90606e11104d46e39c9a6405279 Author: Dag-Erling Smørgrav AuthorDate: 2022-08-25 19:49:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-08-25 20:06:20 +0000 renice: add unit tests. Sponsored by: Klara, Inc. --- etc/mtree/BSD.tests.dist | 2 + usr.bin/renice/Makefile | 5 ++ usr.bin/renice/tests/Makefile | 3 + usr.bin/renice/tests/renice_test.sh | 169 ++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 19b0ccc25936..394b2ec90dcd 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1070,6 +1070,8 @@ .. procstat .. + renice + .. rs .. sdiff diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile index d5471379fe1e..8baf6936d7bc 100644 --- a/usr.bin/renice/Makefile +++ b/usr.bin/renice/Makefile @@ -1,7 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 # $FreeBSD$ +.include + PROG= renice MAN= renice.8 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.bin/renice/tests/Makefile b/usr.bin/renice/tests/Makefile new file mode 100644 index 000000000000..c252e396811c --- /dev/null +++ b/usr.bin/renice/tests/Makefile @@ -0,0 +1,3 @@ +ATF_TESTS_SH+= renice_test + +.include diff --git a/usr.bin/renice/tests/renice_test.sh b/usr.bin/renice/tests/renice_test.sh new file mode 100644 index 000000000000..323fe44591c8 --- /dev/null +++ b/usr.bin/renice/tests/renice_test.sh @@ -0,0 +1,169 @@ +#!/bin/sh +#- +# Copyright (c) 2022 Klara, Inc. +# All rights reserved. +# +# 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. +# + +# Name of user to use for -u tests when running as root. Beware that +# processes owned by that user will be affected by the test. +TEST_USER=nobody + +_renice() { + atf_check -o empty -e ignore -s exit:0 renice "$@" +} + +# Set a process's nice number to an absolute value +atf_test_case renice_abs_pid +renice_abs_pid_body() { + local pid nice incr + sleep 60 & + pid=$! + nice="$(ps -o nice= -p $pid)" + incr=3 + _renice $((nice+incr)) $pid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +# Change a process's nice number by a relative value +atf_test_case renice_rel_pid +renice_rel_pid_body() { + local pid nice incr + sleep 60 & + pid=$! + nice="$(ps -o nice= -p $pid)" + incr=3 + _renice -n $incr $pid + _renice -p -n $incr $pid + _renice -n $incr -p $pid + atf_check_equal $((nice+incr+incr+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +# Set a process group's nice number to an absolute value +atf_test_case renice_abs_pgid +renice_abs_pgid_body() { + local pid pgid nice incr + # make sure target runs in a different pgrp than ours + pid=$(sh -mc "sleep 60 >/dev/null & echo \$!") + pgid="$(ps -o pgid= -p $pid)" + nice="$(ps -o nice= -p $pid)" + incr=3 + _renice $((nice+incr)) -g $pgid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +# Change a process group's nice number by a relative value +atf_test_case renice_rel_pgid +renice_rel_pgid_body() { + local pid pgid nice incr + # make sure target runs in a different pgrp than ours + pid=$(sh -mc "sleep 60 >/dev/null & echo \$!") + pgid="$(ps -o pgid= -p $pid)" + nice="$(ps -o nice= -p $pid)" + incr=3 + _renice -g -n $incr $pgid + _renice -n $incr -g $pgid + atf_check_equal $((nice+incr+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +# Set a user's processes' nice numbers to an absolute value +atf_test_case renice_abs_user +renice_abs_user_head() { + atf_set "require.user" "root" +} +renice_abs_user_body() { + local user pid nice incr + pid=$(su -m $TEST_USER -c "sleep 60 >/dev/null & echo \$!") + nice="$(ps -o nice= -p $pid)" + incr=3 + _renice $((nice+incr)) -u $TEST_USER + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +# Change a user's processes' nice numbers by a relative value +atf_test_case renice_rel_user +renice_rel_user_head() { + atf_set "require.user" "root" +} +renice_rel_user_body() { + local user pid nice incr + pid=$(su -m $TEST_USER -c "sleep 60 >/dev/null & echo \$!") + nice="$(ps -o nice= -p $pid)" + incr=3 + _renice -u -n $incr $TEST_USER + _renice -n $incr -u $TEST_USER + atf_check_equal $((nice+incr+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +# Test various delimiter positions +atf_test_case renice_delim +renice_delim_body() { + local pid nice incr + sleep 60 & + pid=$! + nice="$(ps -o nice= -p $pid)" + incr=0 + # without -p + : $((incr=incr+1)) + _renice -- $((nice+incr)) $pid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + : $((incr=incr+1)) + _renice $((nice+incr)) -- $pid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + : $((incr=incr+1)) + _renice $((nice+incr)) $pid -- + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + # with -p + : $((incr=incr+1)) + _renice -p -- $((nice+incr)) $pid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + : $((incr=incr+1)) + _renice -p $((nice+incr)) -- $pid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + : $((incr=incr+1)) + _renice -p $((nice+incr)) $pid -- + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + : $((incr=incr+1)) + _renice $((nice+incr)) -p -- $pid + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + : $((incr=incr+1)) + _renice $((nice+incr)) -p $pid -- + atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + kill $pid +} + +atf_init_test_cases() { + atf_add_test_case renice_abs_pid + atf_add_test_case renice_rel_pid + atf_add_test_case renice_abs_pgid + atf_add_test_case renice_rel_pgid + atf_add_test_case renice_abs_user + atf_add_test_case renice_rel_user + atf_add_test_case renice_delim +}