Merge pull request katef#480 from katef/kate/retest-errors

Missing error handling for retest(1)
fastly · Jun 28, 2024 · 14bbc0f · 14bbc0f
2 parents 0402f39 + b0d1de6
commit 14bbc0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git 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

diff --git 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;

diff --git 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