diff options
Diffstat (limited to 'runtime/instrumentation_test.cc')
| -rw-r--r-- | runtime/instrumentation_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/instrumentation_test.cc b/runtime/instrumentation_test.cc index cfca51e7cd..d3fa5c8289 100644 --- a/runtime/instrumentation_test.cc +++ b/runtime/instrumentation_test.cc @@ -837,8 +837,7 @@ TEST_F(InstrumentationTest, ConfigureStubs_InterpreterToInstrumentationStubs) { // Configure stubs with instrumentation stubs. CheckConfigureStubs(kClientOneKey, Instrumentation::InstrumentationLevel::kInstrumentWithInstrumentationStubs); - // Make sure we are still interpreter since going from interpreter->instrumentation is dangerous. - CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInterpreter, + CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInstrumentationStubs, 1U); // Check we can disable instrumentation. @@ -864,7 +863,7 @@ TEST_F(InstrumentationTest, // Configure stubs with instrumentation stubs again. CheckConfigureStubs(kClientOneKey, Instrumentation::InstrumentationLevel::kInstrumentWithInstrumentationStubs); - CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInterpreter, + CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInstrumentationStubs, 1U); // Check we can disable instrumentation. @@ -968,9 +967,9 @@ TEST_F(InstrumentationTest, MultiConfigureStubs_InterpreterThenInstrumentationSt CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInterpreter, 2U); // 1st client requests instrumentation deactivation but 2nd client still needs - // instrumentation stubs. Since we already got interpreter stubs we need to stay there. + // instrumentation stubs. CheckConfigureStubs(kClientOneKey, Instrumentation::InstrumentationLevel::kInstrumentNothing); - CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInterpreter, + CHECK_INSTRUMENTATION(Instrumentation::InstrumentationLevel::kInstrumentWithInstrumentationStubs, 1U); // 2nd client requests instrumentation deactivation |