Skip to content

Commit 2a64eb3

Browse files
szuendDevtools-frontend LUCI CQ
authored andcommitted
[build] Don't build e2e tests and web test runner for release resources
This CL does two things: 1) It splits out the 'test/' directory and the web test resources from 'devtools_frontend_resources'. This means just building Chrome won't build DevTools' e2e tests or the web test runner. We still include them in `devtools_all_files`, which should be enough for the web tests upstream. 2) We no longer include the integration_test_runner.html and the web test runner JS bundle in the DevTools release bundle. As web tests host DevTools via apache, we don't actually have to ship these files. Note that unittests are still built as part of 'devtools_frontend_resources' as the TS indexer pulls them in. We'll look into fixing that separately. [email protected], [email protected] Bug: 382387670 Change-Id: Ia4928453889de1a9b09dc880d9479fdc0419b375 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6448691 Reviewed-by: Philip Pfaffe <[email protected]> Commit-Queue: Simon Zünd <[email protected]>
1 parent 1b67a72 commit 2a64eb3

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

BUILD.gn

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import("./third_party/blink/public/public_features.gni")
1616
devtools_frontend_resources_deps = [
1717
":favicon",
1818
"front_end",
19-
"test",
2019
]
2120

2221
group("devtools_all_files") {
@@ -25,7 +24,11 @@ group("devtools_all_files") {
2524
# This enables us to test bots with whitespace changes.
2625
"scripts/whitespaces.txt",
2726
]
28-
data_deps = devtools_frontend_resources_deps
27+
28+
data_deps = devtools_frontend_resources_deps + [
29+
"front_end:web_test_resources",
30+
"test",
31+
]
2932

3033
public_deps = [ "front_end/ui/components/docs" ]
3134
}

config/gni/devtools_grd_files.gni

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,7 @@ grd_files_release_sources = [
374374
"front_end/entrypoints/wasmparser_worker/wasmparser_worker.js",
375375
"front_end/entrypoints/worker_app/worker_app.js",
376376
"front_end/inspector.html",
377-
"front_end/integration_test_runner.html",
378377
"front_end/js_app.html",
379-
"front_end/legacy_test_runner/legacy_test_runner.js",
380-
"front_end/legacy_test_runner/test_runner/test_runner.js",
381378
"front_end/models/ai_assistance/ai_assistance.js",
382379
"front_end/models/autofill_manager/autofill_manager.js",
383380
"front_end/models/bindings/bindings.js",
@@ -983,7 +980,6 @@ grd_files_debug_sources = [
983980
"front_end/generated/InspectorBackendCommands.js",
984981
"front_end/generated/SupportedCSSProperties.js",
985982
"front_end/generated/protocol.js",
986-
"front_end/legacy_test_runner/test_runner/TestRunner.js",
987983
"front_end/models/ai_assistance/AgentProject.js",
988984
"front_end/models/ai_assistance/AiHistoryStorage.js",
989985
"front_end/models/ai_assistance/ChangeManager.js",

front_end/BUILD.gn

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ group("front_end") {
1414
":devtools_json",
1515
":embedder-scripts",
1616
":html_entrypoints",
17-
":integration_test_runner",
1817
"Images",
1918
"core/i18n/locales",
2019
"entrypoints/device_mode_emulation_frame",
@@ -30,7 +29,6 @@ group("front_end") {
3029
"entrypoints/shell",
3130
"entrypoints/wasmparser_worker:worker_entrypoint",
3231
"entrypoints/worker_app:entrypoint",
33-
"legacy_test_runner",
3432
"third_party/vscode.web-custom-data:web_custom_data",
3533
]
3634
}
@@ -42,10 +40,18 @@ copy_to_gen_with_grd("color_tokens") {
4240
]
4341
}
4442

45-
copy_to_gen_with_grd("integration_test_runner") {
43+
copy_to_gen("integration_test_runner") {
4644
sources = [ "integration_test_runner.html" ]
4745
}
4846

47+
group("web_test_resources") {
48+
public_deps = [
49+
":integration_test_runner",
50+
"legacy_test_runner",
51+
]
52+
data_deps = public_deps
53+
}
54+
4955
node_action("devtools_json") {
5056
inputs = []
5157

0 commit comments

Comments
 (0)