From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 17 Dec 2010 14:10:20 +0000 (+0000)
Subject: Fiddling with a multiplier for the wait time doesn't seem to work. Rather use what... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15c25cb68e659334afe1c27ce0733974c4d7d4e4;p=dealii-svn.git

Fiddling with a multiplier for the wait time doesn't seem to work. Rather use what WALLTIME says, and set WALLTIME to one hour. Let's see if that works better.

git-svn-id: https://svn.dealii.org/trunk@22992 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/Makefile.rules b/tests/Makefile.rules
index e597c11d28..ec3d9a301a 100644
--- a/tests/Makefile.rules
+++ b/tests/Makefile.rules
@@ -84,7 +84,7 @@ endif
 	@echo =====Running======= $<
 	@echo Running > $(dir $@)/status
 	@$(ULIMIT) -t $(if $(ULIMIT_LIMIT),$(ULIMIT_LIMIT),300) ; \
-	  export WALLTIME=$(if $(ULIMIT_LIMIT),$(ULIMIT_LIMIT),300) ; \
+	  export WALLTIME=3600 ; \
 	  ./$< ; \
 	  if test ! $$? = 0 ; then rm $@ ; false ; fi
 	@perl -pi $(normalize)  $@
diff --git a/tests/tests.h b/tests/tests.h
index 4427d4087e..e7dcacc4fe 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -22,7 +22,6 @@
 #include <base/exceptions.h>
 #include <base/utilities.h>
 #include <base/thread_management.h>
-#include <base/multithread_info.h>
 #include <cmath>
 #include <fstream>
 #include <sstream>
@@ -116,9 +115,7 @@ set_grain_sizes;
 
 
 // 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 -- let's take 4*n_cpus as a factor). this makes
+// 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
@@ -142,7 +139,7 @@ struct DeadlockKiller
 	    conv >> delay;
 	    if (conv)
 	      {
-		sleep (delay*multithread_info.n_cpus*4);
+		sleep (delay);
 		std::cerr << "Time's up: Killing job because it overran its allowed walltime"
 			  << std::endl;
 		std::abort ();
@@ -158,8 +155,9 @@ struct DeadlockKiller
 					   // environment variable is
 					   // not set, so assume
 					   // infinite wait time and
-					   // simply quite this thread
-	  ;
+					   // simply quit this thread
+	  {
+	  }
       }
 
   public: