Skip to content

A
angle
Commit 4c9f892f by Jamie Madill Committed by Commit Bot
Options

Tests: Use script type in isolate map.

This makes trigger.py use the same code paths as the bots when they trigger standalone ANGLE tests. Fixes launching tests via trigger.py on Linux because of using the 'windowed_test_launcher' method that used xvfb. Bug: angleproject:5114 Change-Id: I073631270b5b69aac8f3f0f6378bd71f951ce8e6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2464425 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent c7dae0ea
Showing with 28 additions and 24 deletions
infra/gn_isolate_map.pyl
...@@ -27,49 +27,49 @@ ...@@ -27,49 +27,49 @@
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"angle_deqp_egl_tests": { "angle_deqp_egl_tests": {
"args": [],
"label": "//src/tests:angle_deqp_egl_tests", "label": "//src/tests:angle_deqp_egl_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_deqp_gles2_tests": { "angle_deqp_gles2_tests": {
"args": [],
"label": "//src/tests:angle_deqp_gles2_tests", "label": "//src/tests:angle_deqp_gles2_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_deqp_gles31_tests": { "angle_deqp_gles31_tests": {
"args": [],
"label": "//src/tests:angle_deqp_gles31_tests", "label": "//src/tests:angle_deqp_gles31_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_deqp_gles3_tests": { "angle_deqp_gles3_tests": {
"args": [],
"label": "//src/tests:angle_deqp_gles3_tests", "label": "//src/tests:angle_deqp_gles3_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_deqp_khr_gles2_tests": { "angle_deqp_khr_gles2_tests": {
"args": [],
"label": "//src/tests:angle_deqp_khr_gles2_tests", "label": "//src/tests:angle_deqp_khr_gles2_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_deqp_khr_gles3_tests": { "angle_deqp_khr_gles3_tests": {
"args": [],
"label": "//src/tests:angle_deqp_khr_gles3_tests", "label": "//src/tests:angle_deqp_khr_gles3_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_deqp_khr_gles31_tests": { "angle_deqp_khr_gles31_tests": {
"args": [],
"label": "//src/tests:angle_deqp_khr_gles31_tests", "label": "//src/tests:angle_deqp_khr_gles31_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_end2end_tests": { "angle_end2end_tests": {
"args": [],
"label": "//src/tests:angle_end2end_tests", "label": "//src/tests:angle_end2end_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_gles1_conformance_tests": { "angle_gles1_conformance_tests": {
"args": [],
"label": "//src/tests:angle_gles1_conformance_tests", "label": "//src/tests:angle_gles1_conformance_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_perftests": { "angle_perftests": {
"args": [ "args": [
...@@ -90,16 +90,17 @@ ...@@ -90,16 +90,17 @@
}, },
"angle_unittests": { "angle_unittests": {
"label": "//src/tests:angle_unittests", "label": "//src/tests:angle_unittests",
"type": "console_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_white_box_perftests": { "angle_white_box_perftests": {
"args": [],
"label": "//src/tests:angle_white_box_tests", "label": "//src/tests:angle_white_box_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
"angle_white_box_tests": { "angle_white_box_tests": {
"args": [],
"label": "//src/tests:angle_white_box_tests", "label": "//src/tests:angle_white_box_tests",
"type": "windowed_test_launcher", "script": "//scripts/run_gtest_angle_test.py",
"type": "script",
}, },
} }
scripts/run_gtest_angle_test.py
...@@ -35,7 +35,10 @@ import traceback ...@@ -35,7 +35,10 @@ import traceback
# //src/testing/scripts for importing common. # //src/testing/scripts for importing common.
d = os.path.dirname d = os.path.dirname
THIS_DIR = d(os.path.abspath(__file__)) THIS_DIR = d(os.path.abspath(__file__))
CHROMIUM_SRC_DIR = d(d(d(THIS_DIR))) ANGLE_SRC_DIR = d(THIS_DIR)
sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'testing'))
sys.path.insert(0, os.path.join(ANGLE_SRC_DIR, 'testing', 'scripts'))
CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'testing')) sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'testing'))
sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'testing', 'scripts')) sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'testing', 'scripts'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment