svn commit: r303900 - in head/cddl/usr.sbin/dtrace/tests: common/raise common/safety tools

[Garrett Cooper]

Author: ngie
Date: Wed Aug 10 03:10:34 2016
New Revision: 303900
URL: https://svnweb.freebsd.org/changeset/base/303900

Log:
  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
  
  MFC after: 2 weeks
  Discussed with: markj
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
  head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh

Modified: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	Wed Aug 10 02:44:46 2016	(r303899)
+++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	Wed Aug 10 03:10:34 2016	(r303900)
@@ -20,4 +20,6 @@ CFILES= \
      tst.raise3.c  \
 
 
+TEST_METADATA.t_dtrace_contrib+=	required_memory="4g"
+
 .include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	Wed Aug 10 02:44:46 2016	(r303899)
+++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	Wed Aug 10 03:10:34 2016	(r303900)
@@ -53,4 +53,6 @@ CFILES= \
 
 
 
+TEST_METADATA.t_dtrace_contrib+=	required_memory="4g"
+
 .include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Wed Aug 10 02:44:46 2016	(r303899)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Wed Aug 10 03:10:34 2016	(r303900)
@@ -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