From nobody Tue Apr 18 05:32:07 2023 X-Original-To: dev-commits-src-main@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 4Q0sxN3RFQz45m1W; Tue, 18 Apr 2023 05:32:08 +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 4Q0sxM2Y40z4JM0; Tue, 18 Apr 2023 05:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681795927; 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=QzQi2xYyXkpbiBsDK+mTue+llTNvsKp/XAXG0Zsgl+8=; b=N9nfZ+0sgbxzKKX4dxFkASAZnoYqifgVDA9DL6F53eLV7Vyli/6Di8lezMwOJJO1X/aM5F m8yRXYeiLEGRQ8SMd6QglwwAEXROkQZLupqvYAgXmK/nSkG7ef7mS7T5dkUN9C2fiTrHBo T+fLbGZ9r1gCkgmA7u0adOagj2eENAv3deo3Yqqv2BbzsGCzTe33UZPuUqBqQFvbDYamCh uAkL9riRGySnPH6S4lYtfuXzfaN0q4BLlWlKhE3RZH0zq3hoIP39QCNwWw9IqAHoWuSIfd tkKtx8yBSHFXTb/INxGjiZ1gc0Lg/si4CDfcbZ/I92ncjFfn2Pj2cdMZXIDvAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681795927; 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=QzQi2xYyXkpbiBsDK+mTue+llTNvsKp/XAXG0Zsgl+8=; b=RitwpyUHqf0r49uPgH3EM74nvywcVWe2MD20Rc2Av3idSl/GUFPzBhhq0PiJZRrts+SPSl RBWdwnPjtmOH1aJQW42OWdO2D3fiPffv7MkPyKgb7BgJonXB2unLT4q0RWF7YtbEDyMegY dq6LPVjY7M4k0oCAHmL/Q/bFHRGJ4m7RZzduXS3q4WoKV6Bgl7QG3LsCOtLJ6sE6x8qvmE A9/BmwPUXPDOCQXJLgIK5qMnzmDmpbSsAjEFuZJAEk6dkPwjaM1zTr+csdFQBA1dgir2qw siGbwt7SWTMYvTfz0xxOmdXRasFU0bmSBs4Mn0pXVcspD2iNAPsPfd/Ic+pGgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681795927; a=rsa-sha256; cv=none; b=k+5Bydycsp7Snpxrlzw/TVWtOIVQx1xoByBB0/eu7yIEYxRMl7KDxfV8tyDNlMqVKcoTPZ XG7iQXEPjfI/fdAofhjdYD9rcRP+4ry0yOjPPVOLiTsLiwlwiGaVdLU7gbpmOYQj0d6Ojx YmKsK3okloQ9MXT/P3yDucIajppzhaAEnNtvMx4RUm+DQzBiudq/lAgZRqvXMB+jkvpsKN +FK98v7rHfybCPgS+kQRDhApDcs6O9TRwRk2gT3NyoAerFISgnTSUvq7C1bS13cfhITlhm 2FuioTGh9U+mVgJ/L7VGfmlmx7znYUL8kMO4JQuoxt/T0MQOFusDkG+CeaWxxg== 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 4Q0sxM1f9Pzyqc; Tue, 18 Apr 2023 05:32:07 +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 33I5W7pW037891; Tue, 18 Apr 2023 05:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I5W7dq037890; Tue, 18 Apr 2023 05:32:07 GMT (envelope-from git) Date: Tue, 18 Apr 2023 05:32:07 GMT Message-Id: <202304180532.33I5W7dq037890@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: d59dd30cf19b - main - renice: Clean up the tests. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d59dd30cf19bb6df5635b3c896c7c4262917a9b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d59dd30cf19bb6df5635b3c896c7c4262917a9b6 commit d59dd30cf19bb6df5635b3c896c7c4262917a9b6 Author: Dag-Erling Smørgrav AuthorDate: 2023-04-18 05:31:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-04-18 05:31:56 +0000 renice: Clean up the tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D39629 --- usr.bin/renice/tests/renice_test.sh | 52 ++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/usr.bin/renice/tests/renice_test.sh b/usr.bin/renice/tests/renice_test.sh old mode 100644 new mode 100755 index a6e8007ba35d..79286a0f86bd --- a/usr.bin/renice/tests/renice_test.sh +++ b/usr.bin/renice/tests/renice_test.sh @@ -1,28 +1,7 @@ -#!/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. +# Copyright (c) 2022-2023 Klara, Inc. # -# 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. +# SPDX-License-Identifier: BSD-2-Clause # # Name of user to use for -u tests when running as root. Beware that @@ -33,8 +12,10 @@ _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_head() { + atf_set "descr" "Set a process's nice number to an absolute value" +} renice_abs_pid_body() { local pid nice incr sleep 60 & @@ -46,8 +27,10 @@ renice_abs_pid_body() { kill $pid } -# Change a process's nice number by a relative value atf_test_case renice_rel_pid +renice_rel_pid_head() { + atf_set "descr" "Change a process's nice number by a relative value" +} renice_rel_pid_body() { local pid nice incr sleep 60 & @@ -61,8 +44,10 @@ renice_rel_pid_body() { kill $pid } -# Set a process group's nice number to an absolute value atf_test_case renice_abs_pgid +renice_abs_pgid_head() { + atf_set "descr" "Set a process group's nice number to an absolute value" +} renice_abs_pgid_body() { local pid pgid nice incr # make sure target runs in a different pgrp than ours @@ -75,8 +60,10 @@ renice_abs_pgid_body() { kill $pid } -# Change a process group's nice number by a relative value atf_test_case renice_rel_pgid +renice_rel_pgid_head() { + atf_set "descr" "Change a process group's nice number by a relative value" +} renice_rel_pgid_body() { local pid pgid nice incr # make sure target runs in a different pgrp than ours @@ -90,9 +77,9 @@ renice_rel_pgid_body() { 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 "descr" "Set a user's processes' nice numbers to an absolute value" atf_set "require.user" "root" } renice_abs_user_body() { @@ -105,9 +92,9 @@ renice_abs_user_body() { 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 "descr" "Change a user's processes' nice numbers by a relative value" atf_set "require.user" "root" } renice_rel_user_body() { @@ -121,8 +108,10 @@ renice_rel_user_body() { kill $pid } -# Test various delimiter positions atf_test_case renice_delim +renice_delim_head() { + atf_set "descr" "Test various delimiter positions" +} renice_delim_body() { local pid nice incr sleep 60 & @@ -159,6 +148,9 @@ renice_delim_body() { } atf_test_case renice_incr_noarg +renice_incr_noarg_head() { + atf_set "descr" "Do not segfault if -n is given without an argument" +} renice_incr_noarg_body() { atf_check -o empty -e ignore -s exit:1 renice -n }