Fix global_exit_code. (#28)
There were two bugs in the code:
* global_exit_code was always set to task.exit_code, so that if a passing task was executed after a failing task, global_exit_code was reset to 0.
* If we are in the last iteration on the loop, and the task didn't succeed, we still create a new task. Then, we set global_exit_code to task.exit_code, which is None.
diff --git a/gtest-parallel b/gtest-parallel
index 247c005..4f5f91b 100755
--- a/gtest-parallel
+++ b/gtest-parallel
@@ -217,7 +217,7 @@
self.failed.append(task)
def run_task(self, task):
- for _ in range(options.retry_failed + 1):
+ for try_number in range(options.retry_failed + 1):
self.__register_start(task)
task.run()
self.__register_exit(task)
@@ -225,13 +225,15 @@
if task.exit_code == 0:
break
- # We need create a new Task instance. Each task represents a single test
- # execution, with its own runtime, exit code and log file.
- task = Task(task.test_binary, task.test_name, task.test_command,
- task.last_execution_time, task.output_dir)
+ if try_number < options.retry_failed:
+ # We need create a new Task instance. Each task represents a single test
+ # execution, with its own runtime, exit code and log file.
+ task = Task(task.test_binary, task.test_name, task.test_command,
+ task.last_execution_time, task.output_dir)
with self.lock:
- self.global_exit_code = task.exit_code
+ if task.exit_code != 0:
+ self.global_exit_code = task.exit_code
class FilterFormat(object):
