Skip to content

A
angle
Commit d0071dd9 by Jamie Madill
Options

Revert "dEQP: Compile dEQP targets in Chromium."

Causing runhooks failures: gyp: Undefined variable deqp_path in C:\b\build\slave\GPU_Win_Builder\build\src\third_party\angle\src\tests\tests.gyp BUG=angleproject:998 BUG=500736 This reverts commit 3018c206. Change-Id: I8c0402fb7465101a9331cbb2020693469d644e7e Reviewed-on: https://chromium-review.googlesource.com/281194Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent eed29ebb
Showing with 50 additions and 54 deletions
src/tests/deqp.gypi
...@@ -824,7 +824,11 @@ ...@@ -824,7 +824,11 @@
'conditions': 'conditions':
[ [
['OS=="win" and angle_standalone==1', ['angle_standalone==1',
{
'conditions':
[
['OS=="win"',
{ {
'targets': 'targets':
[ [
...@@ -932,12 +936,7 @@ ...@@ -932,12 +936,7 @@
'<(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',
...@@ -1109,6 +1108,48 @@ ...@@ -1109,6 +1108,48 @@
], ],
}, },
{
'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',
...@@ -1187,53 +1228,6 @@ ...@@ -1187,53 +1228,6 @@
}], }],
], ],
}, },
],
}],
['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',
...@@ -1251,4 +1245,6 @@ ...@@ -1251,4 +1245,6 @@
], # 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