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

Unified Diff: ui/ui_unittests.gyp

Issue 152543005: Introduce a mock ui_unittests Framework for loading resources. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac official builder, and missing dependency (thanks GTK). Created 6 years, 9 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: ui/ui_unittests.gyp
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index a96bc726da03b419700cac42fa1f9376b9c55bb4..ed20e60716dff9d3c7d4ce53db37a6cde18b5ee5 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -62,7 +62,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
- '../chrome/chrome_resources.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -74,6 +73,7 @@
'events/events.gyp:events_base',
'gfx/gfx.gyp:gfx_test_support',
'resources/ui_resources.gyp:ui_resources',
+ 'resources/ui_resources.gyp:ui_test_pak',
tapted 2014/03/11 11:11:03 This just slipped through, but of course it's need
'ui.gyp:ui',
'ui_test_support',
],
@@ -285,6 +285,11 @@
'dependencies': [
'events/events.gyp:events_test_support',
'gfx/gfx.gyp:gfx_test_support',
+ 'ui_unittests_bundle',
+ ],
+ }, { # OS!="mac"
+ 'dependencies': [
+ 'base/strings/ui_strings.gyp:ui_unittest_strings',
],
}],
['use_aura==1 or toolkit_views==1', {
@@ -335,6 +340,19 @@
},
],
'conditions': [
+ # Mac target to build a test Framework bundle to mock out resource loading.
+ ['OS == "mac"', {
+ 'targets': [
+ {
+ 'target_name': 'ui_unittests_bundle',
+ 'type': 'shared_library',
+ 'dependencies': [
+ 'resources/ui_resources.gyp:ui_test_pak',
tfarina 2014/03/11 18:22:03 if you include this at line 76 regardless of the p
tapted 2014/03/11 22:35:37 The mock framework needs the dependency for its po
+ ],
+ 'includes': [ 'ui_unittests_bundle.gypi' ],
+ },
+ ],
+ }],
# Special target to wrap a gtest_target_type==shared_library
# ui_unittests into an android apk for execution.
# See base.gyp for TODO(jrg)s about this strategy.

Powered by Google App Engine
This is Rietveld 408576698