Date: Sun, 28 Aug 2016 07:12:47 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r304948 - in stable/11/cddl/usr.sbin/dtrace/tests: common/raise common/safety tools Message-ID: <201608280712.u7S7ClG4059151@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Aug 28 07:12:47 2016 New Revision: 304948 URL: https://svnweb.freebsd.org/changeset/base/304948 Log: 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 Modified: stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile ============================================================================== --- stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Sun Aug 28 07:10:48 2016 (r304947) +++ stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Sun Aug 28 07:12:47 2016 (r304948) @@ -20,4 +20,6 @@ CFILES= \ tst.raise3.c \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" Modified: stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile ============================================================================== --- stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Sun Aug 28 07:10:48 2016 (r304947) +++ stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Sun Aug 28 07:12:47 2016 (r304948) @@ -53,4 +53,6 @@ CFILES= \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" Modified: stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh ============================================================================== --- stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Sun Aug 28 07:10:48 2016 (r304947) +++ stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Sun Aug 28 07:12:47 2016 (r304948) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608280712.u7S7ClG4059151>