Make malloc tests that set flags more robust against the user also

having flags set.

2 files changed, 19 insertions, 15 deletions

diff --git a/src/regress/lib/libc/malloc/malloc_errs/malloc_errs.c b/src/regress/lib/libc/malloc/malloc_errs/malloc_errs.c
index e2ac6dd79a..e0efb6ebf3 100644
--- a/src/regress/lib/libc/malloc/malloc_errs/malloc_errs.c
+++ b/src/regress/lib/libc/malloc/malloc_errs/malloc_errs.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: malloc_errs.c,v 1.1 2023/05/08 11:12:44 otto Exp $    */
+/*      $OpenBSD: malloc_errs.c,v 1.2 2023/05/09 19:07:37 otto Exp $    */
 /*
  * Copyright (c) 2023 Otto Moerbeek <otto@drijf.net>
  *
@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
                 pid = fork();
                 switch (pid) {
                 case 0:
-                        snprintf(options, sizeof(options), "cfjgu%s", tests[i].flags);
+                        snprintf(options, sizeof(options), "us%s", tests[i].flags);
                         snprintf(num, sizeof(num), "%d", i);
                         execl(argv[0], argv[0], num, options, NULL);
                         err(1, "exec");
diff --git a/src/regress/lib/libc/malloc/malloc_general/Makefile b/src/regress/lib/libc/malloc/malloc_general/Makefile
index b06609f6fa..367b33b9c5 100644
--- a/src/regress/lib/libc/malloc/malloc_general/Makefile
+++ b/src/regress/lib/libc/malloc/malloc_general/Makefile
@@ -1,39 +1,43 @@
-#       $OpenBSD: Makefile,v 1.6 2022/03/30 05:22:31 anton Exp $
+#       $OpenBSD: Makefile,v 1.7 2023/05/09 19:07:37 otto Exp $
 
-REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11
+REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12
 PROG=                   malloc_general
 
 .include <bsd.regress.mk>
 
 t1:     malloc_general
-        MALLOC_OPTIONS=cfgju ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=su ${.OBJDIR}/malloc_general
 
 t2:     malloc_general
-        MALLOC_OPTIONS=cfgjuC ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suC ${.OBJDIR}/malloc_general
 
 t3:     malloc_general
-        MALLOC_OPTIONS=cfgjuJ ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suJ ${.OBJDIR}/malloc_general
 
 t4:     malloc_general
-        MALLOC_OPTIONS=cfgjuF ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suF ${.OBJDIR}/malloc_general
 
 t5:     malloc_general
-        MALLOC_OPTIONS=cfgjuG ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suG ${.OBJDIR}/malloc_general
 
 t6:     malloc_general
-        MALLOC_OPTIONS=cfgjuS ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suS ${.OBJDIR}/malloc_general
 
 t7:     malloc_general
-        MALLOC_OPTIONS=cfgjuFGJ ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suFGJ ${.OBJDIR}/malloc_general
 
 t8:     malloc_general
-        MALLOC_OPTIONS=cfgjuCJ ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suCJ ${.OBJDIR}/malloc_general
 
 t9:     malloc_general
-        MALLOC_OPTIONS=cfgjuCJJ ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suCJJ ${.OBJDIR}/malloc_general
 
 t10:    malloc_general
-        MALLOC_OPTIONS=cfgjuJS ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suJS ${.OBJDIR}/malloc_general
 
 t11:    malloc_general
-        MALLOC_OPTIONS=cfgjuFGJJ ${.OBJDIR}/malloc_general
+        MALLOC_OPTIONS=suFGJJ ${.OBJDIR}/malloc_general
+
+t12:    malloc_general
+        MALLOC_OPTIONS=suFCJJ ${.OBJDIR}/malloc_general
+