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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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
« base/test/test_listener_ios.mm ('K') | « base/test/test_listener_ios.mm ('k') | base/test/trace_event_analyzer_unittest.cc » ('j') | base/test/trace_event_analyzer_unittest.cc » ('J')
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..ac1663aa4e42de2f3afe2fe2ab1f958718e193e5 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -27,6 +27,8 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#if !defined(OS_IOS)
stuartmorgan 2012/07/12 09:36:31 Reverse the order so it's note an if/else of a neg
leng 2012/07/12 10:44:42 Done.
#include "base/test/mock_chrome_application_mac.h"
+#else // OS_IOS
+#include "base/test/test_listener_ios.h"
#endif // !OS_IOS
#endif // OS_MACOSX
@@ -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.
« base/test/test_listener_ios.mm ('K') | « base/test/test_listener_ios.mm ('k') | base/test/trace_event_analyzer_unittest.cc » ('j') | base/test/trace_event_analyzer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698