From: bangerth Date: Fri, 10 Dec 2010 16:46:14 +0000 (+0000) Subject: Increase the timeout since we are on multicore systems. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65f014f1f1220195c72a6b97d4635da8e4132d3f;p=dealii-svn.git Increase the timeout since we are on multicore systems. git-svn-id: https://svn.dealii.org/trunk@22960 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/tests.h b/tests/tests.h index b1a4198ba0..c77a5d6f7f 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -114,12 +114,13 @@ set_grain_sizes; -// spawn a thread that terminates the program after a certain time -// given by the environment variable WALLTIME. this makes sure we -// don't let jobs that deadlock on some mutex hang around -// forever. note that this is orthogonal to using "ulimit" in -// Makefile.rules, which only affects CPU time and consequently works -// on infinite loops but not deadlocks +// spawn a thread that terminates the program after a certain time given by +// the environment variable WALLTIME (times a factor to account for the fact +// that we run on multicore systems where things may take longer). this makes +// sure we don't let jobs that deadlock on some mutex hang around +// forever. note that this is orthogonal to using "ulimit" in Makefile.rules, +// which only affects CPU time and consequently works on infinite loops but +// not deadlocks #ifdef DEAL_II_USE_MT struct DeadlockKiller @@ -136,7 +137,7 @@ struct DeadlockKiller conv >> delay; if (conv) { - sleep (delay); + sleep (delay*4); std::cerr << "Time's up: Killing job because it overran its allowed walltime" << std::endl; std::abort ();