diff options
| -rwxr-xr-x | test/etc/run-test-jar | 2 | ||||
| -rw-r--r-- | test/knownfailures.json | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index f4e755222e..d31bc7d6c3 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -899,7 +899,7 @@ def write_dex2oat_cmdlines(name: str): # If no arguments need to be passed, just delete the odex file so that the runtime only picks up the vdex file. vdex_cmdline=f"rm {DEX_LOCATION}/oat/{ISA}/{name}.odex" else: - vdex_cmdline=f"{dex2oat_cmdline} {VDEX_ARGS} --input-vdex={DEX_LOCATION}/oat/{ISA}/{name}.vdex" + vdex_cmdline=f"{dex2oat_cmdline} {VDEX_ARGS} --compact-dex-level=none --input-vdex={DEX_LOCATION}/oat/{ISA}/{name}.vdex" elif TEST_DEX2OAT_DM: vdex_cmdline=f"{dex2oat_cmdline} {VDEX_ARGS} --dump-timings --dm-file={DEX_LOCATION}/oat/{ISA}/{name}.dm" dex2oat_cmdline=f"{dex2oat_cmdline} --copy-dex-files=false --output-vdex={DEX_LOCATION}/oat/{ISA}/primary.vdex" diff --git a/test/knownfailures.json b/test/knownfailures.json index 9e457d05db..3762623309 100644 --- a/test/knownfailures.json +++ b/test/knownfailures.json @@ -81,7 +81,7 @@ }, { "tests" : "629-vdex-speed", - "variant": "interp-ac | interpreter | jit", + "variant": "interp-ac | interpreter | no-prebuild", "description": "629 requires compilation." }, { @@ -383,12 +383,6 @@ "variant": "interp-ac" }, { - "tests": ["629-vdex-speed", - "634-vdex-duplicate"], - "description": ["Profile driven dexlayout does not work with vdex or dex verifier."], - "variant": "speed-profile" - }, - { "test_patterns": ["616-cha.*"], "description": ["cha tests rely on knowing the exact set of optimizations available. ", "Debuggable runtimes change the set of optimizations."], @@ -712,10 +706,9 @@ "description": "Test disabled due to redefine-stress disabling intrinsics which changes the trace output slightly." }, { - "tests": ["137-cfi", "629-vdex-speed"], - "description": [ "Tests require speed compilation which is no longer the default for", - "no-prebuild or no-image configs."], - "variant": "no-prebuild | no-image" + "tests": ["137-cfi"], + "description": [ "Tests require speed compilation which is no longer the default for no-prebuild"], + "variant": "no-prebuild" }, { "tests": ["059-finalizer-throw", "063-process-manager"], @@ -760,13 +753,6 @@ "bug": "b/64683522" }, { - "tests": ["628-vdex", - "629-vdex-speed", - "634-vdex-duplicate"], - "variant": "cdex-fast", - "description": ["Tests that depend on input-vdex are not supported with compact dex"] - }, - { "tests": ["661-oat-writer-layout"], "variant": "interp-ac | interpreter | jit | jit-on-first-use | no-prebuild | no-image | trace | redefine-stress | jvmti-stress", "description": ["Test is designed to only check --optimizing"] |