[LTP] [PATCH 5/6] syscalls/kill09: Convert to new API
Ricardo B. Marlière
rbm@suse.com
Wed May 14 12:49:58 CEST 2025
From: Ricardo B. Marlière <rbm@suse.com>
Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
---
testcases/kernel/syscalls/kill/kill09.c | 208 ++++----------------------------
1 file changed, 23 insertions(+), 185 deletions(-)
diff --git a/testcases/kernel/syscalls/kill/kill09.c b/testcases/kernel/syscalls/kill/kill09.c
index c0b70311947754dd08ed48cc88f15eed65a69366..ba12e468de0b918f5470738019adc378076cf293 100644
--- a/testcases/kernel/syscalls/kill/kill09.c
+++ b/testcases/kernel/syscalls/kill/kill09.c
@@ -1,198 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like. Any license provided herein, whether implied or
- * otherwise, applies only to this software file. Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA 94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
*/
-/* $Id: kill09.c,v 1.8 2009/08/28 13:22:51 vapier Exp $ */
-/**********************************************************
- *
- * OS Test - Silicon Graphics, Inc.
- *
- * TEST IDENTIFIER : kill09
- *
- * EXECUTED BY : anyone
- *
- * TEST TITLE : Basic test for kill(2)
- *
- * PARENT DOCUMENT : usctpl01
- *
- * TEST CASE TOTAL : 1
- *
- * WALL CLOCK TIME : 1
- *
- * CPU TYPES : ALL
- *
- * AUTHOR : William Roske
- *
- * CO-PILOT : Dave Fenner
- *
- * DATE STARTED : 03/30/92
- *
- * INITIAL RELEASE : UNICOS 7.0
- *
- * TEST CASES
- *
- * 1.) kill(2) returns...(See Description)
- *
- * INPUT SPECIFICATIONS
- * The standard options for system call tests are accepted.
- * (See the parse_opts(3) man page).
- *
- * OUTPUT SPECIFICATIONS
- *$
- * DURATION
- * Terminates - with frequency and infinite modes.
- *
- * SIGNALS
- * Uses SIGUSR1 to pause before test if option set.
- * (See the parse_opts(3) man page).
- *
- * RESOURCES
- * None
- *
- * ENVIRONMENTAL NEEDS
- * No run-time environmental needs.
- *
- * SPECIAL PROCEDURAL REQUIREMENTS
- * None
- *
- * INTERCASE DEPENDENCIES
- * None
- *
- * DETAILED DESCRIPTION
- * This is a Phase I test for the kill(2) system call. It is intended
- * to provide a limited exposure of the system call, for now. It
- * should/will be extended when full functional tests are written for
- * kill(2).
- *
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.
- * Execute system call
- * Check return code, if system call failed (return=-1)
- * Log the errno and Issue a FAIL message.
- * Otherwise, Issue a PASS message.
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <errno.h>
-#include <string.h>
+/*\
+ * Verify that kill(2) works when sending SIGKILL to a child process.
+ */
+
#include <signal.h>
-#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-void alarm_handler(int sig);
-void do_child();
-
-char *TCID = "kill09";
-int TST_TOTAL = 1;
+#include "tst_test.h"
-int fork_pid;
-
-int main(int ac, char **av)
+static void run(void)
{
- int lc;
int status;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- if ((fork_pid = tst_fork()) == -1)
- tst_brkm(TBROK | TERRNO, cleanup, "fork failed");
-
- if (fork_pid == 0) {
- do_child();
- }
-
- TEST(kill(fork_pid, SIGKILL));
- if (TEST_RETURN == -1)
- tst_resm(TFAIL | TTERRNO, "kill(.., SIGKILL) failed");
- else {
- tst_resm(TPASS,
- "kill(%d, SIGKILL) returned %ld",
- fork_pid, TEST_RETURN);
- }
-
- waitpid(0, &status, WNOHANG);
-
- }
-
- cleanup();
- tst_exit();
+ pid_t pid;
+
+ pid = SAFE_FORK();
+ if (!pid)
+ pause();
+
+ TEST(kill(pid, SIGKILL));
+ if (TST_RET == -1)
+ tst_res(TFAIL | TTERRNO, "kill(.., SIGKILL) failed");
+ else
+ tst_res(TPASS, "kill(%d, SIGKILL) returned %ld", pid, TST_RET);
+ SAFE_WAIT(&status);
}
-void do_child(void)
-{
- /*
- * Setup alarm signal if we don't get the signal to prevent this process
- * from hanging around forever.
- */
- signal(SIGALRM, alarm_handler);
- alarm(20);
- pause();
- exit(1);
-}
-
-void setup(void)
-{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- (void)signal(SIGCHLD, SIG_IGN);
-
- TEST_PAUSE;
-
-}
-
-void cleanup(void)
-{
-}
-
-void alarm_handler(int sig)
-{
- exit(8);
-}
+static struct tst_test test = {
+ .test_all = run,
+ .forks_child = 1,
+};
--
2.49.0
More information about the ltp
mailing list