Get base_unittests closer to compiling for iOS

MessageLoop still needs to be brought on line in order for this to link, but it's much closer to working.

TBR=
BUG=None
TEST=None


Review URL: https://chromiumcodereview.appspot.com/10700158

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146119 0039d316-1c4b-4281-b951-d872f2087c98
parent f742f2af
...@@ -552,6 +552,23 @@ ...@@ -552,6 +552,23 @@
}], }],
], ],
}], }],
['OS == "ios"', {
'sources/': [
# Only test the iOS-meaningful portion of process_utils.
['exclude', '^process_util_unittest'],
['include', '^process_util_unittest_ios.cc$'],
# Requires spawning processes.
['exclude', '^metrics/stats_table_unittest.cc'],
# TODO(ios): Remove these as base/ is unforked.
# For now, exclude everything that doesn't build as-is, just to
# get a minimal target building.
['exclude', '^memory/aligned_memory_unittest.cc'],
['exclude', '^message_'],
['exclude', '^shared_memory_unittest.cc'],
['exclude', '^sys_info_unittest.cc'],
['exclude', '^system_monitor'],
],
}],
['use_glib==1', { ['use_glib==1', {
'sources!': [ 'sources!': [
'file_version_info_unittest.cc', 'file_version_info_unittest.cc',
...@@ -612,7 +629,17 @@ ...@@ -612,7 +629,17 @@
'closure_blocks_leopard_compat', 'closure_blocks_leopard_compat',
], ],
}], }],
], ], # conditions
'target_conditions': [
['OS == "ios"', {
'sources/': [
# Pull in specific Mac files for iOS (which have been filtered out
# by file name rules).
['include', 'mac/objc_property_releaser_unittest.mm'],
['include', 'sys_string_conversions_mac_unittest.mm'],
],
}],
], # target_conditions
}, },
{ {
'target_name': 'check_example', 'target_name': 'check_example',
...@@ -824,7 +851,7 @@ ...@@ -824,7 +851,7 @@
}, },
], ],
}], }],
['os_posix==1 and OS!="mac"', { ['os_posix==1 and OS!="mac" and OS!="ios"', {
'targets': [ 'targets': [
{ {
'target_name': 'symbolize', 'target_name': 'symbolize',
......
...@@ -25,8 +25,10 @@ ...@@ -25,8 +25,10 @@
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h" #include "base/mac/scoped_nsautorelease_pool.h"
#if !defined(OS_IOS)
#include "base/test/mock_chrome_application_mac.h" #include "base/test/mock_chrome_application_mac.h"
#endif #endif // !OS_IOS
#endif // OS_MACOSX
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#include "base/test/test_support_android.h" #include "base/test/test_support_android.h"
...@@ -291,7 +293,7 @@ void TestSuite::SuppressErrorDialogs() { ...@@ -291,7 +293,7 @@ void TestSuite::SuppressErrorDialogs() {
} }
void TestSuite::Initialize() { void TestSuite::Initialize() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX) && !defined(OS_IOS)
// Some of the app unit tests spin runloops. // Some of the app unit tests spin runloops.
mock_cr_app::RegisterMockCrApp(); mock_cr_app::RegisterMockCrApp();
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment