diff --git a/BUILD.gn b/BUILD.gn index 01550a06c6..c41059f288 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -730,13 +730,13 @@ if (rtc_include_tests && !build_with_chromium) { testonly = true deps = [ #TODO(fxbug.dev/115601) - Enable when fixed - #"call:call_perf_tests", - #"video:video_pc_full_stack_tests", + "call:call_perf_tests", "modules/audio_coding:audio_coding_perf_tests", "modules/audio_processing:audio_processing_perf_tests", "pc:peerconnection_perf_tests", "test:test_main", "video:video_full_stack_tests", + "video:video_pc_full_stack_tests", ] data = webrtc_perf_tests_resources diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index f7b2be8f4a..8044a91264 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -317,7 +317,11 @@ "isolated_scripts": [ { "args": [ - "--nologs" + "--nologs", + "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json", + "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json", + "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json", + "--test-arg=--undefok=test_launcher_summary_output" ], "isolate_name": "fuchsia_perf_tests", "merge": { diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index a5fa018728..523614c862 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -51,6 +51,15 @@ } } }, + 'fuchsia-gtest-output': { + '$mixin_append': { + 'args': [ + '--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json', + '--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json', + '--test-arg=--undefok=test_launcher_summary_output' + ] + } + }, 'has_native_resultdb_integration': { 'resultdb': { 'enable': True, @@ -168,7 +177,10 @@ 'args': ['--test-suite', 'fuchsia_perf_tests'] }, '$mixin_append': { - 'args': ['--nologs'] + 'args': [ + '--nologs', + '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json' + ] } }, 'perf-low-bandwidth-audio-perf-test': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index e47cf73870..086edd3a9f 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -35,6 +35,17 @@ } } }, + # Hack to use the test-launcher-summary-output flag + emulator folders for gtest-output + # but it's currently the only way to get the file out of the emulator. + 'fuchsia-gtest-output': { + '$mixin_append': { + 'args': [ + '--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json', + '--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json', + '--test-arg=--undefok=test_launcher_summary_output' + ], + }, + }, 'ios-device-15.7': { 'swarming': { 'dimensions': { @@ -73,7 +84,10 @@ 'args': ['--test-suite', 'fuchsia_perf_tests'], }, '$mixin_append': { - 'args': ['--nologs'], + 'args': [ + '--nologs', + '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json', + ], }, }, 'perf-low-bandwidth-audio-perf-test': { diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index d6fd671169..f4c11d4c87 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -118,7 +118,7 @@ }, 'fuchsia_compatible_perf_tests': { 'fuchsia_perf_tests': { - 'mixins': ['perf-fuchsia-perf-tests'], + 'mixins': ['perf-fuchsia-perf-tests', 'fuchsia-gtest-output'], }, }, 'fuchsia_compatible_tests': {