content/content_tests.gypi - Issue 10916334: Enable webgl conformance tests under content/test/gpu in content_browsertests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_tests.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: Fix the issue for android bot 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

« no previous file with comments | « chrome/test/gpu/webgl_conformance_test_expectations.txt ('k') | content/test/content_browser_test_utils.h » ('j') | content/test/content_browser_test_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index ca3f310bc46ae71a2fc90ef2e627d1068bc5aa47..886bd02bd63b0d424b06788bdaf0175b0f9292a1 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -618,6 +618,7 @@

'../skia/skia.gyp:skia',

'../testing/gmock.gyp:gmock',

'../testing/gtest.gyp:gtest',

+ '../third_party/mesa/mesa.gyp:osmesa',

'../ui/ui.gyp:ui',

'../webkit/support/webkit_support.gyp:forms',

'../webkit/support/webkit_support.gyp:glue',

@@ -625,6 +626,9 @@

'include_dirs': [

'..',

+ 'includes': [

+ 'test/gpu/test_support_gpu.gypi',

+ ],

'defines': [

'HAS_OUT_OF_PROC_TEST_RUNNER',

@@ -680,6 +684,8 @@

'test/content_browser_test_utils_mac.mm',

'test/content_browser_test_test.cc',

'test/content_test_launcher.cc',

+ 'test/gpu/webgl_conformance_tests.cc',

+ 'test/gpu/webgl_conformance_test_list_autogen.h',

'test/layout_browsertest.cc',

'test/layout_browsertest.h',

'test/layout_test_http_server.cc',