summaryrefslogtreecommitdiffstats
path: root/core/tests/systemproperties
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-03-07 11:32:51 -0800
committersatok <satok@google.com>2011-03-07 11:32:51 -0800
commitdecee8d35b1af3fca226a00436976dfbfcc8397c (patch)
treed7aa780a173b71e970d482a85f19ae891c9d2e8f /core/tests/systemproperties
parent3fff6514979ee6f57fd236e73959462376095e4e (diff)
downloadframeworks_base-decee8d35b1af3fca226a00436976dfbfcc8397c.zip
frameworks_base-decee8d35b1af3fca226a00436976dfbfcc8397c.tar.gz
frameworks_base-decee8d35b1af3fca226a00436976dfbfcc8397c.tar.bz2
Fix a test for system properties in frameworks/base/core
Change-Id: Id588d63ae4cae8c25b430c4ff7719173dacc70bb
Diffstat (limited to 'core/tests/systemproperties')
-rw-r--r--core/tests/systemproperties/AndroidManifest.xml4
-rwxr-xr-xcore/tests/systemproperties/run_core_systemproperties_test.sh3
2 files changed, 5 insertions, 2 deletions
diff --git a/core/tests/systemproperties/AndroidManifest.xml b/core/tests/systemproperties/AndroidManifest.xml
index ad0abf4..1608788 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 48880f3..d39adbb 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