diff options
| -rw-r--r-- | test/629-vdex-speed/run | 2 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/629-vdex-speed/run b/test/629-vdex-speed/run index f1b0a95f64..1477e3d5a8 100644 --- a/test/629-vdex-speed/run +++ b/test/629-vdex-speed/run @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec ${RUN} --vdex "${@}" +exec ${RUN} --vdex --vdex-filter speed "${@}" diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 9e85a73f9a..66dc3c17f9 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -993,8 +993,12 @@ function write_dex2oat_cmdlines { if [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --input-vdex=$DEX_LOCATION/oat/$ISA/$name.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$name.vdex" elif [ "$TEST_VDEX" = "y" ]; then - # We delete the odex file so that the runtime only picks up the vdex file. - vdex_cmdline="rm $DEX_LOCATION/oat/$ISA/$name.odex" + if [ "$VDEX_ARGS" = "" ]; then + # If no arguments need to be passed, just delete the odex file so that the runtime only picks up the vdex file. + vdex_cmdline="rm $DEX_LOCATION/oat/$ISA/$name.odex" + else + vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --input-vdex=$DEX_LOCATION/oat/$ISA/$name.vdex" + fi elif [ "$TEST_DM" = "y" ]; then dex2oat_cmdline="${dex2oat_cmdline} --copy-dex-files=false --output-vdex=$DEX_LOCATION/oat/$ISA/primary.vdex" dm_cmdline="zip -qj $DEX_LOCATION/oat/$ISA/$name.dm $DEX_LOCATION/oat/$ISA/primary.vdex" |