Index: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
===================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	(revision 303899)
+++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	(revision 303900)
@@ -1,23 +1,25 @@
 # $FreeBSD$
 
 #
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
 PACKAGE=	tests
 
 ${PACKAGE}FILES= \
      tst.raise1.d  \
      tst.raise2.d  \
      tst.raise3.d  \
 
 TESTEXES= \
 
 
 CFILES= \
      tst.raise1.c  \
      tst.raise2.c  \
      tst.raise3.c  \
 
 
+TEST_METADATA.t_dtrace_contrib+=	required_memory="4g"
+
 .include "../../dtrace.test.mk"
Index: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
===================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	(revision 303899)
+++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	(revision 303900)
@@ -1,56 +1,58 @@
 # $FreeBSD$
 
 #
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
 PACKAGE=	tests
 
 ${PACKAGE}FILES= \
      tst.basename.d  \
      tst.caller.d  \
      tst.cleanpath.d  \
      tst.copyin.d  \
      tst.copyin2.d  \
      tst.ddi_pathname.d  \
      tst.dirname.d  \
      tst.errno.d  \
      tst.execname.d  \
      tst.gid.d  \
      tst.hton.d  \
      tst.index.d  \
      tst.msgdsize.d  \
      tst.msgsize.d  \
      tst.null.d  \
      tst.pid.d  \
      tst.ppid.d  \
      tst.progenyof.d  \
      tst.random.d  \
      tst.rw.d  \
      tst.shortstr.d  \
      tst.stack.d  \
      tst.stackdepth.d  \
      tst.stddev.d  \
      tst.strchr.d  \
      tst.strjoin.d  \
      tst.strstr.d  \
      tst.strtok.d  \
      tst.substr.d  \
      tst.ucaller.d  \
      tst.uid.d  \
      tst.unalign.d  \
      tst.uregs.d  \
      tst.ustack.d  \
      tst.ustackdepth.d  \
      tst.vahole.d  \
      tst.violentdeath.ksh  \
      tst.zonename.d  \
 
 TESTEXES= \
 
 
 CFILES= \
 
 
 
+TEST_METADATA.t_dtrace_contrib+=	required_memory="4g"
+
 .include "../../dtrace.test.mk"
Index: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
===================================================================
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	(revision 303899)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	(revision 303900)
@@ -1,86 +1,99 @@
 # $FreeBSD$
 
 usage()
 {
     cat <<__EOF__ >&2
 usage: $(basename $0)
 
 This script regenerates the DTrace test suite makefiles. It should be run
 whenever \$srcdir/cddl/contrib/opensolaris/cmd/dtrace/test/tst is modified.
 __EOF__
     exit 1
 }
 
 # Format a file list for use in a make(1) variable assignment: take the
 # basename of each input file and append " \" to it.
 fmtflist()
 {
     awk 'function bn(f) {
         sub(".*/", "", f)
         return f
     }
     {print "    ", bn($1), " \\"}'
 }
 
 genmakefile()
 {
     local basedir=$1
 
     local tdir=${CONTRIB_TESTDIR}/${basedir}
     local tfiles=$(find $tdir -type f -a \
         \( -name \*.d -o -name \*.ksh -o -name \*.out \) | sort | fmtflist)
     local tcfiles=$(find $tdir -type f -a -name \*.c | sort | fmtflist)
     local texes=$(find $tdir -type f -a -name \*.exe | sort | fmtflist)
 
     # One-off variable definitions.
     local special
-    if [ "$basedir" = proc ]; then
+    case "$basedir" in
+    proc)
         special="
 LIBADD.tst.sigwait.exe+= rt
 "
-    elif [ "$basedir" = uctf ]; then
+        ;;
+    raise)
+	special="
+TEST_METADATA.t_dtrace_contrib+=	required_memory=\"4g\"
+"
+        ;;
+    safety)
+	special="
+TEST_METADATA.t_dtrace_contrib+=	required_memory=\"4g\"
+"
+        ;;
+    uctf)
         special="
 WITH_CTF=YES
 "
-    fi
+        ;;
+    esac
 
     local makefile=$(mktemp)
     cat <<__EOF__ > $makefile
 # \$FreeBSD$
 
 #
 # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
 #
 
 PACKAGE=	tests
 
 \${PACKAGE}FILES= \\
 $tfiles
 
 TESTEXES= \\
 $texes
 
 CFILES= \\
 $tcfiles
 
 $special
 .include "../../dtrace.test.mk"
 __EOF__
 
     mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile
 }
 
 set -e
 
 if [ $# -ne 0 ]; then
     usage
 fi
 
 readonly ORIGINDIR=$(realpath $(dirname $0))
 readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..)
 readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
 
 # Generate a Makefile for each test group under common/.
 for dir in $(find ${CONTRIB_TESTDIR} -mindepth 1 -maxdepth 1 -type d); do
     genmakefile $(basename $dir)
 done