svn commit: r336705 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Wed Jul 25 09:40:11 2018
New Revision: 336705
URL: https://svnweb.freebsd.org/changeset/base/336705

Log:
  Limit runtime for tests.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/maxmemdom.sh
  user/pho/stress2/misc/mmap21.sh

Modified: user/pho/stress2/misc/maxmemdom.sh
==============================================================================
--- user/pho/stress2/misc/maxmemdom.sh	Wed Jul 25 04:33:56 2018	(r336704)
+++ user/pho/stress2/misc/maxmemdom.sh	Wed Jul 25 09:40:11 2018	(r336705)
@@ -43,7 +43,6 @@ d2=$diskimage.2
 rm -f $d1 $d2
 [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` -lt \
     $need ] && printf "Need %d MB on %s.\n" $need `dirname $diskimage` && exit
-dd if=/dev/zero of=$d1 bs=1m count=$size 2>&1 | \
-    egrep -v "records|transferred"
+timeout -k 1m 15m dd if=/dev/zero of=$d1 bs=1m count=$size status=none
 cp $d1 $d2
 rm -f $d1 $d2

Modified: user/pho/stress2/misc/mmap21.sh
==============================================================================
--- user/pho/stress2/misc/mmap21.sh	Wed Jul 25 04:33:56 2018	(r336704)
+++ user/pho/stress2/misc/mmap21.sh	Wed Jul 25 09:40:11 2018	(r336705)
@@ -141,8 +141,10 @@ main(void)
 {
 
 	pid_t pids[PARALLEL];
+	time_t start;
 	int e, i, j, status;
 
+	start = time(NULL);
 	for (i = 0; i < LOOPS; i++) {
 		for (j = 0; j < PARALLEL; j++) {
 			if ((pids[j] = fork()) == 0)
@@ -154,6 +156,10 @@ main(void)
 			if (waitpid(pids[j], &status, 0) == -1)
 				err(1, "waitpid(%d)", pids[j]);
 			e += status == 0 ? 0 : 1;
+		}
+		if (time(NULL) - start > 1200) {
+			fprintf(stderr, "Timed out.");
+			break;
 		}
 	}