Skip to content

A
angle
Commit cafd7736 by Jamie Madill Committed by Commit Bot
Options

Fix KHR-GLES dEQP test paths.

Our GN was using the incorrect path for the new test sets. This was showing up as an isolate_tests failure when running the new tests. Also fixes incorrect search paths for the case list directory when used in a Chromium checkout. And adds a few other missing data dependencies. Bug: angleproject:3353 Change-Id: I602db1e5debdad88b6eace76416fc2c10c059f8b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1616021Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 4274cc46
Showing with 53 additions and 43 deletions
src/tests/BUILD.gn
...@@ -846,7 +846,6 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -846,7 +846,6 @@ if (build_angle_deqp_tests && !is_fuchsia) {
set_defaults("angle_deqp_gtest") { set_defaults("angle_deqp_gtest") {
deps = [] deps = []
sources = [] sources = []
deqp_data_dir = "data"
data = [] data = []
} }
...@@ -856,7 +855,6 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -856,7 +855,6 @@ if (build_angle_deqp_tests && !is_fuchsia) {
config_name = "angle_deqp_${_api}_config" config_name = "angle_deqp_${_api}_config"
config(config_name) { config(config_name) {
defines = invoker.defines defines = invoker.defines
defines += [ "ANGLE_DEQP_DATA_DIR=\"${invoker.deqp_data_dir}\"" ]
} }
shared_library_name = "angle_deqp_lib${_api}" shared_library_name = "angle_deqp_lib${_api}"
...@@ -866,7 +864,6 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -866,7 +864,6 @@ if (build_angle_deqp_tests && !is_fuchsia) {
[ [
"mustpass_dir", "mustpass_dir",
"data", "data",
"deqp_data_dir",
]) ])
deps += [ deps += [
...@@ -907,12 +904,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -907,12 +904,8 @@ if (build_angle_deqp_tests && !is_fuchsia) {
"deqp_support/angle_deqp_gtest.cpp", "deqp_support/angle_deqp_gtest.cpp",
] ]
_deqp_data_dir = invoker.deqp_data_dir data =
invoker.data + [ "deqp_support/deqp_${_api}_test_expectations.txt" ]
data = invoker.data + [
"deqp_support/deqp_${_api}_test_expectations.txt",
"$deqp_path/$_deqp_data_dir/",
]
if (is_android) { if (is_android) {
use_native_activity = true use_native_activity = true
...@@ -920,36 +913,38 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -920,36 +913,38 @@ if (build_angle_deqp_tests && !is_fuchsia) {
} }
} }
set_defaults("angle_deqp_gtest_with_mustpass") { set_defaults("angle_deqp_core_gtest") {
# Default the master lists to the Khronos version. The EGL tests must override this. # Default the master lists to the Khronos version. The EGL tests must override this.
mustpass_dir = "external/openglcts/data/mustpass/gles/aosp_mustpass" mustpass_dir = "external/openglcts/data/mustpass/gles/aosp_mustpass"
} }
template("angle_deqp_gtest_with_mustpass") { template("angle_deqp_core_gtest") {
angle_deqp_gtest(target_name) { angle_deqp_gtest(target_name) {
forward_variables_from(invoker, "*") forward_variables_from(invoker, "*")
defines += [ "ANGLE_DEQP_DATA_DIR=\"data\"" ]
data = [ data = [
"$deqp_path/$mustpass_dir/master/${target_name}-master.txt", "$deqp_path/$mustpass_dir/master/${target_name}-master.txt",
"$deqp_path/data/",
] ]
} }
} }
angle_deqp_gtest_with_mustpass("gles2") { angle_deqp_core_gtest("gles2") {
defines = [ "ANGLE_DEQP_GLES2_TESTS" ] defines = [ "ANGLE_DEQP_GLES2_TESTS" ]
sources = deqp_gles2_sources sources = deqp_gles2_sources
} }
angle_deqp_gtest_with_mustpass("gles3") { angle_deqp_core_gtest("gles3") {
defines = [ "ANGLE_DEQP_GLES3_TESTS" ] defines = [ "ANGLE_DEQP_GLES3_TESTS" ]
sources = deqp_gles3_sources sources = deqp_gles3_sources
} }
angle_deqp_gtest_with_mustpass("gles31") { angle_deqp_core_gtest("gles31") {
defines = [ "ANGLE_DEQP_GLES31_TESTS" ] defines = [ "ANGLE_DEQP_GLES31_TESTS" ]
sources = deqp_gles31_sources sources = deqp_gles31_sources
} }
angle_deqp_gtest_with_mustpass("egl") { angle_deqp_core_gtest("egl") {
defines = [ "ANGLE_DEQP_EGL_TESTS" ] defines = [ "ANGLE_DEQP_EGL_TESTS" ]
sources = deqp_egl_sources sources = deqp_egl_sources
mustpass_dir = "android/cts" mustpass_dir = "android/cts"
...@@ -988,18 +983,9 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -988,18 +983,9 @@ if (build_angle_deqp_tests && !is_fuchsia) {
include_dirs = [ "$deqp_path/external/vulkancts/framework/vulkan" ] include_dirs = [ "$deqp_path/external/vulkancts/framework/vulkan" ]
} }
angle_deqp_gtest("khr_gles2") {
defines = [ "ANGLE_DEQP_KHR_GLES2_TESTS" ]
deps = [
":angle_deqp_khr_common",
]
deqp_data_dir = data_dir
}
# The KHR dEQP tests expect a root prefix of "gl_cts" for some reason. # The KHR dEQP tests expect a root prefix of "gl_cts" for some reason.
# This means we need an extra copy step to make them happy. # This means we need an extra copy step to make them happy.
copy("angle_deqp_khr_gles3_shaders") { copy("angle_deqp_khr_data") {
sources = [ sources = [
"$deqp_path/external/openglcts/data/gles3/arrays.test", "$deqp_path/external/openglcts/data/gles3/arrays.test",
"$deqp_path/external/openglcts/data/gles3/declarations.test", "$deqp_path/external/openglcts/data/gles3/declarations.test",
...@@ -1014,13 +1000,29 @@ if (build_angle_deqp_tests && !is_fuchsia) { ...@@ -1014,13 +1000,29 @@ if (build_angle_deqp_tests && !is_fuchsia) {
] ]
} }
angle_deqp_gtest("khr_gles3") { template("angle_deqp_khr_gtest") {
defines = [ "ANGLE_DEQP_KHR_GLES3_TESTS" ] _mp = invoker.mustpass_name
deps = [ angle_deqp_gtest(target_name) {
":angle_deqp_khr_common", forward_variables_from(invoker, "*", [ "mustpass_name" ])
":angle_deqp_khr_gles3_shaders", deps = [
] ":angle_deqp_khr_common",
":angle_deqp_khr_data",
]
defines += [ "ANGLE_DEQP_DATA_DIR=\"$data_dir\"" ]
data = [
"$deqp_path/external/openglcts/data/mustpass/gles/khronos_mustpass/master/$_mp",
"$root_out_dir/$data_dir/gl_cts/",
]
}
}
deqp_data_dir = data_dir angle_deqp_khr_gtest("khr_gles2") {
defines = [ "ANGLE_DEQP_KHR_GLES2_TESTS" ]
mustpass_name = "gles2-khr-master.txt"
}
angle_deqp_khr_gtest("khr_gles3") {
defines = [ "ANGLE_DEQP_KHR_GLES3_TESTS" ]
mustpass_name = "gles3-khr-master.txt"
} }
} }
src/tests/deqp_support/angle_deqp_gtest.cpp
...@@ -58,20 +58,28 @@ std::string DrawElementsToGoogleTestName(const std::string &dEQPName) ...@@ -58,20 +58,28 @@ std::string DrawElementsToGoogleTestName(const std::string &dEQPName)
// We look for a GLES Khronos master list first. We keep the Android CTS so we can locate a version // We look for a GLES Khronos master list first. We keep the Android CTS so we can locate a version
// of egl-master.txt that has the full list of tests. // of egl-master.txt that has the full list of tests.
#define ANDROID_DEQP_DIR "/../../sdcard/chromium_tests_root/third_party/angle/third_party/deqp/src"
#define ANGLE_DEQP_DIR "/../../third_party/deqp/src"
#define CHROME_DEQP_DIR "/../../third_party/angle/third_party/deqp/src"
#define OPENGL_CTS_DIR "/external/openglcts/data/mustpass/gles"
const char *gCaseListSearchPaths[] = { const char *gCaseListSearchPaths[] = {
"/../../third_party/deqp/src/external/openglcts/data/mustpass/gles/aosp_mustpass/master/", ANDROID_DEQP_DIR "/android/cts/master/",
"/../../third_party/deqp/src/external/openglcts/data/mustpass/gles/khronos_mustpass/master/", ANDROID_DEQP_DIR OPENGL_CTS_DIR "/aosp_mustpass/master/",
"/../../third_party/angle/third_party/deqp/src/external/openglcts/data/mustpass/gles/" ANDROID_DEQP_DIR OPENGL_CTS_DIR "/khronos_mustpass/master/",
"aosp_mustpass/master/", ANGLE_DEQP_DIR "/android/cts/master/",
"khronos_mustpass/master/", ANGLE_DEQP_DIR OPENGL_CTS_DIR "/aosp_mustpass/master/",
"/../../sdcard/chromium_tests_root/third_party/angle/third_party/deqp/src/external/openglcts/" ANGLE_DEQP_DIR OPENGL_CTS_DIR "/khronos_mustpass/master/",
"data/mustpass/gles/aosp_mustpass/master/", CHROME_DEQP_DIR "/android/cts/master/",
"data/mustpass/gles/khronos_mustpass/master/", CHROME_DEQP_DIR OPENGL_CTS_DIR "/aosp_mustpass/master/",
"/../../third_party/deqp/src/android/cts/master/", CHROME_DEQP_DIR OPENGL_CTS_DIR "/khronos_mustpass/master/",
"/../../third_party/angle/third_party/deqp/src/android/cts/master/",
"/../../sdcard/chromium_tests_root/third_party/angle/third_party/deqp/src/android/cts/master/",
}; };
#undef ANDROID_DEQP_DIR
#undef ANGLE_DEQP_DIR
#undef CHROME_DEQP_DIR
#undef OPENGL_CTS_DIR
const char *gTestExpectationsSearchPaths[] = { const char *gTestExpectationsSearchPaths[] = {
"/../../src/tests/deqp_support/", "/../../src/tests/deqp_support/",
"/../../third_party/angle/src/tests/deqp_support/", "/../../third_party/angle/src/tests/deqp_support/",
......
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