From cb2b133bf0a9c014ebff2753e3f82175cbaf0eb3 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Wed, 16 Nov 2022 17:25:38 +0100 Subject: [PATCH] Ignore write-compiled-tests-json-to-writable-path flag. Change-Id: Ic084a9a1eb77bde1eda6439d7aafe1c208f0595d Bug: webrtc:14677 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283761 Owners-Override: Jeremy Leconte Commit-Queue: Jeremy Leconte Reviewed-by: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#38654} --- infra/specs/internal.client.webrtc.json | 44 ++++++++++++------------- infra/specs/mixins.pyl | 5 ++- infra/specs/mixins_webrtc.pyl | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json index c40ec54b3f..9769d99cad 100644 --- a/infra/specs/internal.client.webrtc.json +++ b/infra/specs/internal.client.webrtc.json @@ -6,7 +6,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -50,7 +50,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -95,7 +95,7 @@ "args": [ "--readline-timeout=1200", "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -142,7 +142,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -187,7 +187,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -231,7 +231,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -275,7 +275,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -319,7 +319,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -363,7 +363,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -407,7 +407,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -451,7 +451,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -555,7 +555,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -599,7 +599,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -644,7 +644,7 @@ "args": [ "--readline-timeout=1200", "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -691,7 +691,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -736,7 +736,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -780,7 +780,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -824,7 +824,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -868,7 +868,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -912,7 +912,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -956,7 +956,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", @@ -1000,7 +1000,7 @@ { "args": [ "--xctest", - "--undefok=enable-run-ios-unittests-with-xctest", + "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path", "--xcode-build-version", "13c100", "--out-dir", diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 47e4be5dda..e2887791a4 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -309,7 +309,10 @@ }, 'webrtc-xctest': { '$mixin_append': { - 'args': ['--xctest', '--undefok=enable-run-ios-unittests-with-xctest'] + 'args': [ + '--xctest', + '--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path' + ] } }, 'win10': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 4700c2c4dd..765d548233 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -248,7 +248,7 @@ '$mixin_append': { 'args': [ '--xctest', - '--undefok=enable-run-ios-unittests-with-xctest', + '--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path', ], }, },