Skip to content

Commit a32c619

Browse files
authored
Revert dynamic test target calculation (youtube#5130)
Partial revert of youtube#4464, as it currently doesn't reliably find all changed tests. Also - dynamic calculation should always be bypassed for post-submits b/382508397
1 parent 0cb7af6 commit a32c619

5 files changed

Lines changed: 95 additions & 13 deletions

File tree

‎.github/actions/build/action.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@ runs:
4040
changed_files_json=$(jq -nc '$ARGS.positional' --args ${changed_files[@]})
4141
echo "changed_files_json=${changed_files_json}" >> $GITHUB_OUTPUT
4242
shell: bash
43+
# TODO(b/382508397): Replace hardcoded list with dynamically generated one.
4344
- name: Calculate test targets
4445
if: matrix.config == 'devel' && inputs.test_root_target != 'null'
4546
id: calculate-test-targets
4647
env:
4748
CHANGED_FILES_JSON: ${{ steps.changed-files.outputs.changed_files_json }}
4849
ROOT_TARGET: ${{ inputs.test_root_target }}
50+
STATIC_TEST_TARGETS_JSON_FILE: cobalt/build/testing/targets/${{ matrix.platform }}/test_targets.json
4951
TEST_TARGETS_JSON_FILE: out/${{ matrix.platform }}_${{ matrix.config }}/test_targets.json
52+
DYN_TEST_TARGETS_JSON_FILE: out/${{ matrix.platform }}_${{ matrix.config }}/dyn_targets.json
5053
run: |
5154
set -x
5255
cd src
@@ -63,7 +66,10 @@ runs:
6366
--root-target "${ROOT_TARGET}" \
6467
${changed_files_arg} \
6568
--gn-json gn_desc.json \
66-
--json-output > "${TEST_TARGETS_JSON_FILE}"
69+
--json-output > "${DYN_TEST_TARGETS_JSON_FILE}"
70+
71+
# Currently, override with static test targets, TODO(b/382508397)
72+
cp -av "${STATIC_TEST_TARGETS_JSON_FILE}" "${TEST_TARGETS_JSON_FILE}"
6773
6874
echo "test_targets_json_file=${TEST_TARGETS_JSON_FILE}" >> $GITHUB_OUTPUT
6975
@@ -73,6 +79,13 @@ runs:
7379
test_targets_count=$(echo ${test_targets_json} | jq -cr 'length')
7480
echo "test_targets_count=${test_targets_count}" >> $GITHUB_OUTPUT
7581
shell: bash
82+
- name: Archive test target results
83+
uses: actions/upload-artifact@v4
84+
with:
85+
name: ${{ matrix.platform }} Test targets
86+
path: |
87+
src/out/${{ matrix.platform }}_${{ matrix.config }}/test_targets.json
88+
src/out/${{ matrix.platform }}_${{ matrix.config }}/dyn_targets.json
7689
- name: Ninja build test targets
7790
if: ${{ matrix.config == 'devel' && fromJSON(steps.calculate-test-targets.outputs.test_targets_count || 0) > 0 }}
7891
id: build-test-targets

‎cobalt/build/testing/targets/android-arm/test_targets.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
{
22
"TODO(b/382508397)": "Remove this when list is dynamically generated.",
33
"test_targets": [
4+
"base:base_perftests",
5+
"base:base_unittests",
6+
"cobalt:cobalt_unittests",
47
"media/midi:midi_unittests",
8+
"mojo:mojo_perftests",
9+
"mojo:mojo_unittests",
10+
"net:net_unittests",
511
"skia:skia_unittests",
612
"sql:sql_unittests",
13+
"starboard/nplb:nplb",
14+
"third_party/blink/renderer/platform:blink_platform_perftests",
15+
"third_party/blink/renderer/platform:blink_platform_unittests",
16+
"third_party/blink/renderer/platform/heap:blink_heap_perftests",
17+
"third_party/blink/renderer/platform/heap:blink_heap_unittests",
18+
"third_party/blink/renderer/platform/wtf:wtf_unittests",
19+
"third_party/boringssl:boringssl_crypto_tests",
20+
"third_party/boringssl:boringssl_ssl_tests",
21+
"third_party/perfetto:perfetto_unittests",
22+
"third_party/perfetto:trace_processor_minimal_smoke_tests",
23+
"third_party/zlib:zlib_unittests",
724
"url:url_perftests",
825
"url:url_unittests"
926
]

‎cobalt/build/testing/targets/android-arm64/test_targets.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
{
22
"TODO(b/382508397)": "Remove this when list is dynamically generated.",
33
"test_targets": [
4+
"base:base_perftests",
5+
"base:base_unittests",
6+
"cobalt:cobalt_unittests",
47
"media/midi:midi_unittests",
8+
"mojo:mojo_perftests",
9+
"mojo:mojo_unittests",
10+
"net:net_unittests",
511
"skia:skia_unittests",
612
"sql:sql_unittests",
13+
"starboard/nplb:nplb",
14+
"third_party/blink/renderer/platform:blink_platform_perftests",
15+
"third_party/blink/renderer/platform:blink_platform_unittests",
16+
"third_party/blink/renderer/platform/heap:blink_heap_perftests",
17+
"third_party/blink/renderer/platform/heap:blink_heap_unittests",
18+
"third_party/blink/renderer/platform/wtf:wtf_unittests",
19+
"third_party/boringssl:boringssl_crypto_tests",
20+
"third_party/boringssl:boringssl_ssl_tests",
21+
"third_party/perfetto:perfetto_unittests",
22+
"third_party/perfetto:trace_processor_minimal_smoke_tests",
23+
"third_party/zlib:zlib_unittests",
724
"url:url_perftests",
825
"url:url_unittests"
926
]
Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"TODO(b/382508397)": "Remove this when list is dynamically generated.",
33
"test_targets": [
4+
"base:base_perftests",
45
"base:base_unittests",
56
"cc:cc_perftests",
67
"cc:cc_unittests",
@@ -9,61 +10,90 @@
910
"components/viz:viz_unittests",
1011
"crypto:crypto_unittests",
1112
"device:device_unittests",
12-
"google_apis/gcm:gcm_unit_tests",
1313
"google_apis:google_apis_unittests",
14-
"gpu/gles2_conform_support:gles2_conform_test",
14+
"google_apis/gcm:gcm_unit_tests",
1515
"gpu:command_buffer_perftests",
1616
"gpu:gl_tests",
1717
"gpu:gpu_benchmark",
1818
"gpu:gpu_perftests",
1919
"gpu:gpu_unittests",
20+
"gpu/gles2_conform_support:gles2_conform_test",
2021
"ipc:ipc_tests",
21-
"media/capture:capture_unittests",
2222
"media:media_unittests",
23+
"media/capture:capture_unittests",
2324
"media/midi:midi_unittests",
2425
"mojo:mojo_perftests",
26+
"mojo:mojo_unittests",
27+
"net:net_unittests",
2528
"ppapi:ppapi_perftests",
2629
"ppapi:ppapi_unittests",
2730
"services/service_manager/tests:service_manager_unittests",
2831
"skia:skia_unittests",
2932
"sql:sql_unittests",
3033
"starboard:starboard_unittests",
34+
"starboard/nplb:nplb",
35+
"third_party/blink/renderer/platform:blink_platform_nocompile_tests",
36+
"third_party/blink/renderer/platform:blink_platform_perftests",
37+
"third_party/blink/renderer/platform:blink_platform_unittests",
38+
"third_party/blink/renderer/platform/heap:blink_heap_perftests",
39+
"third_party/blink/renderer/platform/heap:blink_heap_unittests",
40+
"third_party/blink/renderer/platform/wtf:wtf_unittests",
41+
"third_party/boringssl:boringssl_crypto_tests",
42+
"third_party/boringssl:boringssl_ssl_tests",
43+
"third_party/perfetto:perfetto_unittests",
44+
"third_party/perfetto:trace_processor_minimal_smoke_tests",
45+
"third_party/zlib:zlib_unittests",
3146
"ui/ozone:ozone_unittests",
47+
"ui/wm:wm_unittests",
3248
"url:url_perftests",
33-
"url:url_unittests",
34-
"starboard/nplb:nplb"
49+
"url:url_unittests"
3550
],
3651
"executables": [
52+
"out/linux-x64x11_devel/base_perftests",
3753
"out/linux-x64x11_devel/base_unittests",
54+
"out/linux-x64x11_devel/blink_heap_perftests",
55+
"out/linux-x64x11_devel/blink_heap_unittests",
56+
"out/linux-x64x11_devel/blink_platform_nocompile_tests",
57+
"out/linux-x64x11_devel/blink_platform_perftests",
58+
"out/linux-x64x11_devel/blink_platform_unittests",
59+
"out/linux-x64x11_devel/boringssl_crypto_tests",
60+
"out/linux-x64x11_devel/boringssl_ssl_tests",
61+
"out/linux-x64x11_devel/capture_unittests",
3862
"out/linux-x64x11_devel/cc_perftests",
3963
"out/linux-x64x11_devel/cc_unittests",
4064
"out/linux-x64x11_devel/cobalt_unittests",
41-
"out/linux-x64x11_devel/viz_perftests",
42-
"out/linux-x64x11_devel/viz_unittests",
65+
"out/linux-x64x11_devel/command_buffer_perftests",
4366
"out/linux-x64x11_devel/crypto_unittests",
4467
"out/linux-x64x11_devel/device_unittests",
4568
"out/linux-x64x11_devel/gcm_unit_tests",
46-
"out/linux-x64x11_devel/google_apis_unittests",
47-
"out/linux-x64x11_devel/gles2_conform_test",
48-
"out/linux-x64x11_devel/command_buffer_perftests",
4969
"out/linux-x64x11_devel/gl_tests",
70+
"out/linux-x64x11_devel/gles2_conform_test",
71+
"out/linux-x64x11_devel/google_apis_unittests",
5072
"out/linux-x64x11_devel/gpu_benchmark",
5173
"out/linux-x64x11_devel/gpu_perftests",
5274
"out/linux-x64x11_devel/gpu_unittests",
5375
"out/linux-x64x11_devel/ipc_tests",
54-
"out/linux-x64x11_devel/capture_unittests",
5576
"out/linux-x64x11_devel/media_unittests",
5677
"out/linux-x64x11_devel/midi_unittests",
5778
"out/linux-x64x11_devel/mojo_perftests",
79+
"out/linux-x64x11_devel/mojo_unittests",
80+
"out/linux-x64x11_devel/net_unittests",
81+
"out/linux-x64x11_devel/nplb",
5882
"out/linux-x64x11_devel/ozone_unittests",
83+
"out/linux-x64x11_devel/perfetto_unittests",
5984
"out/linux-x64x11_devel/ppapi_perftests",
6085
"out/linux-x64x11_devel/ppapi_unittests",
6186
"out/linux-x64x11_devel/service_manager_unittests",
6287
"out/linux-x64x11_devel/skia_unittests",
6388
"out/linux-x64x11_devel/sql_unittests",
6489
"out/linux-x64x11_devel/starboard_unittests",
90+
"out/linux-x64x11_devel/trace_processor_minimal_smoke_tests",
6591
"out/linux-x64x11_devel/url_perftests",
6692
"out/linux-x64x11_devel/url_unittests",
67-
"out/linux-x64x11_devel/nplb"
93+
"out/linux-x64x11_devel/viz_perftests",
94+
"out/linux-x64x11_devel/viz_unittests",
95+
"out/linux-x64x11_devel/wm_unittests",
96+
"out/linux-x64x11_devel/wtf_unittests",
97+
"out/linux-x64x11_devel/zlib_unittests"
6898
]
6999
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"failing_tests": [
3+
"*"
4+
]
5+
}

0 commit comments

Comments
 (0)