From 164e7967b1f47586338805e2ebfdee02a5de85db Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Thu, 6 Jul 2017 16:20:11 -0700 Subject: Bit: support running all tests in a java package. If a target name ends with a period, treat it as a package name and run with "-e package" instead of "-e class". Test: bit CtsProviderTestCases:android.provider.cts.contacts. Change-Id: I3a9a0cbef76f57c46c41bf168b7e94eebecaf671 --- tools/bit/adb.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'tools/bit/adb.cpp') diff --git a/tools/bit/adb.cpp b/tools/bit/adb.cpp index 0c8424de566d..c8faf5c66722 100644 --- a/tools/bit/adb.cpp +++ b/tools/bit/adb.cpp @@ -283,10 +283,19 @@ run_instrumentation_test(const string& packageName, const string& runner, const cmd.AddArg("instrument"); cmd.AddArg("-w"); cmd.AddArg("-m"); - if (className.length() > 0) { - cmd.AddArg("-e"); - cmd.AddArg("class"); - cmd.AddArg(className); + const int classLen = className.length(); + if (classLen > 0) { + if (classLen > 1 && className[classLen - 1] == '.') { + cmd.AddArg("-e"); + cmd.AddArg("package"); + + // "am" actually accepts without removing the last ".", but for cleanlines... + cmd.AddArg(className.substr(0, classLen - 1)); + } else { + cmd.AddArg("-e"); + cmd.AddArg("class"); + cmd.AddArg(className); + } } cmd.AddArg(packageName + "/" + runner); -- cgit v1.2.3-59-g8ed1b