Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: gpu/gpu.gyp

Issue 807753002: Add angle_end2end_tests target and isolate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unneeded and incorrect reference to ShInitialize/Finalize. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/angle_end2end_tests_main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 40eb5f9f5cf55533b253a62df824b9f95620da8f..77878847cb851dd13ea03c8513c017ae0fda62f5 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -124,31 +124,23 @@
},
{
# GN version: //gpu:angle_unittests
+ # TODO(kbr): port this refactoring to the GN build.
'target_name': 'angle_unittests',
'type': '<(gtest_target_type)',
+ 'includes': [
+ '../third_party/angle/build/common_defines.gypi',
+ '../third_party/angle/tests/angle_unittests.gypi',
+ ],
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '<(angle_path)/src/angle.gyp:translator_static',
- ],
- 'variables': {
- 'ANGLE_DIR': '<(angle_path)',
- },
- 'includes': [
- '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
- '../third_party/angle/tests/compiler_tests/compiler_tests.gypi',
],
'include_dirs': [
'..',
- '<(angle_path)/include',
- '<(angle_path)/src',
- '<(angle_path)/src/compiler/preprocessor',
- '<(angle_path)/tests',
+ '../third_party/angle/include',
],
- 'sources': [
+ 'sources':
+ [
'angle_unittest_main.cc',
],
},
@@ -659,5 +651,27 @@
},
],
}],
+ ['OS == "win"', {
+ 'targets': [
+ {
+ # TODO(kbr): port this target to the GN build.
+ 'target_name': 'angle_end2end_tests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ ],
+ 'includes':
+ [
+ '../third_party/angle/build/common_defines.gypi',
+ '../third_party/angle/tests/angle_end2end_tests.gypi',
+ ],
+ 'sources':
+ [
+ 'angle_end2end_tests_main.cc',
+ ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « gpu/angle_end2end_tests_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698