commit 0ccd9649f09a53e6dd086c5a7b86c04c98a97ded
author Phil Dubach <nobody@android.com> Tue May 05 17:42:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue May 05 17:42:46 2009 -0700
tree 4decf385158a776e73f192975caad5cc8fe7677f
parent 07c442b4c3c001c1c159ffbb41ab3e32e5816f75
parent 7c19589fd91f1027c09171b32f180c3d32473192

am 7c19589: AI 148329: CTS: Exclude performance tests from the CTS and A

Merge commit '7c19589fd91f1027c09171b32f180c3d32473192' into donut

* commit '7c19589fd91f1027c09171b32f180c3d32473192':
  AI 148329: CTS: Exclude performance tests from the CTS and Android test plans

tools/utils/genDefaultTestPlan.sh

diff --git a/tools/utils/genDefaultTestPlan.sh b/tools/utils/genDefaultTestPlan.sh
index 9baffb4..7da6bbf 100644
--- a/tools/utils/genDefaultTestPlan.sh
+++ b/tools/utils/genDefaultTestPlan.sh
@@ -155,12 +155,12 @@
     PLAN_PATH=${2}
 
     TEST_PLAN=${PLAN_PATH}/CTS.xml
-    LIST=""
+    LIST="${PERFORMANCE_TESTS}"
     TYPE="exclusive"
     genTestPlan ${TESTCASE_PATH} ${TEST_PLAN} ${TYPE}  "${LIST}"
 
     TEST_PLAN=${PLAN_PATH}/Android.xml
-    LIST="${SIGNATURE_TESTS} ${ANDROID_CORE_TESTS} ${ANDROID_CORE_VM_TESTS}"
+    LIST="${SIGNATURE_TESTS} ${ANDROID_CORE_TESTS} ${ANDROID_CORE_VM_TESTS} ${PERFORMANCE_TESTS}"
     TYPE="exclusive"
     genTestPlan ${TESTCASE_PATH} ${TEST_PLAN} ${TYPE}  "${LIST}"