diff options
| author | 2017-12-13 11:49:51 -0800 | |
|---|---|---|
| committer | 2017-12-15 08:20:08 -0800 | |
| commit | 2c4b084bf93ddfea6b60d05ff82c44dab9de9f28 (patch) | |
| tree | e1dc28ba175bfa67def5db8b22847b15f87bdb93 /runtime/common_runtime_test.h | |
| parent | ba3a790338725a37ecd4cb314c4a6147e29aef38 (diff) | |
Fix cdex bugs to enable ART_DEFAULT_COMPACT_DEX_LEVEL=fast tests passing
Compute dex checksum for compact dex generation. Handle input vdex
by not aborting in oat_writer, instead just avoid generating compact
dex for the input vdex case.
Re-enabled some compact dex tests.
Bug: 63756964
Test: ART_DEFAULT_COMPACT_DEX_LEVEL=fast test-art-host
Change-Id: Ic9b4e4e59e6cd22b66ee2fc0d32c9b4a15f13497
Diffstat (limited to 'runtime/common_runtime_test.h')
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 0f931e3dff..625884d98d 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -26,6 +26,7 @@ #include "arch/instruction_set.h" #include "base/mutex.h" +#include "cdex/compact_dex_level.h" #include "globals.h" // TODO: Add inl file and avoid including inl. #include "obj_ptr-inl.h" @@ -305,6 +306,11 @@ class CheckJniAbortCatcher { return; \ } +#define TEST_DISABLED_FOR_COMPACT_DEX() \ + if (kDefaultCompactDexLevel != CompactDexLevel::kCompactDexLevelNone) { \ + printf("WARNING: TEST DISABLED FOR COMPACT DEX\n"); \ + return; \ + } } // namespace art #endif // ART_RUNTIME_COMMON_RUNTIME_TEST_H_ |