Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision 8804701d6eb68457e9a8eddaf374665aeac82dad)
+++ src/tests/test.py	(revision f97b614325a35dd584678cf2143cd1981af1bde8)
@@ -168,30 +168,34 @@
 
 def run_test_instance(t, generate, dry_run, debug) :
-	# print formated name
-	name_txt = "%20s  " % t.name
-
-	#run the test instance and collect the result
-	test_failed, error = run_single_test(t, generate, dry_run, debug)
-
-	# update output based on current action
-	if generate :
-		failed_txt = "ERROR"
-		success_txt = "Done"
-	else :
-		failed_txt = "FAILED"
-		success_txt = "PASSED"
-
-	#print result with error if needed
-	text = name_txt + (failed_txt if test_failed else success_txt)
-	out = sys.stdout
-	if error :
-		text = text + "\n" + error
-		out = sys.stderr
-
-	print(text, file = out);
-	sys.stdout.flush()
-	sys.stderr.flush()
-
-	return test_failed
+	try :
+		# print formated name
+		name_txt = "%20s  " % t.name
+
+		#run the test instance and collect the result
+		test_failed, error = run_single_test(t, generate, dry_run, debug)
+
+		# update output based on current action
+		if generate :
+			failed_txt = "ERROR"
+			success_txt = "Done"
+		else :
+			failed_txt = "FAILED"
+			success_txt = "PASSED"
+
+		#print result with error if needed
+		text = name_txt + (failed_txt if test_failed else success_txt)
+		out = sys.stdout
+		if error :
+			text = text + "\n" + error
+			out = sys.stderr
+
+		print(text, file = out);
+		sys.stdout.flush()
+		sys.stderr.flush()
+		return test_failed
+	
+	except KeyboardInterrupt:
+		test_failed = True
+
 
 # run the given list of tests with the given parameters
@@ -209,5 +213,6 @@
 	pool = Pool(jobs)
 	try :
-		results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(99999999)
+		results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests )
+		results.get(9999)
 	except KeyboardInterrupt:
 		pool.terminate()