encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUILD.gn: Move dawn_end2end_tests to its final location 

Bug: chromium:1064305
Change-Id: Ie51377301117a8ffbc6c21dc4c58349871bcf232
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/19285
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2020-04-13 21:23:46 +00:00 committed by Commit Bot service account
parent 582e5284d0
commit 8c8d16a1c5
2 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
BUILD.gn
View File

@ -27,57 +27,6 @@ group("all") {
}
}
###############################################################################
# Temporary Dawn end2end test target
###############################################################################
# It is not possible to move a target around with a proxy group without
# breaking swarming tests. This is a temporary target that is a duplicate of
# //src/tests:dawn_end2end_tests that's used temporarily so that we can land
# the split of src/tests/BUILD.gn in a Chromium roll and switch which targets
# the swarmed tests use.
import("//testing/test.gni")
test("dawn_end2end_tests") {
configs += [ "src/common:dawn_internal" ]
deps = [
"src/common",
"src/dawn:dawncpp",
"src/dawn:libdawn_proc",
"src/dawn_native",
"src/dawn_wire",
"src/tests:dawn_end2end_tests_sources",
"src/tests:dawn_white_box_tests_sources",
"src/tests:gmock_and_gtest",
"src/utils:dawn_utils",
]
sources = [
"src/tests/DawnTest.cpp",
"src/tests/DawnTest.h",
]
libs = []
# When building inside Chromium, use their gtest main function because it is
# needed to run in swarming correctly.
if (build_with_chromium) {
sources += [ "//gpu/dawn_end2end_tests_main.cc" ]
} else {
sources += [ "src/tests/End2EndTestsMain.cpp" ]
}
if (dawn_enable_opengl) {
deps += [ "src/utils:dawn_glfw" ]
}
if (is_chromeos) {
libs += [ "gbm" ]
}
}
###############################################################################
# Temporary groups
###############################################################################
@ -93,7 +42,7 @@ group("dawn_unittests_temp_group") {
group("dawn_end2end_tests_temp_group") {
testonly = true
public_deps = [
":dawn_end2end_tests",
"src/tests:dawn_end2end_tests",
]
}

40
src/tests/BUILD.gn
View File

@ -360,6 +360,7 @@ source_set("dawn_white_box_tests_sources") {
libs = []
}
# Temporary target that will be removed once Chromium switches to using the non-_tmp version below
test("dawn_end2end_tests_tmp") {
configs += [ "${dawn_root}/src/common:dawn_internal" ]
@ -399,6 +400,45 @@ test("dawn_end2end_tests_tmp") {
}
}
test("dawn_end2end_tests") {
configs += [ "${dawn_root}/src/common:dawn_internal" ]
deps = [
":dawn_end2end_tests_sources",
":dawn_white_box_tests_sources",
":gmock_and_gtest",
"${dawn_root}/src/common",
"${dawn_root}/src/dawn:dawncpp",
"${dawn_root}/src/dawn:libdawn_proc",
"${dawn_root}/src/dawn_native",
"${dawn_root}/src/dawn_wire",
"${dawn_root}/src/utils:dawn_utils",
]
sources = [
"DawnTest.cpp",
"DawnTest.h",
]
libs = []
# When building inside Chromium, use their gtest main function because it is
# needed to run in swarming correctly.
if (build_with_chromium) {
sources += [ "//gpu/dawn_end2end_tests_main.cc" ]
} else {
sources += [ "End2EndTestsMain.cpp" ]
}
if (dawn_enable_opengl) {
deps += [ "${dawn_root}/src/utils:dawn_glfw" ]
}
if (is_chromeos) {
libs += [ "gbm" ]
}
}
###############################################################################
# Dawn perf tests
###############################################################################