| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/public/c/system/main.h" | 5 #include "mojo/public/c/system/main.h" |
| 6 #include "mojo/public/cpp/application/application_delegate.h" | 6 #include "mojo/public/cpp/application/application_delegate.h" |
| 7 #include "mojo/public/cpp/application/application_impl.h" | 7 #include "mojo/public/cpp/application/application_impl.h" |
| 8 #include "mojo/public/cpp/application/application_test_base.h" | 8 #include "mojo/public/cpp/application/application_test_base.h" |
| 9 #include "mojo/public/cpp/environment/logging.h" | 9 #include "mojo/public/cpp/environment/logging.h" |
| 10 #include "mojo/public/cpp/system/message_pipe.h" | 10 #include "mojo/public/cpp/system/message_pipe.h" |
| 11 | 11 |
| 12 MojoResult MojoMain(MojoHandle shell_handle) { | 12 MojoResult MojoMain(MojoHandle shell_handle) { |
| 13 // An Environment instance is needed to construct run loops. |
| 13 mojo::Environment environment; | 14 mojo::Environment environment; |
| 14 | 15 |
| 15 { | 16 { |
| 16 // This RunLoop is used for init, and then destroyed before running tests. | 17 // This RunLoop is used for init, and then destroyed before running tests. |
| 17 mojo::Environment::InstantiateDefaultRunLoop(); | 18 mojo::Environment::InstantiateDefaultRunLoop(); |
| 18 | 19 |
| 19 // Construct an ApplicationImpl just for the GTEST commandline arguments. | 20 // Construct an ApplicationImpl just for the GTEST commandline arguments. |
| 20 // GTEST command line arguments are supported amid application arguments: | 21 // GTEST command line arguments are supported amid application arguments: |
| 21 // $ mojo_shell 'mojo:example_apptest arg1 --gtest_filter=foo arg2' | 22 // $ mojo_shell 'mojo:example_apptest arg1 --gtest_filter=foo arg2' |
| 22 mojo::ApplicationDelegate dummy_application_delegate; | 23 mojo::ApplicationDelegate dummy_application_delegate; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 41 } | 42 } |
| 42 | 43 |
| 43 int result = RUN_ALL_TESTS(); | 44 int result = RUN_ALL_TESTS(); |
| 44 | 45 |
| 45 shell_handle = mojo::test::PassShellHandle().release().value(); | 46 shell_handle = mojo::test::PassShellHandle().release().value(); |
| 46 MojoResult close_result = MojoClose(shell_handle); | 47 MojoResult close_result = MojoClose(shell_handle); |
| 47 MOJO_CHECK(close_result == MOJO_RESULT_OK); | 48 MOJO_CHECK(close_result == MOJO_RESULT_OK); |
| 48 | 49 |
| 49 return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN; | 50 return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN; |
| 50 } | 51 } |
| OLD | NEW |