diff options
author | ngie <ngie@FreeBSD.org> | 2016-08-28 07:12:47 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2016-08-28 07:12:47 +0000 |
commit | a0ee1f5e5263b159eaa8404042fd76246c3f2480 (patch) | |
tree | 8209b89331e49c2264ae53cc3588b2552bfef5e1 | |
parent | b1193aa7e234f525df3e1cc6a7c0fa4909092c3f (diff) | |
download | FreeBSD-src-a0ee1f5e5263b159eaa8404042fd76246c3f2480.zip FreeBSD-src-a0ee1f5e5263b159eaa8404042fd76246c3f2480.tar.gz |
MFC r303900:
Highball memory requirement (4GB) with common/{raise,safety}
Both test suites require more memory than my amd64 VM using
GENERIC-NODEBUG can provide and reliably panic it with OOM issues in
dtrace(4).
Some of the testcases fail, but this at least bypasses the panic behavior
on platforms that don't have enough resources
Discussed with: markj
-rw-r--r-- | cddl/usr.sbin/dtrace/tests/common/raise/Makefile | 2 | ||||
-rw-r--r-- | cddl/usr.sbin/dtrace/tests/common/safety/Makefile | 2 | ||||
-rwxr-xr-x | cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh | 19 |
3 files changed, 20 insertions, 3 deletions
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile index cde512f..83af0e4 100644 --- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile @@ -20,4 +20,6 @@ CFILES= \ tst.raise3.c \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile index 5326053..5056260 100644 --- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile @@ -53,4 +53,6 @@ CFILES= \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh index 9953064..4b88944 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh @@ -34,15 +34,28 @@ genmakefile() # 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 |