Dont run a test package if there aren't any tests
bug: 17660378
Change-Id: Icea76f7ad00e0ab5af3cbde3904422e5e14b4706
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
index 45c176a..3c9b6d6 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
@@ -438,7 +438,7 @@
}
/**
- * Get the collection of tests in this test package.
+ * {@inheritDoc}
*/
@Override
public Collection<TestIdentifier> getTests() {
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
index 4c549e2..ce91a8a 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
@@ -84,7 +84,14 @@
Set<TestPackageDef> defs = parser.getTestPackageDefs();
if (!defs.isEmpty()) {
for (TestPackageDef def : defs) {
- mTestMap.get(def.getAbi().getName()).put(def.getAppPackageName(), def);
+ String name = def.getAppPackageName();
+ String abi = def.getAbi().getName();
+ if (def.getTests().size() > 0) {
+ mTestMap.get(abi).put(name, def);
+ } else {
+ Log.i(LOG_TAG, String.format("No tests in %s for %s, skipping",
+ name, abi));
+ }
}
} else {
Log.w(LOG_TAG, String.format("Could not find test package info in xml file %s",