From owner-svn-src-user@freebsd.org Wed Jul 25 09:40:12 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3A141045F62 for ; Wed, 25 Jul 2018 09:40:12 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E7F377075; Wed, 25 Jul 2018 09:40:12 +0000 (UTC) (envelope-from pho@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C9C9187BA; Wed, 25 Jul 2018 09:40:12 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6P9eCNk063448; Wed, 25 Jul 2018 09:40:12 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6P9eBrR063446; Wed, 25 Jul 2018 09:40:11 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201807250940.w6P9eBrR063446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 25 Jul 2018 09:40:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r336705 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 336705 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2018 09:40:13 -0000 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; } }