From nobody Tue Apr 18 17:15:08 2023 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 4Q19XY3ZwHz45Mx1; Tue, 18 Apr 2023 17:15:09 +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 4Q19XX5rV2z3qTb; Tue, 18 Apr 2023 17:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681838108; 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=H4vDwlXOnSkFmuNV88sjPOf79OcsZGeya2xZ6a9C54U=; b=VxCdPZisHQoMexqfXb6L5dibQZFXPYxPJ+WaEgBsanWVwAI1Eosqr0VbV1EQXA0E1EsCgd tA/rMYkRhxeZmrcAFRuxIgThucaDhOFs/qDtx36w+keL6m6xgqRShZNeNDAU+nV+dIafQF /UfVcIu6WOsiknX2cEu8tXSqGqXsKKR9thiTZgFMNWMq0NjHsjhqPg2tCQD7v5cqeDPUo/ b+OU8rFSJ8zn0X8fxybjZmb80/Ok4RIgOzkTE86hhndlXNu6h29jT/N3AuxennpKjfw/pn Pr8OZUp7nVbW5/qnfVZreGlwScinlQTpxoZBXXkUxMpq9HJGHelc/nl5g7JJuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681838108; 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=H4vDwlXOnSkFmuNV88sjPOf79OcsZGeya2xZ6a9C54U=; b=HTD5TA71ckeTi+Kh61znDB2ZLD6G4oqTGyz37rxbv2GpzKPU+XcATxJJtXCDcsZ3P0tU3A ItOoDM1TVXSi3LvOqBQQGaNEgTCPeSAxUZH+rkSre8AbMR53Vi5VWvINvWVXmyMyPQ8f6M lqHUYZku4LjebeaVsAm6DUHHLUKA5q9KHzTXBB4uKcjazkoCPLo33OdCtNBToYqHy0Mz+0 e9aDbQAPQU3PZuocJFPFzm+yEbCtzr2e6aCTwltLtDyd/Kq5eyi2SMe9XC2NAh+VzGZA8t x5TDA/d+thhnvXdCVGzmfnE9j3fpGbVk68fcxwNxvTa63xeJQw24glKJ/VaJGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681838108; a=rsa-sha256; cv=none; b=b5ZkUA+BDQ9uhbetBg66EC5yq9gxpoRaHf+8ujJ8HlydnVub0RgYEwwsqNdf3eQqm5/0O5 R65oK0gwVuUe3Jb65OnQ7rSAO/QC0hnlng7TjghaBfNvXQeHSH47yKsjQNzziCbJ3K/j9Z iPjH+XhUURaFsd9QwUT7JcLy+qVPijV7rfU8strERu7gFIMx9t/ALTkmTmNgmRrl2mzd9x jVWxmV/5aW78CVJC2F69Ze21MTL5YGk2+ew+viXiyb5Y35A+nCJqkfrSDs2VGIbxOtLSpo MZ7IugMoqmYcHPfHJN+gB1abgVtahsRQdsIyyx5Xjwiyp6fSTbFjPrDHkgN7Dg== 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 4Q19XX4wcxzL40; Tue, 18 Apr 2023 17:15:08 +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 33IHF86b093473; Tue, 18 Apr 2023 17:15:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IHF8f8093472; Tue, 18 Apr 2023 17:15:08 GMT (envelope-from git) Date: Tue, 18 Apr 2023 17:15:08 GMT Message-Id: <202304181715.33IHF8f8093472@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: 1bc6dcc287fa - main - renice: Factor out common code in 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: 1bc6dcc287fa80af74768c4e2b2a1d7511ba1729 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc6dcc287fa80af74768c4e2b2a1d7511ba1729 commit 1bc6dcc287fa80af74768c4e2b2a1d7511ba1729 Author: Dag-Erling Smørgrav AuthorDate: 2023-04-18 17:14:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-04-18 17:14:25 +0000 renice: Factor out common code in tests. Furthermore, prefer test -eq (which ignores whitespace) over a strict string equality test when comparing numerical values. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D39650 --- usr.bin/renice/tests/renice_test.sh | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/usr.bin/renice/tests/renice_test.sh b/usr.bin/renice/tests/renice_test.sh index 79286a0f86bd..8a4df7879ad4 100755 --- a/usr.bin/renice/tests/renice_test.sh +++ b/usr.bin/renice/tests/renice_test.sh @@ -12,6 +12,12 @@ _renice() { atf_check -o empty -e ignore -s exit:0 renice "$@" } +atf_check_nice_value() { + local pid=$1 + local nice=$2 + atf_check test "$(ps -o nice= -p $pid)" -eq "$nice" +} + atf_test_case renice_abs_pid renice_abs_pid_head() { atf_set "descr" "Set a process's nice number to an absolute value" @@ -23,7 +29,7 @@ renice_abs_pid_body() { nice="$(ps -o nice= -p $pid)" incr=3 _renice $((nice+incr)) $pid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) kill $pid } @@ -40,7 +46,7 @@ renice_rel_pid_body() { _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)" + atf_check_nice_value $pid $((nice+incr+incr+incr)) kill $pid } @@ -56,7 +62,7 @@ renice_abs_pgid_body() { nice="$(ps -o nice= -p $pid)" incr=3 _renice $((nice+incr)) -g $pgid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) kill $pid } @@ -73,7 +79,7 @@ renice_rel_pgid_body() { incr=3 _renice -g -n $incr $pgid _renice -n $incr -g $pgid - atf_check_equal $((nice+incr+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr+incr)) kill $pid } @@ -88,7 +94,7 @@ renice_abs_user_body() { nice="$(ps -o nice= -p $pid)" incr=3 _renice $((nice+incr)) -u $TEST_USER - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) kill $pid } @@ -104,7 +110,7 @@ renice_rel_user_body() { 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)" + atf_check_nice_value $pid $((nice+incr+incr)) kill $pid } @@ -121,29 +127,29 @@ renice_delim_body() { # without -p : $((incr=incr+1)) _renice -- $((nice+incr)) $pid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) : $((incr=incr+1)) _renice $((nice+incr)) -- $pid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) : $((incr=incr+1)) _renice $((nice+incr)) $pid -- - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) # with -p : $((incr=incr+1)) _renice -p -- $((nice+incr)) $pid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) : $((incr=incr+1)) _renice -p $((nice+incr)) -- $pid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) : $((incr=incr+1)) _renice -p $((nice+incr)) $pid -- - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) : $((incr=incr+1)) _renice $((nice+incr)) -p -- $pid - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) : $((incr=incr+1)) _renice $((nice+incr)) -p $pid -- - atf_check_equal $((nice+incr)) "$(ps -o nice= -p $pid)" + atf_check_nice_value $pid $((nice+incr)) kill $pid }