dd106cd09b
- Drop autotools patches - Drop sys/param.h check as __FreeBSD__ is defined by compiler - Apply upstream fix for tests randomly failing to build PR: 244071 Tested by: mikael (13.0 powerpc64), pkubaj (12.1/13.0 powerpc64) Approved by: x11 (manu, zeising) Differential Revision: https://reviews.freebsd.org/D23644
128 lines
3.3 KiB
C
128 lines
3.3 KiB
C
--- tests/test-runner.c.orig 2020-02-11 23:46:03 UTC
|
|
+++ tests/test-runner.c
|
|
@@ -25,6 +25,8 @@
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
+#include "../config.h"
|
|
+
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
@@ -37,13 +39,23 @@
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <sys/ptrace.h>
|
|
+#ifdef HAVE_SYS_PRCTL_H
|
|
#include <sys/prctl.h>
|
|
+#endif
|
|
#ifndef PR_SET_PTRACER
|
|
# define PR_SET_PTRACER 0x59616d61
|
|
#endif
|
|
+#include <signal.h>
|
|
|
|
#include "test-runner.h"
|
|
|
|
+#ifdef __FreeBSD__
|
|
+/* XXX review ptrace() usage */
|
|
+#define PTRACE_ATTACH PT_ATTACH
|
|
+#define PTRACE_CONT PT_CONTINUE
|
|
+#define PTRACE_DETACH PT_DETACH
|
|
+#endif
|
|
+
|
|
/* when set to 1, check if tests are not leaking opened files.
|
|
* It is turned on by default. It can be turned off by
|
|
* WAYLAND_TEST_NO_LEAK_CHECK environment variable. */
|
|
@@ -51,7 +63,7 @@ int fd_leak_check_enabled;
|
|
|
|
/* when this var is set to 0, every call to test_set_timeout() is
|
|
* suppressed - handy when debugging the test. Can be set by
|
|
- * WAYLAND_TEST_NO_TIMEOUTS environment variable. */
|
|
+ * WAYLAND_TESTS_NO_TIMEOUTS evnironment var */
|
|
static int timeouts_enabled = 1;
|
|
|
|
/* set to one if the output goes to the terminal */
|
|
@@ -239,6 +251,8 @@ is_debugger_attached(void)
|
|
return 0;
|
|
}
|
|
|
|
+
|
|
+// xxx start here
|
|
pid = fork();
|
|
if (pid == -1) {
|
|
perror("fork");
|
|
@@ -259,13 +273,14 @@ is_debugger_attached(void)
|
|
_exit(1);
|
|
if (!waitpid(-1, NULL, 0))
|
|
_exit(1);
|
|
- ptrace(PTRACE_CONT, NULL, NULL);
|
|
+ ptrace(PTRACE_CONT, ppid, NULL, NULL);
|
|
ptrace(PTRACE_DETACH, ppid, NULL, NULL);
|
|
_exit(0);
|
|
} else {
|
|
close(pipefd[0]);
|
|
|
|
/* Enable child to ptrace the parent process */
|
|
+#if defined(HAVE_PRCTL)
|
|
rc = prctl(PR_SET_PTRACER, pid);
|
|
if (rc != 0 && errno != EINVAL) {
|
|
/* An error prevents us from telling if a debugger is attached.
|
|
@@ -275,7 +290,9 @@ is_debugger_attached(void)
|
|
*/
|
|
perror("prctl");
|
|
write(pipefd[1], "-", 1);
|
|
- } else {
|
|
+ } else
|
|
+#endif
|
|
+ {
|
|
/* Signal to client that parent is ready by passing '+' */
|
|
write(pipefd[1], "+", 1);
|
|
}
|
|
@@ -293,7 +310,11 @@ int main(int argc, char *argv[])
|
|
const struct test *t;
|
|
pid_t pid;
|
|
int total, pass;
|
|
+#ifdef HAVE_WAITID
|
|
siginfo_t info;
|
|
+#else
|
|
+ int status;
|
|
+#endif
|
|
|
|
if (isatty(fileno(stderr)))
|
|
is_atty = 1;
|
|
@@ -336,7 +357,8 @@ int main(int argc, char *argv[])
|
|
if (pid == 0)
|
|
run_test(t); /* never returns */
|
|
|
|
- if (waitid(P_PID, pid, &info, WEXITED)) {
|
|
+#ifdef HAVE_WAITID
|
|
+ if (waitid(P_PID, 0, &info, WEXITED)) {
|
|
stderr_set_color(RED);
|
|
fprintf(stderr, "waitid failed: %s\n",
|
|
strerror(errno));
|
|
@@ -368,6 +390,25 @@ int main(int argc, char *argv[])
|
|
|
|
break;
|
|
}
|
|
+#else
|
|
+ if (waitpid(-1, &status, 0) == -1) {
|
|
+ fprintf(stderr, "waitpid failed: %s\n",
|
|
+ strerror(errno));
|
|
+ abort();
|
|
+ }
|
|
+
|
|
+ fprintf(stderr, "test \"%s\":\t", t->name);
|
|
+ if (WIFEXITED(status)) {
|
|
+ fprintf(stderr, "exit status %d", WEXITSTATUS(status));
|
|
+ if (WEXITSTATUS(status) == EXIT_SUCCESS)
|
|
+ success = 1;
|
|
+ } else if (WIFSIGNALED(status)) {
|
|
+ fprintf(stderr, "signal %d", WTERMSIG(status));
|
|
+ }
|
|
+#endif
|
|
+
|
|
+ if (t->must_fail)
|
|
+ success = !success;
|
|
|
|
if (success) {
|
|
pass++;
|