From cbf07f70e27c061f7e9569252e9afa7d0791158b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Fri, 29 Apr 2022 11:23:05 +0000 Subject: [PATCH] Revert "Fork //base/test/google_test_runner" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 166650ada7ce6aa503bfab77dcbd7f0835b238b2. Reason for revert: Seems to break downstream on-device ios tests. Original change's description: > Fork //base/test/google_test_runner > > (Used to run gtests on iOS, but we don't want to depend on //base.) > > Optimistically try to use the existing partial fork > > Bug: webrtc:13402 > Change-Id: I10528670862f2db67e77adb73b8a71b19642666d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260328 > Commit-Queue: Björn Terelius > Reviewed-by: Mirko Bonadei > Cr-Commit-Position: refs/heads/main@{#36703} Bug: webrtc:13402 Change-Id: I5bef679e95693b7a6942375801daf9273d260e1d No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260462 Auto-Submit: Björn Terelius Reviewed-by: Christoffer Jansson Owners-Override: Björn Terelius Commit-Queue: Björn Terelius Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Cr-Commit-Position: refs/heads/main@{#36705} --- webrtc.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc.gni b/webrtc.gni index 421acd1cea..d52497d151 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -498,10 +498,10 @@ template("rtc_test") { ] } - # Build //test:test_support when the test is not a real XCTest. + # Build //base/test:google_test_runner when the test is not a real XCTest. if (is_ios && rtc_include_tests) { if (!defined(invoker.is_xctest) || !invoker.is_xctest) { - xctest_module_target = "//test:test_support" + xctest_module_target = "//base/test:google_test_runner" } }