commit 87ff4dfecb16aa4221fae22a30a77ae7fe51c08d
author Brian Muramatsu <btmura@google.com> Fri Dec 16 11:41:17 2011 -0800
committer Brian Muramatsu <btmura@google.com> Fri Dec 16 11:41:17 2011 -0800
tree e9418b4016f58f54c32e4755ad98d355e9163863
parent 4927b707def7ba0e8d9ac4f238383c44604b8a6e

Make CTS and CTS-TF Plans Same

Bug 5563917

Trying to get closer to deleting the extra vm-tests directory
now that we've moved to Tradefed.

Change-Id: I13203f3561138f9223ba8ee2db8131f70b1d25b0

tools/utils/buildCts.py

diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index aa38165..9eb26af 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -107,13 +107,9 @@
       packages.append(doc.GetAttr('TestPackage', 'appPackageName'))
 
     plan = tools.TestPlan(packages)
-    plan.Exclude(r'android\.core\.vm-tests-tf')
-    plan.Exclude('android\.performance.*')
-    self.__WritePlan(plan, 'CTS')
-
     plan.Exclude('android\.core\.vm-tests')
     plan.Exclude('android\.performance.*')
-    plan.Include(r'android\.core\.vm-tests-tf')
+    self.__WritePlan(plan, 'CTS')
     self.__WritePlan(plan, 'CTS-TF')
 
     plan.Exclude(r'android\.tests\.sigtest')
@@ -125,11 +121,6 @@
     self.__WritePlan(plan, 'Java')
 
     plan = tools.TestPlan(packages)
-    plan.Include(r'android\.core\.vm-tests')
-    plan.Exclude(r'android\.core\.vm-tests-tf')
-    self.__WritePlan(plan, 'VM')
-
-    plan = tools.TestPlan(packages)
     plan.Include(r'android\.core\.vm-tests-tf')
     self.__WritePlan(plan, 'VM-TF')