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

Unified Diff: base/test/test_suite.cc

Issue 10690161: Make it possible to run gtests on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@presubmit_change
Patch Set: More feedback - no leak, better comments, and more. Created 8 years, 5 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 | « base/test/test_listener_ios.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_suite.cc
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 0cca8fa25ba9093f87e6af7ebfdb66cc583acdcd..05a6069ba22a25720da254f8188b813f51b4b482 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -25,9 +25,11 @@
#if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
-#if !defined(OS_IOS)
+#if defined(OS_IOS)
+#include "base/test/test_listener_ios.h"
+#else
#include "base/test/mock_chrome_application_mac.h"
-#endif // !OS_IOS
+#endif // OS_IOS
#endif // OS_MACOSX
#if defined(OS_ANDROID)
@@ -234,6 +236,9 @@ int TestSuite::Run() {
// Check to see if we are being run as a client process.
if (!client_func.empty())
return multi_process_function_list::InvokeChildProcessTest(client_func);
+#if defined(OS_IOS)
+ base::test_listener_ios::RegisterTestEndListener();
+#endif
int result = RUN_ALL_TESTS();
// If there are failed tests, see if we should ignore the failures.
« no previous file with comments | « base/test/test_listener_ios.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698