Skip to content

A
angle
Commit 1b21fd39 by Corentin Wallez
Options

Make perftests compile on Linux

BUG=angleproject:892 Change-Id: I3fe43c7a84d1eb2b875309495fe27a0bfd6c3e82 Reviewed-on: https://chromium-review.googlesource.com/272552Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 08971bff
Showing with 40 additions and 30 deletions
src/tests/angle_perftests.gypi
...@@ -11,6 +11,25 @@ ...@@ -11,6 +11,25 @@
# target containing a gtest harness in a main.cpp. # target containing a gtest harness in a main.cpp.
{ {
'variables':
{
'angle_perf_tests_sources':
[
'perf_tests/ANGLEPerfTest.cpp',
'perf_tests/ANGLEPerfTest.h',
'perf_tests/BufferSubData.cpp',
'perf_tests/DrawCallPerf.cpp',
'perf_tests/IndexConversionPerf.cpp',
'perf_tests/PointSprites.cpp',
'perf_tests/TexSubImage.cpp',
'perf_tests/third_party/perf/perf_test.cc',
'perf_tests/third_party/perf/perf_test.h',
],
'angle_perf_tests_win_sources':
[
'perf_tests/IndexDataManagerTest.cpp',
]
},
'dependencies': 'dependencies':
[ [
'<(angle_path)/src/angle.gyp:angle_common', '<(angle_path)/src/angle.gyp:angle_common',
...@@ -26,15 +45,16 @@ ...@@ -26,15 +45,16 @@
], ],
'sources': 'sources':
[ [
'perf_tests/ANGLEPerfTest.cpp', '<@(angle_perf_tests_sources)',
'perf_tests/ANGLEPerfTest.h',
'perf_tests/BufferSubData.cpp',
'perf_tests/DrawCallPerf.cpp',
'perf_tests/IndexConversionPerf.cpp',
'perf_tests/IndexDataManagerTest.cpp',
'perf_tests/PointSprites.cpp',
'perf_tests/TexSubImage.cpp',
'perf_tests/third_party/perf/perf_test.cc',
'perf_tests/third_party/perf/perf_test.h',
], ],
'conditions':
[
['OS=="win"',
{
'sources':
[
'<@(angle_perf_tests_win_sources)',
],
}],
]
} }
src/tests/tests.gyp
...@@ -196,29 +196,19 @@ ...@@ -196,29 +196,19 @@
'angle_end2end_tests_main.cpp', 'angle_end2end_tests_main.cpp',
], ],
}, },
],
'conditions':
[
['OS=="win"',
{ {
'targets': 'target_name': 'angle_perftests',
'type': 'executable',
'includes':
[ [
'../../build/common_defines.gypi',
{ 'angle_perftests.gypi',
'target_name': 'angle_perftests',
'type': 'executable',
'includes':
[
'../../build/common_defines.gypi',
'angle_perftests.gypi',
],
'sources':
[
'angle_perftests_main.cpp',
],
},
], ],
}], 'sources':
[
'angle_perftests_main.cpp',
],
},
], ],
}], }],
['OS=="win"', ['OS=="win"',
......
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