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

[Peter Holm]

Author: pho
Date: Fri Dec  6 09:22:31 2013
New Revision: 259024
URL: http://svnweb.freebsd.org/changeset/base/259024

Log:
  Added timeout for tests.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/namecache.sh
  user/pho/stress2/misc/namecache2.sh

Modified: user/pho/stress2/misc/namecache.sh
==============================================================================
--- user/pho/stress2/misc/namecache.sh	Fri Dec  6 08:42:41 2013	(r259023)
+++ user/pho/stress2/misc/namecache.sh	Fri Dec  6 09:22:31 2013	(r259024)
@@ -74,6 +74,7 @@ dir=/tmp
 [ -d $dir ] || mkdir -p $dir
 cd $dir
 
+start=`date '+%s'`
 for i in `jot 30`; do
 	for j in `jot 10`; do
 		/tmp/namecache &
@@ -82,6 +83,7 @@ for i in `jot 30`; do
 	for j in `jot 10`; do
 		wait
 	done
+	[ $((`date '+%s'` - start)) -gt 1800 ] && break
 done
 
 if ls -l ${dir}/file.0* 2>&1 | egrep "file.0[0-9]" | grep -q "No such file"; then

Modified: user/pho/stress2/misc/namecache2.sh
==============================================================================
--- user/pho/stress2/misc/namecache2.sh	Fri Dec  6 08:42:41 2013	(r259023)
+++ user/pho/stress2/misc/namecache2.sh	Fri Dec  6 09:22:31 2013	(r259024)
@@ -137,6 +137,7 @@ main(void)
 	int result, fd;
 	unsigned int number;
 	struct timespec	period;
+	time_t start;
 
 	sprintf(filename1, "tfa0");
 	fd = open(filename1, O_CREAT, S_IRWXU);
@@ -152,6 +153,7 @@ main(void)
 	if (result < 0)
 		err(1, "pthread_create(): %s\n", strerror(result));
 
+	start = time(NULL);
 	for (number = 0; number < 0x001FFFFF; number += 2) {
 		sprintf(filename1, "tfa%u", number);
 		sprintf(filename2, "tfa%u", number + 1);
@@ -181,6 +183,10 @@ main(void)
 			nanosleep(&period, 0);
 			return 0;
 		}
+		if (time(NULL) - start > 600) {
+			fprintf(stderr, "Test timed out.\n");
+			break;
+		}
 	}
 	unlink(filename3);