commit e7fb6d1cee667ef18c3459cef435067194ea0d75
author Nicolas Geoffray <ngeoffray@google.com> Thu Apr 27 21:45:35 2017 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue May 02 12:44:36 2017 +0100
tree a431e77de29b489a88196bd2fe2cb64cf7b6b8c4
parent 4c988898116049226a4cf49cbfbebaca44008576

If a profile is passed, we should always pass output-vdex and input-vdex.

Passing only input-vdex means the vdex will be updated in place, which
is not something we do with a profile in production.

Test: 629-vdex

(cherry picked from commit fbc4f118aff7c284f0d9d2ca209166b7ff79e542)

Change-Id: Ie7afabe7e017476fe5347781f304043db2555462

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index f8b008b..6e13aad 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -585,7 +585,9 @@
     # Use -k 1m to SIGKILL it a minute later if it hasn't ended.
     dex2oat_cmdline="timeout -k 1m -s SIGRTMIN+2 1m ${dex2oat_cmdline}"
   fi
-  if [ "$TEST_VDEX" = "y" ]; then
+  if [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then
+    vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
+  elif [ "$TEST_VDEX" = "y" ]; then
     vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
   fi
 fi