Fix dm-test invocation Due to a bad merge --copy-dex-files=false was passed to the vdex_cmdline instead of the dex2oat_cmdline. Test: test-art-host Bug: 178055795 Merged-In: I5b104329af899ea62dc1779800264bad6b5424a4 Change-Id: Ieb6e324232996ec8ad5119fcbf20b81d62678fd2 (cherry picked from commit 6c9431c02e739de83c7c804d64e4a4656d24d55f)
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 423f9b3..7d85b10 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar
@@ -963,9 +963,9 @@ elif [ "$TEST_VDEX" = "y" ]; then vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex" elif [ "$TEST_DM" = "y" ]; then - dex2oat_cmdline="${dex2oat_cmdline} --output-vdex=$DEX_LOCATION/oat/$ISA/primary.vdex" + dex2oat_cmdline="${dex2oat_cmdline} --copy-dex-files=false --output-vdex=$DEX_LOCATION/oat/$ISA/primary.vdex" dm_cmdline="zip -qj $DEX_LOCATION/oat/$ISA/$TEST_NAME.dm $DEX_LOCATION/oat/$ISA/primary.vdex" - vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --copy-dex-files=false --dump-timings --dm-file=$DEX_LOCATION/oat/$ISA/$TEST_NAME.dm" + vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --dump-timings --dm-file=$DEX_LOCATION/oat/$ISA/$TEST_NAME.dm" elif [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then vdex_cmdline="${dex2oat_cmdline} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex" fi