diff options
author | Brian Carlstrom <bdc@google.com> | 2011-09-27 13:46:08 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 13:46:08 -0700 |
commit | 1906b97b9ae92c18f7fc9b45e959f755fc2cbbe9 (patch) | |
tree | 3ce278b2393aa0d1bf8489c9bfb72b1990347bf8 | |
parent | 8ab8328fe00ba9906fa8c1f6b96003d84f784215 (diff) | |
parent | dddab0c244e639d30276b6a66ec90f8648c81e78 (diff) | |
download | art-1906b97b9ae92c18f7fc9b45e959f755fc2cbbe9.zip art-1906b97b9ae92c18f7fc9b45e959f755fc2cbbe9.tar.gz art-1906b97b9ae92c18f7fc9b45e959f755fc2cbbe9.tar.bz2 |
Merge "Kill oat_process before rerunning" into dalvik-dev
-rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -148,6 +148,7 @@ test-art-target-oat-process-Calculator: $(TARGET_OUT_APPS)/Calculator.oat $(TARG adb shell start; \ sleep 30; \ fi + adb shell kill `adb shell ps | fgrep com.android.calculator2 | sed -e 's/[^ ]* *\([0-9]*\).*/\1/'` adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Xbootimage:/system/framework/boot.oat -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch /sdcard/test-art-target-process-Calculator" $(hide) (adb pull /sdcard/test-art-target-process-Calculator /tmp/ && echo test-art-target-process-Calculator PASSED) || echo test-art-target-process-Calculator FAILED $(hide) rm /tmp/test-art-target-process-Calculator |