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

[Peter Holm]

Author: pho
Date: Tue May 26 11:13:07 2015
New Revision: 283563
URL: https://svnweb.freebsd.org/changeset/base/283563

Log:
  Without a swap disk these tests will fail with "kstack allocation failed".
  
  Sponsored by:	 EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/pthread5.sh
  user/pho/stress2/misc/pthread7.sh

Modified: user/pho/stress2/misc/pthread5.sh
==============================================================================
--- user/pho/stress2/misc/pthread5.sh	Tue May 26 10:29:37 2015	(r283562)
+++ user/pho/stress2/misc/pthread5.sh	Tue May 26 11:13:07 2015	(r283563)
@@ -31,6 +31,7 @@
 # Stress shchan allocations.
 
 . ../default.cfg
+[ `swapinfo | wc -l` -eq 1 ] && exit 0 # kstack allocation failed
 
 here=`pwd`
 cd /tmp

Modified: user/pho/stress2/misc/pthread7.sh
==============================================================================
--- user/pho/stress2/misc/pthread7.sh	Tue May 26 10:29:37 2015	(r283562)
+++ user/pho/stress2/misc/pthread7.sh	Tue May 26 11:13:07 2015	(r283563)
@@ -31,6 +31,7 @@
 # PTHREAD_PRIO_INHERIT version of pthread2.sh
 
 . ../default.cfg
+[ `swapinfo | wc -l` -eq 1 ] && exit 0 # kstack allocation failed
 
 export LANG=C
 here=`pwd`
@@ -259,7 +260,7 @@ main(void)
 
 	signal(SIGINFO, hand);
 	signal(SIGALRM, ahand);
-	alarm(300);
+	alarm(400);
 	if ((rc = pthread_create(&tid[0], NULL, loop_create, NULL)) != 0)
 		errc(1, rc, "pthread_create()");
 	if ((rc = pthread_create(&tid[1], NULL, loop_rename, NULL)) != 0)