commit a168f47aaef161b6bd3cc721679d79df5d01dc11
author Viet-Trung Luu <viettrungluu@chromium.org> Tue Apr 07 14:07:54 2015 -0700
committer Viet-Trung Luu <viettrungluu@chromium.org> Tue Apr 07 14:07:54 2015 -0700
tree c44ec6fca153c146c50992d6e6bd29c47cc8dfdd
parent 5d2f53716182a5fe260342ab04f4808c409a289f

Temporarily (?) disable ContextTest.Paths on Android.

The command-line singleton isn't initialized as we want, hence it fails.

(ChildProcessHostTest.* are disabled for a related reason.)

TBR=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1064173002

shell/child_process_host_unittest.cc

diff --git a/shell/child_process_host_unittest.cc b/shell/child_process_host_unittest.cc
index 9a6aee3..c5d5086 100644
--- a/shell/child_process_host_unittest.cc
+++ b/shell/child_process_host_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
+#include "build/build_config.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/message_pipe.h"

shell/context_unittest.cc

diff --git a/shell/context_unittest.cc b/shell/context_unittest.cc
index b8accaa..7611ea8 100644
--- a/shell/context_unittest.cc
+++ b/shell/context_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
+#include "build/build_config.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -13,7 +14,15 @@
 namespace shell {
 namespace {
 
-TEST(ContextTest, Paths) {
+#if defined(OS_ANDROID)
+// TODO(vtl): The command line doesn't get initialized in a reasonable way on
+// Android, currently. (Relatedly, multiprocess tests are currently not
+// supported.)
+#define MAYBE_Paths DISABLED_Paths
+#else
+#define MAYBE_Paths Paths
+#endif
+TEST(ContextTest, MAYBE_Paths) {
   Context context;
   base::MessageLoop message_loop(
       scoped_ptr<base::MessagePump>(new common::MessagePumpMojo()));