Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions tests/gtest_parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ def run(self):
try:
self.exit_code = sigint_handler.wait(task)
except sigint_handler.ProcessWasInterrupted:
self.runtime_ms = int(1000 * (time.time() - begin))
thread.exit()
self.runtime_ms = int(1000 * (time.time() - begin))
self.last_execution_time = None if self.exit_code else self.runtime_ms
Expand Down Expand Up @@ -366,13 +367,27 @@ def move_to(self, destination_dir, tasks):
def print_tests(self, message, tasks, print_try_number):
self.out.permanent_line("%s (%s/%s):" %
(message, len(tasks), self.total_tasks))
is_interrupted = message == 'INTERRUPTED TESTS'
for task in sorted(tasks):
try_number_suffix = (
(" (try #%d)" % task.execution_number) if print_try_number else "")
if is_interrupted:
if task.runtime_ms is not None:
self.out.permanent_line(
"Interrupted: %d ms: %s %s%s" % (
task.runtime_ms, task.test_binary, task.test_name,
try_number_suffix))
else:
self.out.permanent_line(
"Interrupted: %s %s%s" % (
task.test_binary, task.test_name, try_number_suffix))
continue

runtime_ms = 'Interrupted'
if task.runtime_ms is not None:
runtime_ms = '%d ms' % task.runtime_ms
self.out.permanent_line("%11s: %s %s%s" % (
runtime_ms, task.test_binary, task.test_name,
(" (try #%d)" % task.execution_number) if print_try_number else ""))
runtime_ms, task.test_binary, task.test_name, try_number_suffix))

def log_exit(self, task):
with self.stdout_lock:
Expand Down
4 changes: 2 additions & 2 deletions tests/run-gtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ function run_test_parallel() {
args="--gtest_break_on_failure --gtest_catch_exceptions=0"
fi

# run with 60 min timeout
python ${SRC_TESTS_PATH}/gtest_parallel.py ${test_bins} --workers=${NPROC} ${args} --print_test_times --timeout=3600
# run with 90 min timeout
python ${SRC_TESTS_PATH}/gtest_parallel.py ${test_bins} --workers=${NPROC} ${args} --print_test_times --timeout=5400
}

set -e
Expand Down