summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
Diffstat (limited to 'testrunner')
-rwxr-xr-xtestrunner/run_command.py2
-rw-r--r--testrunner/test_defs.xml17
2 files changed, 17 insertions, 2 deletions
diff --git a/testrunner/run_command.py b/testrunner/run_command.py
index 7d1f547ea..79c7ea5cd 100755
--- a/testrunner/run_command.py
+++ b/testrunner/run_command.py
@@ -144,7 +144,7 @@ def RunHostCommand(binary, valgrind=False):
else:
# Need the full path to valgrind to avoid other versions on the system.
subproc = subprocess.Popen(["/usr/bin/valgrind", "--tool=memcheck",
- "--leak-check=yes", "-q", full_path],
+ "--leak-check=yes", "-q", binary],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
# Cannot rely on the retcode of valgrind. Instead look for an empty output.
valgrind_out = subproc.communicate()[0].strip()
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 44db464e9..35d8c065b 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -44,6 +44,12 @@ See test_defs.xsd for more information.
coverage_target="framework"
continuous="true" />
+<test name="account"
+ build_path="frameworks/base/tests/AndroidTests"
+ package="com.android.unit_tests"
+ class="com.android.unit_tests.accounts.AccountManagerServiceTest"
+ coverage_target="framework" />
+
<test name="smoke"
build_path="frameworks/base/tests/SmokeTest"
package="com.android.smoketest.tests"
@@ -103,6 +109,12 @@ See test_defs.xsd for more information.
-->
+<test name="contentprovideroperation"
+ build_path="frameworks/base/tests/FrameworkTest"
+ package="com.android.frameworktest.tests"
+ class="android.content.ContentProviderOperationTest"
+ coverage_target="framework" />
+
<test name="tablemerger"
build_path="frameworks/base/tests/FrameworkTest"
package="com.android.frameworktest.tests"
@@ -427,7 +439,6 @@ See test_defs.xsd for more information.
<test name="mms"
build_path="packages/apps/Mms"
package="com.android.mms.tests"
- runner="com.android.mms.ui.MMSInstrumentationTestRunner"
coverage_target="Mms" />
<test name="mmslaunch"
@@ -453,6 +464,10 @@ See test_defs.xsd for more information.
description="Bionic libstdc++."
extra_build_args="BIONIC_TESTS=1" />
+<test-native name="libskia"
+ build_path="external/skia/tests"
+ description="Skia tests." />
+
<!-- Android STL tests -->
<test-native name="astl"
build_path="external/astl/tests"