Merge kernel/t_ptrace_wait with kernel/arch/amd64/t_ptrace_wait

This aims to remove MD-specific tests files for ptrace(2).

Prefix i386 and amd64 tests with unique strings "i386_" and "x86_64_".
This removes conflicts with generic tests.

Sponsored by <The NetBSD Foundation>
This commit is contained in:
kamil 2017-04-02 01:14:35 +00:00
parent 558f1d1e36
commit 8021fa5d7a
3 changed files with 123 additions and 7 deletions

View File

@ -0,0 +1,114 @@
/* $NetBSD: t_ptrace_amd64_wait.h,v 1.1 2017/04/02 01:14:35 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, 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.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
*/
#if defined(__x86_64__)
ATF_TC(x86_64_regs1);
ATF_TC_HEAD(x86_64_regs1, tc)
{
atf_tc_set_md_var(tc, "descr",
"Call PT_GETREGS and iterate over General Purpose registers");
}
ATF_TC_BODY(x86_64_regs1, tc)
{
const int exitval = 5;
const int sigval = SIGSTOP;
pid_t child, wpid;
#if defined(TWAIT_HAVE_STATUS)
int status;
#endif
struct reg r;
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
if (child == 0) {
printf("Before calling PT_TRACE_ME from child %d\n", getpid());
FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
printf("Before raising %s from child\n", strsignal(sigval));
FORKEE_ASSERT(raise(sigval) == 0);
printf("Before exiting of the child process\n");
_exit(exitval);
}
printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
validate_status_stopped(status, sigval);
printf("Call GETREGS for the child process\n");
ATF_REQUIRE(ptrace(PT_GETREGS, child, &r, 0) != -1);
printf("RAX=%#" PRIxREGISTER "\n", r.regs[_REG_RAX]);
printf("RBX=%#" PRIxREGISTER "\n", r.regs[_REG_RBX]);
printf("RCX=%#" PRIxREGISTER "\n", r.regs[_REG_RCX]);
printf("RDX=%#" PRIxREGISTER "\n", r.regs[_REG_RDX]);
printf("RDI=%#" PRIxREGISTER "\n", r.regs[_REG_RDI]);
printf("RSI=%#" PRIxREGISTER "\n", r.regs[_REG_RSI]);
printf("GS=%#" PRIxREGISTER "\n", r.regs[_REG_GS]);
printf("FS=%#" PRIxREGISTER "\n", r.regs[_REG_FS]);
printf("ES=%#" PRIxREGISTER "\n", r.regs[_REG_ES]);
printf("DS=%#" PRIxREGISTER "\n", r.regs[_REG_DS]);
printf("CS=%#" PRIxREGISTER "\n", r.regs[_REG_CS]);
printf("SS=%#" PRIxREGISTER "\n", r.regs[_REG_SS]);
printf("RSP=%#" PRIxREGISTER "\n", r.regs[_REG_RSP]);
printf("RIP=%#" PRIxREGISTER "\n", r.regs[_REG_RIP]);
printf("RFLAGS=%#" PRIxREGISTER "\n", r.regs[_REG_RFLAGS]);
printf("R8=%#" PRIxREGISTER "\n", r.regs[_REG_R8]);
printf("R9=%#" PRIxREGISTER "\n", r.regs[_REG_R9]);
printf("R10=%#" PRIxREGISTER "\n", r.regs[_REG_R10]);
printf("R11=%#" PRIxREGISTER "\n", r.regs[_REG_R11]);
printf("R12=%#" PRIxREGISTER "\n", r.regs[_REG_R12]);
printf("R13=%#" PRIxREGISTER "\n", r.regs[_REG_R13]);
printf("R14=%#" PRIxREGISTER "\n", r.regs[_REG_R14]);
printf("R15=%#" PRIxREGISTER "\n", r.regs[_REG_R15]);
printf("Before resuming the child process where it left off and "
"without signal to be sent\n");
ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
validate_status_exited(status, exitval);
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
#define ATF_TP_ADD_TCS_PTRACE_WAIT_AMD64() \
ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs1);
#else
#define ATF_TP_ADD_TCS_PTRACE_WAIT_AMD64()
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: t_ptrace_i386_wait.h,v 1.1 2017/04/02 00:40:12 kamil Exp $ */
/* $NetBSD: t_ptrace_i386_wait.h,v 1.2 2017/04/02 01:14:35 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@ -27,14 +27,14 @@
*/
#if defined(__i386__)
ATF_TC(regs1);
ATF_TC_HEAD(regs1, tc)
ATF_TC(i386_regs1);
ATF_TC_HEAD(i386_regs1, tc)
{
atf_tc_set_md_var(tc, "descr",
"Call PT_GETREGS and iterate over General Purpose registers");
}
ATF_TC_BODY(regs1, tc)
ATF_TC_BODY(i386_regs1, tc)
{
const int exitval = 5;
const int sigval = SIGSTOP;
@ -101,7 +101,7 @@ ATF_TC_BODY(regs1, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
#define ATF_TP_ADD_TCS_PTRACE_WAIT_I386() \
ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs1);
ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs1);
#else
#define ATF_TP_ADD_TCS_PTRACE_WAIT_I386()
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: t_ptrace_wait.c,v 1.87 2017/04/02 00:40:12 kamil Exp $ */
/* $NetBSD: t_ptrace_wait.c,v 1.88 2017/04/02 01:14:35 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: t_ptrace_wait.c,v 1.87 2017/04/02 00:40:12 kamil Exp $");
__RCSID("$NetBSD: t_ptrace_wait.c,v 1.88 2017/04/02 01:14:35 kamil Exp $");
#include <sys/param.h>
#include <sys/types.h>
@ -7446,6 +7446,7 @@ ATF_TC_BODY(syscallemu1, tc)
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
#include "t_ptrace_amd64_wait.h"
#include "t_ptrace_i386_wait.h"
#include "t_ptrace_x86_wait.h"
@ -7581,6 +7582,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, syscallemu1);
ATF_TP_ADD_TCS_PTRACE_WAIT_AMD64();
ATF_TP_ADD_TCS_PTRACE_WAIT_I386();
ATF_TP_ADD_TCS_PTRACE_WAIT_X86();