From owner-svn-src-stable-11@freebsd.org Sun Aug 28 07:12:48 2016 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B00D9B7888D; Sun, 28 Aug 2016 07:12:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6882012F; Sun, 28 Aug 2016 07:12:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7S7ClKj059154; Sun, 28 Aug 2016 07:12:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7S7ClG4059151; Sun, 28 Aug 2016 07:12:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608280712.u7S7ClG4059151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 28 Aug 2016 07:12:47 +0000 (UTC) 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 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2016 07:12:48 -0000 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