diff options
Diffstat (limited to 'test/911-get-stack-trace')
| -rw-r--r-- | test/911-get-stack-trace/expected-cts-version.txt | 56 | ||||
| -rw-r--r-- | test/911-get-stack-trace/expected-stdout.txt | 136 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/911-get-stack-trace/run.py (renamed from test/911-get-stack-trace/run) | 4 |
3 files changed, 99 insertions, 97 deletions
diff --git a/test/911-get-stack-trace/expected-cts-version.txt b/test/911-get-stack-trace/expected-cts-version.txt index 728ea8839c..25f29aa529 100644 --- a/test/911-get-stack-trace/expected-cts-version.txt +++ b/test/911-get-stack-trace/expected-cts-version.txt @@ -79,8 +79,8 @@ From bottom From top --------- wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -99,8 +99,8 @@ From top foo (IIILart/ControlData;)I 0 21 run ()V 4 28 --------- - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -120,14 +120,14 @@ From top run ()V 4 28 --------- wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 foo (IIILart/ControlData;)I 0 21 --------- - wait ()V 2 568 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -135,7 +135,7 @@ From top baz (IIILart/ControlData;)Ljava/lang/Object; 8 34 bar (IIILart/ControlData;)J 0 26 --------- - wait ()V 2 568 + wait ()V 2 524 From bottom --------- run ()V 4 28 @@ -251,8 +251,8 @@ Test911 --------- ThreadListTraces Thread 0 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -261,8 +261,8 @@ ThreadListTraces Thread 0 --------- ThreadListTraces Thread 2 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -271,8 +271,8 @@ ThreadListTraces Thread 2 --------- ThreadListTraces Thread 4 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -281,8 +281,8 @@ ThreadListTraces Thread 4 --------- ThreadListTraces Thread 6 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -291,8 +291,8 @@ ThreadListTraces Thread 6 --------- ThreadListTraces Thread 8 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -308,8 +308,8 @@ Test911 --------- ThreadListTraces Thread 0 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -331,8 +331,8 @@ ThreadListTraces Thread 0 --------- ThreadListTraces Thread 2 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -354,8 +354,8 @@ ThreadListTraces Thread 2 --------- ThreadListTraces Thread 4 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -377,8 +377,8 @@ ThreadListTraces Thread 4 --------- ThreadListTraces Thread 6 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -400,8 +400,8 @@ ThreadListTraces Thread 6 --------- ThreadListTraces Thread 8 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 diff --git a/test/911-get-stack-trace/expected-stdout.txt b/test/911-get-stack-trace/expected-stdout.txt index 19735d24e7..1109b3f42c 100644 --- a/test/911-get-stack-trace/expected-stdout.txt +++ b/test/911-get-stack-trace/expected-stdout.txt @@ -79,8 +79,8 @@ From bottom From top --------- wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -99,8 +99,8 @@ From top foo (IIILart/ControlData;)I 0 21 run ()V 4 28 --------- - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -120,14 +120,14 @@ From top run ()V 4 28 --------- wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 foo (IIILart/ControlData;)I 0 21 --------- - wait ()V 2 568 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -135,7 +135,7 @@ From top baz (IIILart/ControlData;)Ljava/lang/Object; 8 34 bar (IIILart/ControlData;)J 0 26 --------- - wait ()V 2 568 + wait ()V 2 524 From bottom --------- run ()V 4 28 @@ -276,8 +276,8 @@ main --------- AllTraces Thread 0 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -286,8 +286,8 @@ AllTraces Thread 0 --------- AllTraces Thread 1 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -296,8 +296,8 @@ AllTraces Thread 1 --------- AllTraces Thread 2 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -306,8 +306,8 @@ AllTraces Thread 2 --------- AllTraces Thread 3 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -316,8 +316,8 @@ AllTraces Thread 3 --------- AllTraces Thread 4 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -326,8 +326,8 @@ AllTraces Thread 4 --------- AllTraces Thread 5 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -336,8 +336,8 @@ AllTraces Thread 5 --------- AllTraces Thread 6 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -346,8 +346,8 @@ AllTraces Thread 6 --------- AllTraces Thread 7 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -356,8 +356,8 @@ AllTraces Thread 7 --------- AllTraces Thread 8 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -366,8 +366,8 @@ AllTraces Thread 8 --------- AllTraces Thread 9 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -401,8 +401,8 @@ main --------- AllTraces Thread 0 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -424,8 +424,8 @@ AllTraces Thread 0 --------- AllTraces Thread 1 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -447,8 +447,8 @@ AllTraces Thread 1 --------- AllTraces Thread 2 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -470,8 +470,8 @@ AllTraces Thread 2 --------- AllTraces Thread 3 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -493,8 +493,8 @@ AllTraces Thread 3 --------- AllTraces Thread 4 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -516,8 +516,8 @@ AllTraces Thread 4 --------- AllTraces Thread 5 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -539,8 +539,8 @@ AllTraces Thread 5 --------- AllTraces Thread 6 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -562,8 +562,8 @@ AllTraces Thread 6 --------- AllTraces Thread 7 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -585,8 +585,8 @@ AllTraces Thread 7 --------- AllTraces Thread 8 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -608,8 +608,8 @@ AllTraces Thread 8 --------- AllTraces Thread 9 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -685,8 +685,8 @@ Test911 --------- ThreadListTraces Thread 0 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -695,8 +695,8 @@ ThreadListTraces Thread 0 --------- ThreadListTraces Thread 2 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -705,8 +705,8 @@ ThreadListTraces Thread 2 --------- ThreadListTraces Thread 4 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -715,8 +715,8 @@ ThreadListTraces Thread 4 --------- ThreadListTraces Thread 6 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -725,8 +725,8 @@ ThreadListTraces Thread 6 --------- ThreadListTraces Thread 8 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -742,8 +742,8 @@ Test911 --------- ThreadListTraces Thread 0 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -765,8 +765,8 @@ ThreadListTraces Thread 0 --------- ThreadListTraces Thread 2 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -788,8 +788,8 @@ ThreadListTraces Thread 2 --------- ThreadListTraces Thread 4 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -811,8 +811,8 @@ ThreadListTraces Thread 4 --------- ThreadListTraces Thread 6 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 @@ -834,8 +834,8 @@ ThreadListTraces Thread 6 --------- ThreadListTraces Thread 8 wait (JI)V -1 -2 - wait (J)V 1 442 - wait ()V 2 568 + wait (J)V 1 386 + wait ()V 2 524 printOrWait (IILart/ControlData;)V 24 47 baz (IIILart/ControlData;)Ljava/lang/Object; 2 32 bar (IIILart/ControlData;)J 0 26 diff --git a/test/911-get-stack-trace/run b/test/911-get-stack-trace/run.py index c6e62ae6cd..4796039801 100755..100644 --- a/test/911-get-stack-trace/run +++ b/test/911-get-stack-trace/run.py @@ -14,4 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -./default-run "$@" --jvmti + +def run(ctx, args): + ctx.default_run(args, jvmti=True) |