From owner-svn-src-user@freebsd.org Sat Mar 12 17:06:46 2016 Return-Path: Delivered-To: svn-src-user@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 C6DF5ACEA52 for ; Sat, 12 Mar 2016 17:06:46 +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 mx1.freebsd.org (Postfix) with ESMTPS id 69CDDA3A; Sat, 12 Mar 2016 17:06:46 +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 u2CH6jrE033812; Sat, 12 Mar 2016 17:06:45 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CH6j60033811; Sat, 12 Mar 2016 17:06:45 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201603121706.u2CH6j60033811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 12 Mar 2016 17:06:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r296726 - user/pho/stress2/misc X-SVN-Group: user 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.21 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: Sat, 12 Mar 2016 17:06:46 -0000 Author: pho Date: Sat Mar 12 17:06:45 2016 New Revision: 296726 URL: https://svnweb.freebsd.org/changeset/base/296726 Log: Return error status if test fails. Sponsored by: EMC / Isilon Storage Division Modified: user/pho/stress2/misc/pts.sh Modified: user/pho/stress2/misc/pts.sh ============================================================================== --- user/pho/stress2/misc/pts.sh Sat Mar 12 17:05:24 2016 (r296725) +++ user/pho/stress2/misc/pts.sh Sat Mar 12 17:06:45 2016 (r296726) @@ -37,20 +37,26 @@ here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > pts.c -mycc -o pts -Wall -Wextra -O2 pts.c -lutil +mycc -o pts -Wall -Wextra -O2 pts.c -lutil || exit 1 rm -f pts.c /tmp/pts & +pid=$! while kill -0 $! 2>/dev/null; do - $here/../testcases/swap/swap -t 2m -i 20 + $here/../testcases/swap/swap -t 2m -i 20 > /dev/null done -wait +wait $pid +status=$? rm -f /tmp/pts -exit 0 +exit $status EOF #include +#include +#include +#include + #include #include #include @@ -60,19 +66,20 @@ EOF #include #include #include -#include -#include -#include #include +#include #include +#define LOOPS 10 +#define RUNTIME 60 + void churn(char *path) { - FTS *fts; FTSENT *p; - int fd, ftsoptions, i; + time_t start; + int fd, ftsoptions; char *args[2]; ftsoptions = FTS_PHYSICAL; @@ -80,7 +87,8 @@ churn(char *path) args[1] = 0; setproctitle("churn"); - for (i = 0; i < 5000; i++) { + start = time(NULL); + while (time(NULL) - start < RUNTIME) { if ((fts = fts_open(args, ftsoptions, NULL)) == NULL) err(1, "fts_open"); @@ -105,13 +113,15 @@ churn(char *path) void pty(void) { - int i, master, slave; + time_t start; + int master, slave; char slname[1025]; - setproctitle("pty"); - for (i = 0; i < 20000; i++) { + start = time(NULL); + while (time(NULL) - start < RUNTIME) { if (openpty(&master, &slave, slname, NULL, NULL) == -1) err(1, "openpty"); + usleep(arc4random() % 10000); if (close(master) == -1) err(1, "close(master)"); if (close(slave) == -1) @@ -123,9 +133,10 @@ pty(void) int main(void) { - int i, j; + int i, j, s, status; - for (j = 0; j < 10; j++) { + status = 0; + for (j = 0; j < LOOPS && status == 0; j++) { for (i = 0; i < 2; i++) { if (fork() == 0) pty(); @@ -134,9 +145,12 @@ main(void) if (fork() == 0) churn("/dev/pts"); } - for (i = 0; i < 4; i++) - wait(NULL); + for (i = 0; i < 4; i++) { + wait(&s); + if (s != 0) + status = 1; + } } - return (0); + return (status); }