From decee8d35b1af3fca226a00436976dfbfcc8397c Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Mon, 7 Mar 2011 11:32:51 -0800
Subject: [PATCH] Fix a test for system properties in frameworks/base/core

Change-Id: Id588d63ae4cae8c25b430c4ff7719173dacc70bb
---
 core/tests/systemproperties/AndroidManifest.xml               | 4 ++--
 core/tests/systemproperties/run_core_systemproperties_test.sh | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/tests/systemproperties/AndroidManifest.xml b/core/tests/systemproperties/AndroidManifest.xml
index ad0abf475c9b0..160878839fc05 100644
--- a/core/tests/systemproperties/AndroidManifest.xml
+++ b/core/tests/systemproperties/AndroidManifest.xml
@@ -24,7 +24,7 @@
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.android.frameworks.coretests"
-            android:label="Frameworks Core Tests" />
+            android:targetPackage="com.android.frameworks.coretests.systemproperties"
+            android:label="Frameworks SystemProperties Core Tests" />
 
 </manifest>
diff --git a/core/tests/systemproperties/run_core_systemproperties_test.sh b/core/tests/systemproperties/run_core_systemproperties_test.sh
index 48880f3652fe7..d39adbbfa390c 100755
--- a/core/tests/systemproperties/run_core_systemproperties_test.sh
+++ b/core/tests/systemproperties/run_core_systemproperties_test.sh
@@ -16,6 +16,9 @@ fi
 if [[ $rebuild == true ]]; then
   make -j4 FrameworksCoreSystemPropertiesTests
   TESTAPP=${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreSystemPropertiesTests.apk
+  COMMAND="adb install -r $TESTAPP"
+  echo $COMMAND
+  $COMMAND
 fi
 
 adb shell am instrument -w -e class android.os.SystemPropertiesTest com.android.frameworks.coretests.systemproperties/android.test.InstrumentationTestRunner