Skip to content

A
angle
Commit 34d719b5 by Jamie Madill
Options

Revert "Revert "dEQP: Compile dEQP targets in Chromium.""

Should be fixed now with latest patches. BUG=angleproject:998 BUG=500736 This reverts commit d0071dd9. Change-Id: I3a611bfa10429a1f97d18e9aa1f316eabb67d114 Reviewed-on: https://chromium-review.googlesource.com/282055Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 4d06a24c
Showing with 54 additions and 50 deletions
src/tests/deqp.gypi
...@@ -828,11 +828,7 @@ ...@@ -828,11 +828,7 @@
'conditions': 'conditions':
[ [
['angle_standalone==1', ['OS=="win" and angle_standalone==1',
{
'conditions':
[
['OS=="win"',
{ {
'targets': 'targets':
[ [
...@@ -940,7 +936,12 @@ ...@@ -940,7 +936,12 @@
'<(libpng_path)/pngwutil.c', '<(libpng_path)/pngwutil.c',
], ],
}, },
],
}],
['OS=="win"',
{
'targets':
[
{ {
'target_name': 'angle_deqp_support', 'target_name': 'angle_deqp_support',
'type': 'none', 'type': 'none',
...@@ -1112,48 +1113,6 @@ ...@@ -1112,48 +1113,6 @@
], ],
}, },
{
'target_name': 'angle_deqp_gles2_tests',
'type': 'executable',
'defines':
[
# Hard-code the path to dEQP. This lets the
# app locate the data folder without need
# for a copy. gyp recursive copies are not
# implemented properly on Windows.
'ANGLE_DEQP_DIR="<(deqp_path)"',
],
'dependencies':
[
'angle_deqp_libgles2',
],
'sources':
[
'deqp_support/angle_deqp_tests_main.cpp',
],
},
{
'target_name': 'angle_deqp_gles3_tests',
'type': 'executable',
'defines':
[
# Hard-code the path to dEQP. This lets the
# app locate the data folder without need
# for a copy. gyp recursive copies are not
# implemented properly on Windows.
'ANGLE_DEQP_DIR="<(deqp_path)"',
],
'dependencies':
[
'angle_deqp_libgles3',
],
'sources':
[
'deqp_support/angle_deqp_tests_main.cpp',
],
},
# Helper target for synching our implementation with chrome's # Helper target for synching our implementation with chrome's
{ {
'target_name': 'angle_deqp_gtest_support', 'target_name': 'angle_deqp_gtest_support',
...@@ -1232,6 +1191,53 @@ ...@@ -1232,6 +1191,53 @@
}], }],
], ],
}, },
],
}],
['OS=="win" and angle_standalone==1',
{
"targets":
[
{
'target_name': 'angle_deqp_gles2_tests',
'type': 'executable',
'defines':
[
# Hard-code the path to dEQP. This lets the
# app locate the data folder without need
# for a copy. gyp recursive copies are not
# implemented properly on Windows.
'ANGLE_DEQP_DIR="<(deqp_path)"',
],
'dependencies':
[
'angle_deqp_libgles2',
],
'sources':
[
'deqp_support/angle_deqp_tests_main.cpp',
],
},
{
'target_name': 'angle_deqp_gles3_tests',
'type': 'executable',
'defines':
[
# Hard-code the path to dEQP. This lets the
# app locate the data folder without need
# for a copy. gyp recursive copies are not
# implemented properly on Windows.
'ANGLE_DEQP_DIR="<(deqp_path)"',
],
'dependencies':
[
'angle_deqp_libgles3',
],
'sources':
[
'deqp_support/angle_deqp_tests_main.cpp',
],
},
{ {
'target_name': 'angle_deqp_googletest', 'target_name': 'angle_deqp_googletest',
...@@ -1249,6 +1255,4 @@ ...@@ -1249,6 +1255,4 @@
], # targets ], # targets
}], # OS == "win" }], # OS == "win"
], # conditions ], # conditions
}], # angle_standalone
],
} }
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