Add an option for not forking each test in quark-test. Issue #130

This makes it easier to run a specific test in gdb, without having to follow the
child, same for strace.

Author: haesbaert

docs/quark-test.8.html

@@ -25,7 +25,7 @@ <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a><
 <table class="Nm">
   <tr>
     <td><code class="Nm">quark-test</code></td>
-    <td>[<code class="Fl">-bkv</code>] [<code class="Fl">-x</code>
+    <td>[<code class="Fl">-1bkv</code>] [<code class="Fl">-x</code>
       <var class="Ar">test</var>] [<var class="Ar">tests ...</var>]</td>
   </tr>
 </table>
@@ -70,6 +70,9 @@ <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIP
     return value of <code class="Nm">quark-test</code>.</p>
 <p class="Pp">The options are as follows:</p>
 <dl class="Bl-tag">
+  <dt id="1"><a class="permalink" href="#1"><code class="Fl">-1</code></a></dt>
+  <dd>Don't run tests in a child process, useful for debugging with gdb, strace
+      and whatnot.</dd>
   <dt id="b"><a class="permalink" href="#b"><code class="Fl">-b</code></a></dt>
   <dd>Run only EBPF tests.</dd>
   <dt id="h"><a class="permalink" href="#h"><code class="Fl">-h</code></a></dt>
@@ -134,7 +137,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">May 4, 2025</td>
+    <td class="foot-date">May 8, 2025</td>
     <td class="foot-os">Linux</td>
   </tr>
 </table>

quark-test.8

@@ -6,7 +6,7 @@
 .Nd quark's test utility
 .Sh SYNOPSIS
 .Nm quark-test
-.Op Fl bkv
+.Op Fl 1bkv
 .Op Fl x Ar test
 .Op Ar tests ...
 .Nm quark-test
@@ -33,6 +33,9 @@ The number of failed tests is the return value of
 .Pp
 The options are as follows:
 .Bl -tag -width Dtb
+.It Fl 1
+Don't run tests in a child process, useful for debugging with gdb, strace and
+whatnot.
 .It Fl b
 Run only EBPF tests.
 .It Fl h

quark-test.c

@@ -54,8 +54,9 @@ enum {
 	YELLOW
 };
 
-static int	bflag;	/* run bpf tests */
-static int	kflag;	/* run kprobe tests */
+static int	noforkflag;	/* don't fork on each test */
+static int	bflag;		/* run bpf tests */
+static int	kflag;		/* run kprobe tests */
 
 static int
 fancy_tty(void)
@@ -266,7 +267,7 @@ usage(void)
 {
 	fprintf(stderr, "usage: %s -h\n",
 	    program_invocation_short_name);
-	fprintf(stderr, "usage: %s [-bkv] [-x test] [tests ...]\n",
+	fprintf(stderr, "usage: %s [-1bkv] [-x test] [tests ...]\n",
 	    program_invocation_short_name);
 	fprintf(stderr, "usage: %s -l\n",
 	    program_invocation_short_name);
@@ -1082,14 +1083,39 @@ lookup_test(const char *name)
 	return (NULL);
 }
 
+static int
+run_test_doit(struct test *t, struct quark_queue_attr *qa)
+{
+	int			nfd, r;
+	struct quark_queue_attr qa_copy;
+
+	/*
+	 * Check for FD leaks
+	 */
+	nfd = num_open_fd();
+	assert(nfd == 3);
+	qa_copy = *qa;
+	r = t->func(t, &qa_copy);
+	nfd = num_open_fd();
+	if (nfd != 3) {
+		fprintf(stderr,
+		    "FDLEAK DETECTED! %d opened descriptors, expected 3\n",
+		    nfd);
+		dump_open_fd(stderr);
+		if (r == 0)
+			r = 1;
+	}
+
+	return (r);
+}
 /*
  * A test runs as a subprocess to avoid contamination.
  */
 static int
 run_test(struct test *t, struct quark_queue_attr *qa)
 {
 	pid_t		 child;
-	int		 status, x, linepos, be, nfd, r;
+	int		 status, x, linepos, be, r;
 	int		 child_stderr[2];
 	FILE		*child_stream;
 	char		*child_buf;
@@ -1119,6 +1145,22 @@ run_test(struct test *t, struct quark_queue_attr *qa)
 		return (0);
 	}
 
+	if (noforkflag) {
+		r = run_test_doit(t, qa);
+		if (r == 0) {
+			x = color(GREEN);
+			printf("ok\n");
+			color(x);
+		} else {
+			x = color(RED);
+			printf("failed\n");
+			color(x);
+		}
+		fflush(stdout);
+
+		return (r);
+	}
+
 	/*
 	 * Create a pipe to save the child stderr, so we don't get crappy
 	 * interleaved output with the parent.
@@ -1136,22 +1178,7 @@ run_test(struct test *t, struct quark_queue_attr *qa)
 		close(child_stderr[1]);
 		close(child_stderr[0]);
 
-		/*
-		 * Check for FD leaks
-		 */
-		nfd = num_open_fd();
-		assert(nfd == 3);
-		r = t->func(t, qa);
-		nfd = num_open_fd();
-		if (nfd != 3) {
-			fprintf(stderr,
-			    "FDLEAK DETECTED! %d opened descriptors, expected 3\n",
-			    nfd);
-			dump_open_fd(stderr);
-			if (r == 0)
-				r = 1;
-		}
-		exit(r);
+		exit(run_test_doit(t, qa));
 	}
 	close(child_stderr[1]);
 
@@ -1292,8 +1319,11 @@ main(int argc, char *argv[])
 	int		  ch, failed, x;
 	struct test	 *t;
 
-	while ((ch = getopt(argc, argv, "bhklNvVx:")) != -1) {
+	while ((ch = getopt(argc, argv, "1bhklNvVx:")) != -1) {
 		switch (ch) {
+		case '1':
+			noforkflag = 1;
+			break;
 		case 'b':
 			bflag = 1;
 			break;