From e7fd0f418642d4e14b293966bf49a92a01b47be6 Mon Sep 17 00:00:00 2001
From: Kate F <kate@elide.org>
Date: Fri, 28 Jun 2024 14:56:53 +0100
Subject: [PATCH 1/3] Include num_re_errors in per-file failures.

---
 src/retest/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/retest/main.c b/src/retest/main.c
index e01c93e7c..9d7d8d583 100644
--- a/src/retest/main.c
+++ b/src/retest/main.c
@@ -1181,7 +1181,7 @@ process_test_file(const char *filename,
 		exit(EXIT_FAILURE);
 	}
 
-	return num_errors;
+	return num_errors + num_re_errors;
 }
 
 static enum fsm_io

From e66e6cf62ca6ac9e54fbee256e5ba69f662d4213 Mon Sep 17 00:00:00 2001
From: Kate F <kate@elide.org>
Date: Fri, 28 Jun 2024 15:34:33 +0100
Subject: [PATCH 2/3] Skip an IO API/lang combination that we don't support.

---
 tests/retest/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/retest/Makefile b/tests/retest/Makefile
index ec6cc66a9..5c3512ccd 100644
--- a/tests/retest/Makefile
+++ b/tests/retest/Makefile
@@ -11,6 +11,9 @@ RETEST=${BUILD}/bin/retest
 .for lang in vm asm c vmc
 .for io in pair str
 
+# XXX: we don't have FSM_IO_STR for asm yet
+.if ${lang} != asm || ${io} != str
+
 .for n in ${TEST.tests/retest:T:R:C/^tests_//}
 
 ${TEST_OUTDIR.tests/retest}/res-${lang}-${io}${n}: ${TEST_SRCDIR.tests/retest}/tests_${n}.tst
@@ -22,6 +25,8 @@ test:: ${TEST_OUTDIR.tests/retest}/res-${lang}-${io}${n}
 
 .endfor
 
+.endif
+
 .endfor
 .endfor
 

From b0d1de6242271c0332ceefa40682438cd07f3592 Mon Sep 17 00:00:00 2001
From: Kate F <kate@elide.org>
Date: Fri, 28 Jun 2024 15:36:26 +0100
Subject: [PATCH 3/3] Quieten GNU ld about something I don't understand.

---
 src/retest/runner.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/retest/runner.c b/src/retest/runner.c
index c5c2cde82..7d3ddad4a 100644
--- a/src/retest/runner.c
+++ b/src/retest/runner.c
@@ -242,8 +242,12 @@ compile(enum implementation impl,
 			return 0;
 		}
 
-		if (0 != systemf("%s %s -shared %s -o %s",
+		if (0 != systemf("%s %s -shared %s %s -o %s",
 				cc ? cc : "gcc", cflags ? cflags : "",
+
+				// for "missing .note.GNU-stack section implies executable stack"
+				"-Wl,-z,noexecstack",
+
 				tmp_o, tmp_so))
 		{
 			return 0;