Skip to content

Commit

Permalink
X11: refactor DWTHX11 tests and move them to right places
Browse files Browse the repository at this point in the history 
This also adds a xwmstartupcheck program that resolves
the race between bringing up openbox and starting tests.

That is, we tried to enable the program for all the tests,
but after having a couple of tries, it turned out that
it's not trivial to figure out correct bots to use that.
In the end, the xvfb script fails because it is unable
to find that small program. Thus, it was decided that
only the x11_unittests target will depend on that program,
and once dpranke@ reworks the test() template, we will
rework the solution so that all the tests that use
x11 will use that small program to ensure there is not
race between the openbox and the tests.

Bug: 990756
Change-Id: I5b1a8504e54fc4f3a2172978e9d4604145d56847
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2228652
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#778692}
  • Loading branch information
@msisov
msisov authored and Commit Bot committed Jun 16, 2020
1 parent f426830 commit a4d1cfb
Show file tree
Hide file tree
Showing 18 changed files with 1,511 additions and 685 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ group("gn_all") {
}

if (use_x11 || ozone_platform_x11) {
deps += [ "//tools/xdisplaycheck" ]
deps += [ "//ui/platform_window/x11:x11_unittests" ]
}

if (is_win) {
Expand Down
7 changes: 5 additions & 2 deletions PRESUBMIT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@
r"^ui[\\/]gl[\\/].*\.cc$",
r"^media[\\/]gpu[\\/].*\.cc$",
r"^gpu[\\/].*\.cc$",
),
r"^ui[\\/]base[\\/]x[\\/]xwmstartupcheck[\\/]xwmstartupcheck\.cc$",
),
),
(
r'/XInternAtom|xcb_intern_atom',
Expand Down Expand Up @@ -2512,7 +2513,9 @@ def _CheckSpamLogging(input_api, output_api):
r"^tools[\\/]",
r"^ui[\\/]base[\\/]resource[\\/]data_pack.cc$",
r"^ui[\\/]aura[\\/]bench[\\/]bench_main\.cc$",
r"^ui[\\/]ozone[\\/]platform[\\/]cast[\\/]"))
r"^ui[\\/]ozone[\\/]platform[\\/]cast[\\/]",
r"^ui[\\/]base[\\/]x[\\/]xwmstartupcheck[\\/]"
r"xwmstartupcheck\.cc$"))
source_file_filter = lambda x: input_api.FilterSourceFile(
x, white_list=file_inclusion_pattern, black_list=black_list)

Expand Down
247 changes: 247 additions & 0 deletions testing/buildbot/chromium.ci.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43917,6 +43917,27 @@
},
"test": "viz_unittests",
"test_id_prefix": "ninja://components/viz:viz_unittests/"
},
{
"args": [
"--ozone-platform=x11"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "x11_unittests_x11",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
}
]
},
Expand Down Expand Up @@ -47830,6 +47851,24 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"isolate_profile_data": true,
"merge": {
Expand Down Expand Up @@ -49796,6 +49835,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -99390,6 +99446,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -101195,6 +101268,26 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"args": [
"--test-launcher-print-test-stdio=always"
Expand Down Expand Up @@ -102745,6 +102838,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -104304,6 +104414,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -105830,6 +105957,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -107389,6 +107533,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -108948,6 +109109,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -129533,6 +129711,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -230656,6 +230851,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down Expand Up @@ -232687,6 +232899,24 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"isolate_profile_data": true,
"merge": {
Expand Down Expand Up @@ -236058,6 +236288,23 @@
"test": "wtf_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "x11_unittests",
"test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
},
{
"merge": {
"args": [],
Expand Down
Loading

0 comments on commit a4d1cfb

Please sign in to comment.