summaryrefslogtreecommitdiffstats
path: root/run-core-tests
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2009-10-20 11:13:20 -0700
committerJesse Wilson <jessewilson@google.com>2009-10-20 11:13:20 -0700
commitaddf3d7beb49b966747392827aa433f6713bd425 (patch)
tree8b2cf6bcbe5ff12fccf080f362709f342cfdead3 /run-core-tests
parent4a19d6a3afb37e789a273d746cd59bb6d42839b8 (diff)
downloadlibcore-addf3d7beb49b966747392827aa433f6713bd425.zip
libcore-addf3d7beb49b966747392827aa433f6713bd425.tar.gz
libcore-addf3d7beb49b966747392827aa433f6713bd425.tar.bz2
Including cert store location for test runner.
This helps to avoid bad interactions between tests that rely on the "java.home" property for different things. Preferences tests tend to change it (to the writable temp directory), but the certs tests fall back to it for the trust store. See also TrustManagerFactoryImpl.java.
Diffstat (limited to 'run-core-tests')
-rwxr-xr-xrun-core-tests6
1 files changed, 5 insertions, 1 deletions
diff --git a/run-core-tests b/run-core-tests
index 70ab320..134a032 100755
--- a/run-core-tests
+++ b/run-core-tests
@@ -25,6 +25,10 @@ tmp=/data/core-tests.tmp
mkdir $tmp
chmod 777 $tmp
-exec dalvikvm -Duser.language=en -Duser.region=US -Djava.io.tmpdir=$tmp \
+exec dalvikvm \
+ -Duser.language=en \
+ -Duser.region=US \
+ -Djava.io.tmpdir=$tmp \
+ -Djavax.net.ssl.trustStore=/system/etc/security/cacerts.bks \
-classpath /system/framework/core-tests.jar \
-Xmx64M com.google.coretests.Main "$@"