diff options
| author | 2016-10-20 11:59:42 +0000 | |
|---|---|---|
| committer | 2016-10-20 11:59:43 +0000 | |
| commit | 2f2533f686f759ccd29d2712da2c7610382fb59f (patch) | |
| tree | b4853d93d2427928bbf28aac135b939017360c9e /compiler/optimizing/optimizing_cfi_test.cc | |
| parent | fc7a96464c58f2e3432cba2a3cfb19d84b033fdf (diff) | |
| parent | a7812ae7939b199392f874b24a52454bbd0c13f2 (diff) | |
Merge "ARM: VIXL32: Pass initial ART tests with new code generator."
Diffstat (limited to 'compiler/optimizing/optimizing_cfi_test.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_cfi_test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc index a1e923bd73..bacf9940ca 100644 --- a/compiler/optimizing/optimizing_cfi_test.cc +++ b/compiler/optimizing/optimizing_cfi_test.cc @@ -158,7 +158,8 @@ class OptimizingCFITest : public CFITest { TestImpl(isa, #isa, expected_asm, expected_cfi); \ } -#ifdef ART_ENABLE_CODEGEN_arm +// TODO(VIXL): Support this test for the VIXL backend. +#if defined(ART_ENABLE_CODEGEN_arm) && !defined(ART_USE_VIXL_ARM_BACKEND) TEST_ISA(kThumb2) #endif #ifdef ART_ENABLE_CODEGEN_arm64 @@ -177,7 +178,8 @@ TEST_ISA(kMips) TEST_ISA(kMips64) #endif -#ifdef ART_ENABLE_CODEGEN_arm +// TODO(VIXL): Support this test for the VIXL backend. +#if defined(ART_ENABLE_CODEGEN_arm) && !defined(ART_USE_VIXL_ARM_BACKEND) TEST_F(OptimizingCFITest, kThumb2Adjust) { std::vector<uint8_t> expected_asm( expected_asm_kThumb2_adjust, |