diff options
| -rwxr-xr-x | acprep | 2 | ||||
| -rwxr-xr-x | test/GenerateTests.py | 3 | ||||
| -rwxr-xr-x | test/RegressTests.py | 5 |
3 files changed, 6 insertions, 4 deletions
@@ -1412,7 +1412,7 @@ class PrepareBuild(CommandLineApp): else: make_args.append(arg) - if self.options.jobs > 1: + if self.options.jobs > 1 and self.current_flavor != 'gcov': make_args.append('-j%d' % self.options.jobs) make_args.append('JOBS=%d' % self.options.jobs) diff --git a/test/GenerateTests.py b/test/GenerateTests.py index 61c31f5d..79c7ae04 100755 --- a/test/GenerateTests.py +++ b/test/GenerateTests.py @@ -138,8 +138,7 @@ else: pool = None if pool: - harness.failed = sum(pool.map(run_gen_test, - range(beg_range, end_range))) + harness.failed = sum(pool.map(run_gen_test, range(beg_range, end_range))) else: for i in range(beg_range, end_range): run_gen_test(i) diff --git a/test/RegressTests.py b/test/RegressTests.py index f693bf5b..2d8ef8e8 100755 --- a/test/RegressTests.py +++ b/test/RegressTests.py @@ -179,7 +179,10 @@ if __name__ == '__main__': if os.path.isdir(tests): tests = [os.path.join(tests, x) for x in os.listdir(tests) if x.endswith('.test')] - harness.failed = sum(pool.map(do_test, tests, 1)) + if pool: + harness.failed = sum(pool.map(do_test, tests, 1)) + else: + harness.failed = sum(map(do_test, tests)) else: entry = RegressFile(tests) entry.run_tests() |