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

Unified Diff: chrome/chrome.gyp

Issue 125124: Start to get memory test compiling on mac & linux.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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 | « no previous file | chrome/test/memory_test/memory_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 18404)
+++ chrome/chrome.gyp (working copy)
@@ -3654,12 +3654,12 @@
'type': 'executable',
'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98',
'dependencies': [
+ 'app',
'test_support_common',
'test_support_ui',
'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- 'app',
],
'include_dirs': [
'..',
@@ -3675,6 +3675,32 @@
}],
],
},
+ {
+ 'target_name': 'memory_test',
+ 'type': 'executable',
+ 'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE',
+ 'dependencies': [
+ 'app',
+ 'test_support_common',
+ 'test_support_ui',
+ 'theme_resources',
+ '../skia/skia.gyp:skia',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'test/memory_test/memory_test.cc',
+ ],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ }],
+ ],
+ },
],
'conditions': [
# We set feature variables so the different parts that need to check for
@@ -4392,24 +4418,6 @@
},
},
{
- 'target_name': 'memory_test',
- 'type': 'executable',
- 'msvs_guid': 'A5F831FD-9B9C-4FEF-9FBA-554817B734CE',
- 'dependencies': [
- 'test_support_common',
- 'test_support_ui',
- 'theme_resources',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test/memory_test/memory_test.cc',
- ],
- },
- {
'target_name': 'plugin_tests',
'type': 'executable',
'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9',
« no previous file with comments | « no previous file | chrome/test/memory_test/memory_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698