diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-01 08:47:51 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-05-01 09:02:57 -0700 |
| commit | d6728434313a09cb5efc2c813273445f93e7a4c0 (patch) | |
| tree | 94bd76bcbc255cef343c0e12fbef652ae9a295f3 /test/etc/push-and-run-test-jar | |
| parent | 69cf921f5ab4467fa2c109e30ea5caca2a20790c (diff) | |
| download | art-d6728434313a09cb5efc2c813273445f93e7a4c0.zip art-d6728434313a09cb5efc2c813273445f93e7a4c0.tar.gz art-d6728434313a09cb5efc2c813273445f93e7a4c0.tar.bz2 | |
ART: Fix target run-tests to build architecture directories
The recent dalvik-cache layout changes require the tests to create
the right directories, as ART does not auto-create outside of /tmp
(cherry picked from commit 335438a512d016bb0e582304c0a6a1ad510bcc47)
Change-Id: Ie9045cc34be8b2f106fdec4f3bf37ad830637756
Diffstat (limited to 'test/etc/push-and-run-test-jar')
| -rwxr-xr-x | test/etc/push-and-run-test-jar | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar index 93d7e79..e0d2f1d 100755 --- a/test/etc/push-and-run-test-jar +++ b/test/etc/push-and-run-test-jar @@ -140,7 +140,7 @@ if [ "$DEBUGGER" = "y" ]; then fi if [ "$GDB" = "y" ]; then - gdb="/data/gdbserver$TARGET_SUFFIX :5039" + gdb="gdbserver$TARGET_SUFFIX :5039" gdbargs="$exe" fi @@ -150,7 +150,7 @@ fi JNI_OPTS="-Xjnigreflimit:512 -Xcheck:jni" -cmdline="cd $DEX_LOCATION && mkdir dalvik-cache && export ANDROID_DATA=$DEX_LOCATION && export DEX_LOCATION=$DEX_LOCATION && \ +cmdline="cd $DEX_LOCATION && mkdir -p dalvik-cache/{arm,arm64,mips,x86,x86_64} && export ANDROID_DATA=$DEX_LOCATION && export DEX_LOCATION=$DEX_LOCATION && \ $INVOKE_WITH $gdb /system/bin/dalvikvm$TARGET_SUFFIX $FLAGS $gdbargs -XXlib:$LIB $ZYGOTE $JNI_OPTS $INT_OPTS $DEBUGGER_OPTS $BOOT_OPT -cp $DEX_LOCATION/$TEST_NAME.jar Main" if [ "$DEV_MODE" = "y" ]; then echo $cmdline "$@" |