diff options
| author | justincohen@chromium.org <justincohen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:27:18 +0000 |
|---|---|---|
| committer | justincohen@chromium.org <justincohen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:27:18 +0000 |
| commit | 3ff011d4dc270d0345c449a9de3ebec1a9f3f1ab (patch) | |
| tree | fb954674d578abe18b51c257e3667be4ac95f094 /ui/test/test_suite.cc | |
| parent | d48e9104e0f06252c571340fc00bf35be92e080f (diff) | |
| download | chromium_src-3ff011d4dc270d0345c449a9de3ebec1a9f3f1ab.zip chromium_src-3ff011d4dc270d0345c449a9de3ebec1a9f3f1ab.tar.gz chromium_src-3ff011d4dc270d0345c449a9de3ebec1a9f3f1ab.tar.bz2 | |
Get 'all_unittests' and 'test_suite' building for iOS.
BUG=None.
Review URL: https://chromiumcodereview.appspot.com/10834364
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/test/test_suite.cc')
| -rw-r--r-- | ui/test/test_suite.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index 06e0d35..832a1ea 100644 --- a/ui/test/test_suite.cc +++ b/ui/test/test_suite.cc @@ -12,7 +12,7 @@ #include "ui/base/ui_base_paths.h" #include "ui/gfx/gfx_paths.h" -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) #include "base/mac/bundle_locations.h" #endif @@ -27,7 +27,7 @@ void UITestSuite::Initialize() { ui::RegisterPathProvider(); gfx::RegisterPathProvider(); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) // Look in the framework bundle for resources. // TODO(port): make a resource bundle for non-app exes. What's done here // isn't really right because this code needs to depend on chrome_dll @@ -51,7 +51,7 @@ void UITestSuite::Initialize() { pak_dir = pak_dir.AppendASCII("ui_unittests_strings"); PathService::Override(ui::DIR_LOCALES, pak_dir); #endif // defined(OS_ANDROID) -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && !defined(OS_IOS) // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. @@ -67,7 +67,7 @@ void UITestSuite::Initialize() { void UITestSuite::Shutdown() { ui::ResourceBundle::CleanupSharedInstance(); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) base::mac::SetOverrideFrameworkBundle(NULL); #endif base::TestSuite::Shutdown(); |