Add infrastructure to run tests on android.
This CL have the following changes:
- Build mojo_system_unittests_apk on android
- Fix tests to run on android
- Fix multi-process test to run on android
- Fix mojob.py to run tests on android
- Fix mojo/tools/test_runner.py to run tests on android
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/728783003
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 7f06454..a7b619c 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -87,6 +87,12 @@
"//services/js:js_services_unittests",
]
+ if (is_android) {
+ deps += [
+ "//mojo/edk/system:mojo_system_unittests_apk",
+ ]
+ }
+
if (use_aura) {
deps += [
"//mojo/services/public/cpp/view_manager/tests:mojo_view_manager_lib_unittests",
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc
index 16a5ce2..b138a2d 100644
--- a/mojo/edk/embedder/embedder_unittest.cc
+++ b/mojo/edk/embedder/embedder_unittest.cc
@@ -282,7 +282,13 @@
// 10. (close)
// 11. (wait/cl.)
// 12. (wait/cl.)
-TEST_F(EmbedderTest, MultiprocessChannels) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_MultiprocessChannels DISABLED_MultiprocessChannels
+#else
+#define MAYBE_MultiprocessChannels MultiprocessChannels
+#endif // defined(OS_ANDROID)
+TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) {
mojo::embedder::test::InitWithSimplePlatformSupport();
mojo::test::MultiprocessTestHelper multiprocess_test_helper;
multiprocess_test_helper.StartChild("MultiprocessChannelsClient");
diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
index b87c76a..0701484 100644
--- a/mojo/edk/system/BUILD.gn
+++ b/mojo/edk/system/BUILD.gn
@@ -2,6 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+if (is_android) {
+ import("//build/config/android/config.gni")
+ import("//build/config/android/rules.gni")
+}
+
config("system_config") {
defines = [
# Ensures that dependent projects import the core functions on Windows.
@@ -143,6 +148,12 @@
"//testing/gtest",
]
+ if (is_android) {
+ deps += [
+ "//testing/android:native_test_native_code",
+ ]
+ }
+
allow_circular_includes_from = [ "//mojo/edk/embedder:embedder_unittests" ]
}
@@ -165,3 +176,12 @@
"//testing/gtest",
]
}
+
+if (is_android) {
+ unittest_apk("mojo_system_unittests_apk") {
+ deps = [
+ ":mojo_system_unittests",
+ ]
+ unittests_dep = ":mojo_system_unittests"
+ }
+}
diff --git a/mojo/edk/system/core_unittest.cc b/mojo/edk/system/core_unittest.cc
index 96780f7..3969322 100644
--- a/mojo/edk/system/core_unittest.cc
+++ b/mojo/edk/system/core_unittest.cc
@@ -892,7 +892,7 @@
EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfiable_signals);
// Write.
- char elements[2] = {'A', 'B'};
+ signed char elements[2] = {'A', 'B'};
uint32_t num_bytes = 2u;
EXPECT_EQ(MOJO_RESULT_OK,
core()->WriteData(ph, UserPointer<const void>(elements),
diff --git a/mojo/edk/system/message_pipe_perftest.cc b/mojo/edk/system/message_pipe_perftest.cc
index 9f1ac5d..2387782 100644
--- a/mojo/edk/system/message_pipe_perftest.cc
+++ b/mojo/edk/system/message_pipe_perftest.cc
@@ -140,7 +140,13 @@
// Repeatedly sends messages as previous one got replied by the child.
// Waits for the child to close its end before quitting once specified
// number of messages has been sent.
-TEST_F(MultiprocessMessagePipePerfTest, PingPong) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_PingPong DISABLED_PingPong
+#else
+#define MAYBE_PingPong PingPong
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessMessagePipePerfTest, MAYBE_PingPong) {
helper()->StartChild("PingPongClient");
scoped_refptr<ChannelEndpoint> ep;
diff --git a/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/mojo/edk/system/multiprocess_message_pipe_unittest.cc
index ab2e75c..37e777e 100644
--- a/mojo/edk/system/multiprocess_message_pipe_unittest.cc
+++ b/mojo/edk/system/multiprocess_message_pipe_unittest.cc
@@ -96,7 +96,13 @@
}
// Sends "hello" to child, and expects "hellohello" back.
-TEST_F(MultiprocessMessagePipeTest, Basic) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_Basic DISABLED_Basic
+#else
+#define MAYBE_Basic Basic
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessMessagePipeTest, MAYBE_Basic) {
helper()->StartChild("EchoEcho");
scoped_refptr<ChannelEndpoint> ep;
@@ -136,7 +142,13 @@
// Sends a bunch of messages to the child. Expects them "repeated" back. Waits
// for the child to close its end before quitting.
-TEST_F(MultiprocessMessagePipeTest, QueueMessages) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_QueueMessages DISABLED_QueueMessages
+#else
+#define MAYBE_QueueMessages QueueMessages
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessMessagePipeTest, DISABLED_QueueMessages) {
helper()->StartChild("EchoEcho");
scoped_refptr<ChannelEndpoint> ep;
@@ -282,10 +294,11 @@
return 0;
}
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
#define MAYBE_SharedBufferPassing SharedBufferPassing
#else
// Not yet implemented (on Windows).
+// Android multi-process tests are not executing the new process. This is flaky.
#define MAYBE_SharedBufferPassing DISABLED_SharedBufferPassing
#endif
TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) {
@@ -422,10 +435,11 @@
return 0;
}
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
#define MAYBE_PlatformHandlePassing PlatformHandlePassing
#else
// Not yet implemented (on Windows).
+// Android multi-process tests are not executing the new process. This is flaky.
#define MAYBE_PlatformHandlePassing DISABLED_PlatformHandlePassing
#endif
TEST_F(MultiprocessMessagePipeTest, MAYBE_PlatformHandlePassing) {
diff --git a/mojo/edk/system/run_all_unittests.cc b/mojo/edk/system/run_all_unittests.cc
index 3ea1682..cd61337 100644
--- a/mojo/edk/system/run_all_unittests.cc
+++ b/mojo/edk/system/run_all_unittests.cc
@@ -8,9 +8,13 @@
#include "testing/gtest/include/gtest/gtest.h"
int main(int argc, char** argv) {
- // Silence death test thread warnings on Linux. We can afford to run our death
- // tests a little more slowly (< 10 ms per death test on a Z620).
+// Silence death test thread warnings on Linux. We can afford to run our death
+// tests a little more slowly (< 10 ms per death test on a Z620).
+// On android, we need to run in the default mode, as the threadsafe mode
+// relies on execve which is not available.
+#if !defined(OS_ANDROID)
testing::GTEST_FLAG(death_test_style) = "threadsafe";
+#endif
base::TestSuite test_suite(argc, argv);
diff --git a/mojo/edk/test/multiprocess_test_helper_unittest.cc b/mojo/edk/test/multiprocess_test_helper_unittest.cc
index 2961a74..93496fb 100644
--- a/mojo/edk/test/multiprocess_test_helper_unittest.cc
+++ b/mojo/edk/test/multiprocess_test_helper_unittest.cc
@@ -42,7 +42,13 @@
typedef testing::Test MultiprocessTestHelperTest;
-TEST_F(MultiprocessTestHelperTest, RunChild) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_RunChild DISABLED_RunChild
+#else
+#define MAYBE_RunChild RunChild
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessTestHelperTest, MAYBE_RunChild) {
MultiprocessTestHelper helper;
EXPECT_TRUE(helper.server_platform_handle.is_valid());
@@ -55,14 +61,26 @@
return 123;
}
-TEST_F(MultiprocessTestHelperTest, TestChildMainNotFound) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_TestChildMainNotFound DISABLED_TestChildMainNotFound
+#else
+#define MAYBE_TestChildMainNotFound TestChildMainNotFound
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessTestHelperTest, MAYBE_TestChildMainNotFound) {
MultiprocessTestHelper helper;
helper.StartChild("NoSuchTestChildMain");
int result = helper.WaitForChildShutdown();
EXPECT_FALSE(result >= 0 && result <= 127);
}
-TEST_F(MultiprocessTestHelperTest, PassedChannel) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_PassedChannel DISABLED_PassedChannel
+#else
+#define MAYBE_PassedChannel PassedChannel
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessTestHelperTest, MAYBE_PassedChannel) {
MultiprocessTestHelper helper;
EXPECT_TRUE(helper.server_platform_handle.is_valid());
helper.StartChild("PassedChannel");
@@ -109,7 +127,13 @@
return static_cast<int>(c);
}
-TEST_F(MultiprocessTestHelperTest, ChildTestPasses) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_ChildTestPasses DISABLED_ChildTestPasses
+#else
+#define MAYBE_ChildTestPasses ChildTestPasses
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessTestHelperTest, MAYBE_ChildTestPasses) {
MultiprocessTestHelper helper;
EXPECT_TRUE(helper.server_platform_handle.is_valid());
helper.StartChild("ChildTestPasses");
@@ -122,7 +146,13 @@
IsNonBlocking(MultiprocessTestHelper::client_platform_handle.get()));
}
-TEST_F(MultiprocessTestHelperTest, ChildTestFailsAssert) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_ChildTestFailsAssert DISABLED_ChildTestFailsAssert
+#else
+#define MAYBE_ChildTestFailsAssert ChildTestFailsAssert
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessTestHelperTest, MAYBE_ChildTestFailsAssert) {
MultiprocessTestHelper helper;
EXPECT_TRUE(helper.server_platform_handle.is_valid());
helper.StartChild("ChildTestFailsAssert");
@@ -138,7 +168,13 @@
CHECK(false) << "Not reached";
}
-TEST_F(MultiprocessTestHelperTest, ChildTestFailsExpect) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_ChildTestFailsExpect DISABLED_ChildTestFailsExpect
+#else
+#define MAYBE_ChildTestFailsExpect ChildTestFailsExpect
+#endif // defined(OS_ANDROID)
+TEST_F(MultiprocessTestHelperTest, MAYBE_ChildTestFailsExpect) {
MultiprocessTestHelper helper;
EXPECT_TRUE(helper.server_platform_handle.is_valid());
helper.StartChild("ChildTestFailsExpect");
diff --git a/mojo/tools/data/android_unittests b/mojo/tools/data/android_unittests
new file mode 100644
index 0000000..018de02
--- /dev/null
+++ b/mojo/tools/data/android_unittests
@@ -0,0 +1,5 @@
+# This file contains a list of android Mojo gtest unit tests.
+# TODO(qsr): Update the base list to allow annotating test per platform.
+
+# System tests:
+mojo_system_unittests
diff --git a/mojo/tools/mojob.py b/mojo/tools/mojob.py
index ef7e0ae..1075006 100755
--- a/mojo/tools/mojob.py
+++ b/mojo/tools/mojob.py
@@ -141,13 +141,15 @@
return subprocess.call(['ninja', '-C', out_dir, 'root'])
-def run_testrunner(out_dir, testlist):
+def run_testrunner(config, out_dir, testlist):
command = ['python']
- if platform.system() == 'Linux':
+ if platform.system() == 'Linux' and config.target_os != Config.OS_ANDROID:
command.append('./testing/xvfb.py')
command.append(out_dir)
command.append(os.path.join('mojo', 'tools', 'test_runner.py'))
+ if config.target_os == Config.OS_ANDROID:
+ command.append('--android')
command.append(os.path.join('mojo', 'tools', 'data', testlist))
command.append(out_dir)
command.append('mojob_test_successes')
@@ -156,6 +158,9 @@
def run_apptests(config):
out_dir = get_out_dir(config)
+ if config.target_os == Config.OS_ANDROID:
+ return 0
+
print 'Running application tests in %s ...' % out_dir
command = ['python']
if platform.system() == 'Linux':
@@ -171,12 +176,16 @@
def run_unittests(config):
out_dir = get_out_dir(config)
print 'Running unit tests in %s ...' % out_dir
- return run_testrunner(out_dir, 'unittests')
+ if config.target_os == Config.OS_ANDROID:
+ test_list = 'android_unittests'
+ else:
+ test_list = 'unittests'
+ return run_testrunner(config, out_dir, test_list)
def run_skytests(config):
out_dir = get_out_dir(config)
- if platform.system() != 'Linux':
+ if platform.system() != 'Linux' or config.target_os == Config.OS_ANDROID:
return 0
command = []
@@ -220,7 +229,7 @@
if exit_code:
return exit_code
- if platform.system() != 'Linux':
+ if platform.system() != 'Linux' or config.target_os == Config.OS_ANDROID:
print ('Python bindings tests are only supported on Linux.')
return
@@ -261,7 +270,7 @@
def darttest(config):
out_dir = get_out_dir(config)
print 'Running Dart tests in %s ...' % out_dir
- exit_code = run_testrunner(out_dir, 'dart_unittests')
+ exit_code = run_testrunner(config, out_dir, 'dart_unittests')
if exit_code:
return exit_code
diff --git a/mojo/tools/mopy/file_hash.py b/mojo/tools/mopy/file_hash.py
new file mode 100644
index 0000000..abdd821
--- /dev/null
+++ b/mojo/tools/mopy/file_hash.py
@@ -0,0 +1,26 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import logging
+
+# pylint: disable=E0611
+from hashlib import sha256
+
+from mopy.memoize import memoize
+
+_logging = logging.getLogger()
+
+@memoize
+def file_hash(filename):
+ """Returns a string representing the hash of the given file."""
+ _logging.debug("Hashing %s ...", filename)
+ with open(filename, mode='rb') as f:
+ m = sha256()
+ while True:
+ block = f.read(4096)
+ if not block:
+ break
+ m.update(block)
+ _logging.debug(" => %s", m.hexdigest())
+ return m.hexdigest()
diff --git a/mojo/tools/mopy/memoize.py b/mojo/tools/mopy/memoize.py
new file mode 100644
index 0000000..249440b
--- /dev/null
+++ b/mojo/tools/mopy/memoize.py
@@ -0,0 +1,18 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import sys
+
+# pylint: disable=C0301
+# Based on/taken from
+# http://code.activestate.com/recipes/578231-probably-the-fastest-memoization-decorator-in-the-/
+# (with cosmetic changes).
+# pylint: enable=C0301
+def memoize(f):
+ """Memoization decorator for a function taking a single argument."""
+ class Memoize(dict):
+ def __missing__(self, key):
+ rv = self[key] = f(key)
+ return rv
+ return Memoize().__getitem__
diff --git a/mojo/tools/mopy/transitive_hash.py b/mojo/tools/mopy/transitive_hash.py
index 48b6a60..740892b 100644
--- a/mojo/tools/mopy/transitive_hash.py
+++ b/mojo/tools/mopy/transitive_hash.py
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import hashlib
import logging
import platform
import subprocess
@@ -13,36 +12,12 @@
# pylint: enable=E0611
from os.path import basename, realpath
+from mopy.file_hash import file_hash
+from mopy.memoize import memoize
+
_logging = logging.getLogger()
-# pylint: disable=C0301
-# Based on/taken from
-# http://code.activestate.com/recipes/578231-probably-the-fastest-memoization-decorator-in-the-/
-# (with cosmetic changes).
-# pylint: enable=C0301
-def _memoize(f):
- """Memoization decorator for a function taking a single argument."""
- class Memoize(dict):
- def __missing__(self, key):
- rv = self[key] = f(key)
- return rv
- return Memoize().__getitem__
-
-@_memoize
-def _file_hash(filename):
- """Returns a string representing the hash of the given file."""
- _logging.debug("Hashing %s ...", filename)
- with open(filename, mode='rb') as f:
- m = hashlib.sha256()
- while True:
- block = f.read(4096)
- if not block:
- break
- m.update(block)
- _logging.debug(" => %s", m.hexdigest())
- return m.hexdigest()
-
-@_memoize
+@memoize
def _get_dependencies(filename):
"""Returns a list of filenames for files that the given file depends on."""
if platform.system() == 'Windows':
@@ -69,7 +44,7 @@
to_hash = [filename]
while to_hash:
current_filename = realpath(to_hash.pop())
- current_hash = _file_hash(current_filename)
+ current_hash = file_hash(current_filename)
if current_hash in hashes:
_logging.debug("Already seen %s (%s) ...", current_filename, current_hash)
continue
diff --git a/mojo/tools/test_runner.py b/mojo/tools/test_runner.py
index ea892af..27fe1fa 100755
--- a/mojo/tools/test_runner.py
+++ b/mojo/tools/test_runner.py
@@ -5,6 +5,7 @@
"""A "smart" test runner for gtest unit tests (that caches successes)."""
+import argparse
import logging
import os
import platform
@@ -13,46 +14,59 @@
_logging = logging.getLogger()
-from mopy.transitive_hash import transitive_hash
+from mopy.paths import Paths
+from mopy.transitive_hash import file_hash, transitive_hash
-def main(argv):
+paths = Paths()
+
+def main():
logging.basicConfig()
# Uncomment to debug:
# _logging.setLevel(logging.DEBUG)
- if len(argv) < 3 or len(argv) > 4:
- print "Usage: %s gtest_list_file root_dir [successes_cache_file]" % \
- os.path.basename(argv[0])
- return 0 if len(argv) < 2 else 1
+ parser = argparse.ArgumentParser(
+ description="A 'smart' test runner for gtest unit tests (that caches "
+ "successes).")
- _logging.debug("Test list file: %s", argv[1])
- with open(argv[1], 'rb') as f:
+ os_group = parser.add_mutually_exclusive_group()
+ os_group.add_argument("--android", help="Run tests for android",
+ action='store_true')
+
+ parser.add_argument("gtest_list_file",
+ help="The file containing the tests to run.")
+ parser.add_argument("root_dir", help="The build directory.")
+ parser.add_argument("successes_cache_filename",
+ help="The file caching test results.", default=None,
+ nargs='?')
+ args = parser.parse_args()
+
+ _logging.debug("Test list file: %s", args.gtest_list_file)
+ with open(args.gtest_list_file, 'rb') as f:
gtest_list = [y for y in [x.strip() for x in f.readlines()] \
if y and y[0] != '#']
_logging.debug("Test list: %s" % gtest_list)
- print "Running tests in directory: %s" % argv[2]
- os.chdir(argv[2])
+ print "Running tests in directory: %s" % args.root_dir
+ os.chdir(args.root_dir)
- if len(argv) == 4 and argv[3]:
- successes_cache_filename = argv[3]
- print "Successes cache file: %s" % successes_cache_filename
+ if args.successes_cache_filename:
+ print "Successes cache file: %s" % args.successes_cache_filename
else:
- successes_cache_filename = None
print "No successes cache file (will run all tests unconditionally)"
- if successes_cache_filename:
+ if args.successes_cache_filename:
# This file simply contains a list of transitive hashes of tests that
# succeeded.
try:
_logging.debug("Trying to read successes cache file: %s",
- successes_cache_filename)
- with open(argv[3], 'rb') as f:
+ args.successes_cache_filename)
+ with open(args.successes_cache_filename, 'rb') as f:
successes = set([x.strip() for x in f.readlines()])
_logging.debug("Successes: %s", successes)
except IOError:
# Just assume that it didn't exist, or whatever.
- print "Failed to read successes cache file %s (will create)" % argv[3]
+ print ("Failed to read successes cache file %s (will create)" %
+ args.successes_cache_filename)
successes = set()
# Run gtests with color if we're on a TTY (and we're not being told explicitly
@@ -62,8 +76,8 @@
os.environ['GTEST_COLOR'] = 'yes'
# TODO(vtl): We may not close this file on failure.
- successes_cache_file = open(successes_cache_filename, 'ab') \
- if successes_cache_filename else None
+ successes_cache_file = open(args.successes_cache_filename, 'ab') \
+ if args.successes_cache_filename else None
for gtest in gtest_list:
if gtest[0] == '*':
gtest = gtest[1:]
@@ -72,13 +86,19 @@
else:
cacheable = True
+ gtest_file = gtest
if platform.system() == 'Windows':
- gtest += ".exe"
+ gtest_file += ".exe"
+ if args.android:
+ gtest_file = gtest + "_apk/" + gtest + "-debug.apk"
if successes_cache_file and cacheable:
_logging.debug("Getting transitive hash for %s ... " % gtest)
try:
- gtest_hash = transitive_hash(gtest)
+ if args.android:
+ gtest_hash = file_hash(gtest_file)
+ else:
+ gtest_hash = transitive_hash(gtest_file)
except subprocess.CalledProcessError:
print "Failed to get transitive hash for %s" % gtest
return 1
@@ -91,10 +111,22 @@
print "Running %s...." % gtest,
sys.stdout.flush()
try:
- subprocess.check_output(["./" + gtest], stderr=subprocess.STDOUT)
+ if args.android:
+ command = [
+ "python",
+ os.path.join(paths.src_root, "build", "android", "test_runner.py"),
+ "gtest",
+ "--output-directory",
+ args.root_dir,
+ "-s",
+ gtest,
+ ]
+ else:
+ command = ["./" + gtest]
+ subprocess.check_output(command, stderr=subprocess.STDOUT)
print "Succeeded"
# Record success.
- if successes_cache_filename and cacheable:
+ if args.successes_cache_filename and cacheable:
successes.add(gtest_hash)
successes_cache_file.write(gtest_hash + '\n')
successes_cache_file.flush()
@@ -114,4 +146,4 @@
return 0
if __name__ == '__main__':
- sys.exit(main(sys.argv))
+ sys.exit(main())
