Revert the changes to test/2246-trace-stream
Partial revert of aosp/2361086 to fix failures on the bots. The output
of method tracing is not consistent across all configurations for
non-debuggable runtimes. For ex: optimizing has fewer entries due to the
use of more oat code but no-image config has more entries. Revert the
changes for now. In a follow up CL we could only check for the classes
introduced by the test class to have consistent output.
Test: art/test.py -t 2246
Bug: 259258187
Change-Id: I2e0094015123031751993c0f18a35ec33a269da9
diff --git a/test/2246-trace-stream/run.py b/test/2246-trace-stream/run.py
index 6eb9265..955f39a 100644
--- a/test/2246-trace-stream/run.py
+++ b/test/2246-trace-stream/run.py
@@ -16,17 +16,7 @@
def run(ctx, args):
- # The expected output is different in debuggable and non debuggable. Just
- # enable debuggable for now.
- ctx.default_run(args)
-
- print(args);
- if ("--debuggable" in args.Xcompiler_option):
- # On debuggable runtimes we disable oat code in boot images right at the start
- # so we get events for all methods including methods optimized in boot images.
- ctx.expected_stdout = ctx.expected_stdout.with_suffix(".debuggable.txt")
- elif ("--interpreter" in args.Xcompiler_option) or args.interpreter:
- # On forced interpreter runtimes we don't get method events for optimized
- # methods in boot images but get events for a few more methods that would
- # have otherwise used nterp.
- ctx.expected_stdout = ctx.expected_stdout.with_suffix(".interpreter.txt")
+ # The expected output non debuggable isn't consistent in all configurations.
+ # Investigate why the output is different and update the test to work for non
+ # debuggable runtimes too.
+ ctx.default_run(args, Xcompiler_option=["--debuggable"])