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

Unified Diff: content/browser/gpu/test_support_gpu.gypi

Issue 10916334: Enable webgl conformance tests under content/test/gpu in content_browsertests (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: namespace fixup Created 8 years, 3 months 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
Index: content/browser/gpu/test_support_gpu.gypi
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi
similarity index 56%
copy from chrome/test/gpu/test_support_gpu.gypi
copy to content/browser/gpu/test_support_gpu.gypi
index a1db2a24dd3d4f40f2affe3465fa312421ca437e..13ea57c2279f493578a94b82c69898f433e63ff1 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/content/browser/gpu/test_support_gpu.gypi
@@ -5,26 +5,9 @@
# This file is meant to be included into targets which run gpu tests.
{
'variables': {
- 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu',
+ 'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/test/gpu',
'src_dir': '../../..',
},
- 'dependencies': [
- 'browser',
- 'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'renderer',
- 'test_support_common',
- 'test_support_ui',
- '<(src_dir)/base/base.gyp:base',
- '<(src_dir)/base/base.gyp:test_support_base',
- '<(src_dir)/net/net.gyp:net_test_support',
- '<(src_dir)/skia/skia.gyp:skia',
- '<(src_dir)/testing/gmock.gyp:gmock',
- '<(src_dir)/testing/gtest.gyp:gtest',
- '<(src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(src_dir)/third_party/icu/icu.gyp:icuuc',
- ],
'defines': [
'HAS_OUT_OF_PROC_TEST_RUNNER',
],
@@ -32,9 +15,6 @@
'<(src_dir)',
'<(test_list_out_dir)',
],
- 'sources': [
- '<(src_dir)/chrome/test/base/chrome_test_launcher.cc',
- ],
# hard_dependency is necessary for this target because it has actions
# that generate a header file included by dependent targets. The header
# file must be generated before the dependents are compiled. The usual
@@ -42,21 +22,10 @@
'hard_dependency': 1,
'conditions': [
['OS=="win"', {
- 'dependencies': [
- 'chrome_version_resources',
- ],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
'sources': [
- '<(src_dir)/chrome/app/chrome_dll.rc',
- '<(src_dir)/chrome/app/chrome_dll_resource.h',
- '<(src_dir)/chrome/app/chrome_version.rc.version',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -65,7 +34,7 @@
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
- '<(allocator_target)',
+ '../base/allocator/allocator.gyp:allocator',
],
}],
],
@@ -98,15 +67,5 @@
'<(src_dir)/ui/views/views.gyp:views',
],
}],
- ['OS=="android"', {
- 'dependencies!': [
- 'chrome',
- ],
- 'dependencies': [
- '<@(chromium_dependencies)',
- 'chrome_resources.gyp:packed_resources',
- 'chrome_resources.gyp:packed_extra_resources',
- ],
- }],
],
}
« no previous file with comments | « content/browser/gpu/generate_webgl_conformance_test_list.py ('k') | content/browser/gpu/webgl_conformance_test_list_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698