From d59dd30cf19bb6df5635b3c896c7c4262917a9b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Tue, 18 Apr 2023 05:31:41 +0000
Subject: [PATCH] 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(-)
 mode change 100644 => 100755 usr.bin/renice/tests/renice_test.sh

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
 }