summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2017-02-09 10:37:31 +0000
committer Vladimir Marko <vmarko@google.com> 2017-02-09 17:50:07 +0000
commit15357706f68a5ca807a2f470e956e9adf0284f6b (patch)
tree7ab8d75c4a78afb2196dd656ae752b18630d4c4e
parent357dcb73934356239292c46d6fbedba734da5e00 (diff)
Use VerifierDeps test file for dex2oat swap tests.
Hoping that storing more data in the swap for the bigger dex file shall outweigh the noise in heap usage. Test: m test-art-host-gtest-dex2oat_test Bug: 29259363 Change-Id: I42d170cb4717c886fab58dbba5a3bcb23ac5fbcb
-rw-r--r--build/Android.gtest.mk2
-rw-r--r--dex2oat/dex2oat_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index bc0838435c..4736d5295c 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -93,7 +93,7 @@ ART_GTEST_class_table_test_DEX_DEPS := XandY
ART_GTEST_compiler_driver_test_DEX_DEPS := AbstractMethod StaticLeafMethods ProfileTestMultiDex
ART_GTEST_dex_cache_test_DEX_DEPS := Main Packages MethodTypes
ART_GTEST_dex_file_test_DEX_DEPS := GetMethodSignature Main Nested
-ART_GTEST_dex2oat_test_DEX_DEPS := $(ART_GTEST_dex2oat_environment_tests_DEX_DEPS) Statics
+ART_GTEST_dex2oat_test_DEX_DEPS := $(ART_GTEST_dex2oat_environment_tests_DEX_DEPS) Statics VerifierDeps
ART_GTEST_exception_test_DEX_DEPS := ExceptionHandle
ART_GTEST_image_test_DEX_DEPS := ImageLayoutA ImageLayoutB
ART_GTEST_imtable_test_DEX_DEPS := IMTA IMTB
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index c2275aca95..90b49556b7 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -231,7 +231,7 @@ class Dex2oatSwapTest : public Dex2oatTest {
}
virtual std::string GetTestDexFileName() {
- return GetDexSrc1();
+ return Dex2oatEnvironmentTest::GetTestDexFileName("VerifierDeps");
}
virtual void CheckResult(bool expect_use) {