Module Name:    src
Committed By:   kamil
Date:           Mon May 11 12:17:57 UTC 2020

Modified Files:
        src/tests/lib/libc/sys: t_ptrace_register_wait.h

Log Message:
Simplify previous

Emit SIGKILL without a loop and without checking for exact process status
once it is collected.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_ptrace_register_wait.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_register_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_register_wait.h:1.2 src/tests/lib/libc/sys/t_ptrace_register_wait.h:1.3
--- src/tests/lib/libc/sys/t_ptrace_register_wait.h:1.2	Mon May 11 11:03:15 2020
+++ src/tests/lib/libc/sys/t_ptrace_register_wait.h	Mon May 11 12:17:57 2020
@@ -1,4 +1,4 @@
-/*      $NetBSD: t_ptrace_register_wait.h,v 1.2 2020/05/11 11:03:15 kamil Exp $   */
+/*      $NetBSD: t_ptrace_register_wait.h,v 1.3 2020/05/11 12:17:57 kamil Exp $   */
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -136,19 +136,13 @@ access_regs(const char *regset, const ch
 	if (strstr(aux, "unaligned") != NULL) {
 		DPRINTF("Before resuming the child process where it left off "
 		    "and without signal to be sent\n");
-		for (;;) {
-			errno = 0;
-			if (ptrace(PT_KILL, child, NULL, 0) == 0)
-				break;
-			ATF_REQUIRE_EQ(errno, ESRCH);
-		}
+
+		ptrace(PT_KILL, child, NULL, 0);
 
 		DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0),
 		    child);
 
-		validate_status_signaled(status, SIGKILL, 0);
-
 		DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 		TWAIT_REQUIRE_FAILURE(ECHILD,
 		    wpid = TWAIT_GENERIC(child, &status, 0));

Reply via email to