From 6d3f11c36604c124e0ab79c37921464e7dd7dfe7 Mon Sep 17 00:00:00 2001 From: pbos Date: Mon, 28 Dec 2015 13:11:05 -0800 Subject: [PATCH] Roll gtest-parallel. Brings in fix that prevents disabled parameterized tests from running by default. BUG=webrtc:5280 TBR=kjellander@webrtc.org Review URL: https://codereview.webrtc.org/1548373002 Cr-Commit-Position: refs/heads/master@{#11132} --- third_party/gtest-parallel/README.webrtc | 2 +- third_party/gtest-parallel/gtest-parallel | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/third_party/gtest-parallel/README.webrtc b/third_party/gtest-parallel/README.webrtc index e1c4b13833..7e7fdda48f 100644 --- a/third_party/gtest-parallel/README.webrtc +++ b/third_party/gtest-parallel/README.webrtc @@ -1,5 +1,5 @@ URL: https://github.com/google/gtest-parallel -Version: 8b2e48385942e947b14ac129f73c039802274390 +Version: 92eb6adf9df6eee34bb768b40af984e68e86d7cf License: Apache 2.0 License File: LICENSE diff --git a/third_party/gtest-parallel/gtest-parallel b/third_party/gtest-parallel/gtest-parallel index f2034b1eff..3e2fdb4ba8 100755 --- a/third_party/gtest-parallel/gtest-parallel +++ b/third_party/gtest-parallel/gtest-parallel @@ -307,14 +307,14 @@ for test_binary in binaries: if line[0] != " ": test_group = line.strip() continue - line = line.strip() - if not options.gtest_also_run_disabled_tests and 'DISABLED' in line: - continue + # Remove comments for parameterized tests and strip whitespace. line = line.split('#')[0].strip() if not line: continue test = test_group + line + if not options.gtest_also_run_disabled_tests and 'DISABLED_' in test: + continue tests.append((times.get_test_time(test_binary, test), test_binary, test, command))