Changes in src/tests/test.py [ced2e989:38736854]

File:

• src/tests/test.py (modified) (5 diffs)

src/tests/test.py

@@ -2 +2 @@
 from __future__ import print_function
 
-from functools import partial
-from multiprocessing import Pool
 from os import listdir, environ
 from os.path import isfile, join, splitext
@@ -104 +102 @@
 #               running test functions
 ################################################################################
-def run_single_test(test, generate, dry_run):
+def run_test_instance(test, generate, dry_run):
 
         # find the output file based on the test name and options flag
@@ -165 +163 @@
         return retcode, error
 
-def run_test_instance(t, generate, dry_run) :
-        # 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)
-
-        # 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
-
 # run the given list of tests with the given parameters
 def run_tests(tests, generate, dry_run, jobs) :
@@ -204 +174 @@
                 print( "Regenerate tests for: " )
 
-        # for each test to run
-        pool = Pool(jobs)
-        try :
-                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run), tests ).get(99999999)
-        except KeyboardInterrupt:
-                pool.terminate()
-                print("Tests interrupted by user")
-                sys.exit(1)
+        failed = False;
+        # for eeach test to run
+        for t in tests:
+                # print formated name
+                name_txt = "%20s  " % t.name
+
+                #run the test instance and collect the result
+                test_failed, error = run_test_instance(t, generate, dry_run)
+
+                # aggregate test suite result
+                failed = test_failed or failed
+
+                # 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()
+
 
         #clean the workspace
         sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
 
-        for failed in results:
-                if failed :
-                        return 1
-
-        return 0
+        return 1 if failed else 0
 
 ################################################################################
@@ -290 +279 @@
 
 # make sure we have a valid number of jobs that corresponds to user input
-options.jobs = int(make_max_jobs) if make_max_jobs else (options.jobs if options.jobs else 1)
+options.jobs = int(make_max_jobs) if make_max_jobs else options.jobs
 if options.jobs <= 0 :
         print('ERROR: Invalid number of jobs', file=sys.stderr)
         sys.exit(1)
 
-print('Running on %i cores' % options.jobs)
-
 # users may want to simply list the tests
 if options.list :