Rename ART run-tests `expected.txt` files as `expected-stdout.txt`.
This is in preparation for the addition of `expected-stderr.txt` files
in all ART run-test directories, which will record the expected
standard error for each of these tests, and which will be verified
along with `expected-stdout.txt`.
Test: Run ART run-tests on host and device using `testrunner.py`.
Test: atest --test-mapping art:all
Bug: 171865375
Bug: 147812905
Change-Id: I37e3c4b8409475790e2fc63514cdf57156d47ff4
diff --git a/test/Android.bp b/test/Android.bp
index 1ee5164..dc12589 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -837,138 +837,138 @@
// CTS test runner in cts/hostsidetests/jvmti looks for an expected test
// result for the test NN in the file results.NN.expected.txt while in the
-// source tree each expected test result is in the NN-xxxx/expected.txt.
+// source tree each expected test result is in the NN-xxxx/expected-stdout.txt.
// Copy+rename them them to a temporary directory and them zip them.
java_genrule {
name: "expected_cts_outputs_gen",
srcs: [
- "901-hello-ti-agent/expected.txt",
- "902-hello-transformation/expected.txt",
- "903-hello-tagging/expected.txt",
- "904-object-allocation/expected.txt",
- "905-object-free/expected.txt",
- "906-iterate-heap/expected.txt",
- "907-get-loaded-classes/expected.txt",
- "908-gc-start-finish/expected.txt",
- "910-methods/expected.txt",
+ "901-hello-ti-agent/expected-stdout.txt",
+ "902-hello-transformation/expected-stdout.txt",
+ "903-hello-tagging/expected-stdout.txt",
+ "904-object-allocation/expected-stdout.txt",
+ "905-object-free/expected-stdout.txt",
+ "906-iterate-heap/expected-stdout.txt",
+ "907-get-loaded-classes/expected-stdout.txt",
+ "908-gc-start-finish/expected-stdout.txt",
+ "910-methods/expected-stdout.txt",
"911-get-stack-trace/expected-cts-version.txt",
- "912-classes/expected.txt",
- "913-heaps/expected.txt",
- "914-hello-obsolescence/expected.txt",
- "915-obsolete-2/expected.txt",
- "917-fields-transformation/expected.txt",
- "918-fields/expected.txt",
- "919-obsolete-fields/expected.txt",
- "920-objects/expected.txt",
- "922-properties/expected.txt",
- "923-monitors/expected.txt",
- "924-threads/expected.txt",
- "925-threadgroups/expected.txt",
- "926-multi-obsolescence/expected.txt",
- "927-timers/expected.txt",
- "928-jni-table/expected.txt",
- "930-hello-retransform/expected.txt",
- "931-agent-thread/expected.txt",
- "932-transform-saves/expected.txt",
- "933-misc-events/expected.txt",
- "940-recursive-obsolete/expected.txt",
- "942-private-recursive/expected.txt",
- "944-transform-classloaders/expected.txt",
- "945-obsolete-native/expected.txt",
- "947-reflect-method/expected.txt",
- "951-threaded-obsolete/expected.txt",
- "982-ok-no-retransform/expected.txt",
- "983-source-transform-verify/expected.txt",
- "984-obsolete-invoke/expected.txt",
- "985-re-obsolete/expected.txt",
- "986-native-method-bind/expected.txt",
- "988-method-trace/expected.txt",
- "989-method-trace-throw/expected.txt",
- "990-field-trace/expected.txt",
- "991-field-trace-2/expected.txt",
- "992-source-data/expected.txt",
- "993-breakpoints/expected.txt",
- "994-breakpoint-line/expected.txt",
- "995-breakpoints-throw/expected.txt",
- "996-breakpoint-obsolete/expected.txt",
- "997-single-step/expected.txt",
- "1900-track-alloc/expected.txt",
- "1901-get-bytecodes/expected.txt",
- "1902-suspend/expected.txt",
- "1903-suspend-self/expected.txt",
- "1904-double-suspend/expected.txt",
- "1906-suspend-list-me-first/expected.txt",
- "1907-suspend-list-self-twice/expected.txt",
- "1908-suspend-native-resume-self/expected.txt",
- "1909-per-agent-tls/expected.txt",
- "1910-transform-with-default/expected.txt",
- "1911-get-local-var-table/expected.txt",
- "1912-get-set-local-primitive/expected.txt",
- "1913-get-set-local-objects/expected.txt",
- "1914-get-local-instance/expected.txt",
- "1915-get-set-local-current-thread/expected.txt",
- "1916-get-set-current-frame/expected.txt",
- "1917-get-stack-frame/expected.txt",
- "1920-suspend-native-monitor/expected.txt",
- "1921-suspend-native-recursive-monitor/expected.txt",
- "1922-owned-monitors-info/expected.txt",
- "1923-frame-pop/expected.txt",
- "1924-frame-pop-toggle/expected.txt",
- "1925-self-frame-pop/expected.txt",
- "1926-missed-frame-pop/expected.txt",
- "1927-exception-event/expected.txt",
- "1928-exception-event-exception/expected.txt",
- "1930-monitor-info/expected.txt",
- "1931-monitor-events/expected.txt",
- "1932-monitor-events-misc/expected.txt",
- "1933-monitor-current-contended/expected.txt",
- "1934-jvmti-signal-thread/expected.txt",
- "1936-thread-end-events/expected.txt",
- "1937-transform-soft-fail/expected.txt",
- "1939-proxy-frames/expected.txt",
- "1941-dispose-stress/expected.txt",
- "1942-suspend-raw-monitor-exit/expected.txt",
- "1943-suspend-raw-monitor-wait/expected.txt",
- "1953-pop-frame/expected.txt",
- "1958-transform-try-jit/expected.txt",
- "1962-multi-thread-events/expected.txt",
- "1963-add-to-dex-classloader-in-memory/expected.txt",
- "1967-get-set-local-bad-slot/expected.txt",
- "1968-force-early-return/expected.txt",
- "1969-force-early-return-void/expected.txt",
- "1970-force-early-return-long/expected.txt",
- "1971-multi-force-early-return/expected.txt",
- "1974-resize-array/expected.txt",
- "1975-hello-structural-transformation/expected.txt",
- "1976-hello-structural-static-methods/expected.txt",
- "1977-hello-structural-obsolescence/expected.txt",
- "1978-regular-obsolete-then-structural-obsolescence/expected.txt",
- "1979-threaded-structural-transformation/expected.txt",
+ "912-classes/expected-stdout.txt",
+ "913-heaps/expected-stdout.txt",
+ "914-hello-obsolescence/expected-stdout.txt",
+ "915-obsolete-2/expected-stdout.txt",
+ "917-fields-transformation/expected-stdout.txt",
+ "918-fields/expected-stdout.txt",
+ "919-obsolete-fields/expected-stdout.txt",
+ "920-objects/expected-stdout.txt",
+ "922-properties/expected-stdout.txt",
+ "923-monitors/expected-stdout.txt",
+ "924-threads/expected-stdout.txt",
+ "925-threadgroups/expected-stdout.txt",
+ "926-multi-obsolescence/expected-stdout.txt",
+ "927-timers/expected-stdout.txt",
+ "928-jni-table/expected-stdout.txt",
+ "930-hello-retransform/expected-stdout.txt",
+ "931-agent-thread/expected-stdout.txt",
+ "932-transform-saves/expected-stdout.txt",
+ "933-misc-events/expected-stdout.txt",
+ "940-recursive-obsolete/expected-stdout.txt",
+ "942-private-recursive/expected-stdout.txt",
+ "944-transform-classloaders/expected-stdout.txt",
+ "945-obsolete-native/expected-stdout.txt",
+ "947-reflect-method/expected-stdout.txt",
+ "951-threaded-obsolete/expected-stdout.txt",
+ "982-ok-no-retransform/expected-stdout.txt",
+ "983-source-transform-verify/expected-stdout.txt",
+ "984-obsolete-invoke/expected-stdout.txt",
+ "985-re-obsolete/expected-stdout.txt",
+ "986-native-method-bind/expected-stdout.txt",
+ "988-method-trace/expected-stdout.txt",
+ "989-method-trace-throw/expected-stdout.txt",
+ "990-field-trace/expected-stdout.txt",
+ "991-field-trace-2/expected-stdout.txt",
+ "992-source-data/expected-stdout.txt",
+ "993-breakpoints/expected-stdout.txt",
+ "994-breakpoint-line/expected-stdout.txt",
+ "995-breakpoints-throw/expected-stdout.txt",
+ "996-breakpoint-obsolete/expected-stdout.txt",
+ "997-single-step/expected-stdout.txt",
+ "1900-track-alloc/expected-stdout.txt",
+ "1901-get-bytecodes/expected-stdout.txt",
+ "1902-suspend/expected-stdout.txt",
+ "1903-suspend-self/expected-stdout.txt",
+ "1904-double-suspend/expected-stdout.txt",
+ "1906-suspend-list-me-first/expected-stdout.txt",
+ "1907-suspend-list-self-twice/expected-stdout.txt",
+ "1908-suspend-native-resume-self/expected-stdout.txt",
+ "1909-per-agent-tls/expected-stdout.txt",
+ "1910-transform-with-default/expected-stdout.txt",
+ "1911-get-local-var-table/expected-stdout.txt",
+ "1912-get-set-local-primitive/expected-stdout.txt",
+ "1913-get-set-local-objects/expected-stdout.txt",
+ "1914-get-local-instance/expected-stdout.txt",
+ "1915-get-set-local-current-thread/expected-stdout.txt",
+ "1916-get-set-current-frame/expected-stdout.txt",
+ "1917-get-stack-frame/expected-stdout.txt",
+ "1920-suspend-native-monitor/expected-stdout.txt",
+ "1921-suspend-native-recursive-monitor/expected-stdout.txt",
+ "1922-owned-monitors-info/expected-stdout.txt",
+ "1923-frame-pop/expected-stdout.txt",
+ "1924-frame-pop-toggle/expected-stdout.txt",
+ "1925-self-frame-pop/expected-stdout.txt",
+ "1926-missed-frame-pop/expected-stdout.txt",
+ "1927-exception-event/expected-stdout.txt",
+ "1928-exception-event-exception/expected-stdout.txt",
+ "1930-monitor-info/expected-stdout.txt",
+ "1931-monitor-events/expected-stdout.txt",
+ "1932-monitor-events-misc/expected-stdout.txt",
+ "1933-monitor-current-contended/expected-stdout.txt",
+ "1934-jvmti-signal-thread/expected-stdout.txt",
+ "1936-thread-end-events/expected-stdout.txt",
+ "1937-transform-soft-fail/expected-stdout.txt",
+ "1939-proxy-frames/expected-stdout.txt",
+ "1941-dispose-stress/expected-stdout.txt",
+ "1942-suspend-raw-monitor-exit/expected-stdout.txt",
+ "1943-suspend-raw-monitor-wait/expected-stdout.txt",
+ "1953-pop-frame/expected-stdout.txt",
+ "1958-transform-try-jit/expected-stdout.txt",
+ "1962-multi-thread-events/expected-stdout.txt",
+ "1963-add-to-dex-classloader-in-memory/expected-stdout.txt",
+ "1967-get-set-local-bad-slot/expected-stdout.txt",
+ "1968-force-early-return/expected-stdout.txt",
+ "1969-force-early-return-void/expected-stdout.txt",
+ "1970-force-early-return-long/expected-stdout.txt",
+ "1971-multi-force-early-return/expected-stdout.txt",
+ "1974-resize-array/expected-stdout.txt",
+ "1975-hello-structural-transformation/expected-stdout.txt",
+ "1976-hello-structural-static-methods/expected-stdout.txt",
+ "1977-hello-structural-obsolescence/expected-stdout.txt",
+ "1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt",
+ "1979-threaded-structural-transformation/expected-stdout.txt",
// TODO Requires VarHandles to be un-@hide. See b/64382372
- // "test/1981-structural-redef-private-method-handles/expected.txt",
+ // "test/1981-structural-redef-private-method-handles/expected-stdout.txt",
"1981-structural-redef-private-method-handles/expected_no_mh.txt",
- "1982-no-virtuals-structural-redefinition/expected.txt",
+ "1982-no-virtuals-structural-redefinition/expected-stdout.txt",
// JNI-id use can change the outcome of this test on device.
"1983-structural-redefinition-failures/expected-cts.txt",
- "1984-structural-redefine-field-trace/expected.txt",
- "1988-multi-structural-redefine/expected.txt",
- "1989-transform-bad-monitor/expected.txt",
- "1990-structural-bad-verify/expected.txt",
- "1991-hello-structural-retransform/expected.txt",
- "1992-retransform-no-such-field/expected.txt",
- "1994-final-virtual-structural/expected.txt",
- "1995-final-virtual-structural-multithread/expected.txt",
- "1996-final-override-virtual-structural/expected.txt",
- "1997-structural-shadow-method/expected.txt",
- "1998-structural-shadow-field/expected.txt",
- "1999-virtual-structural/expected.txt",
- "2001-virtual-structural-multithread/expected.txt",
- "2002-virtual-structural-initializing/expected.txt",
- "2003-double-virtual-structural/expected.txt",
- "2004-double-virtual-structural-abstract/expected.txt",
- "2005-pause-all-redefine-multithreaded/expected.txt",
- "2006-virtual-structural-finalizing/expected.txt",
- "2007-virtual-structural-finalizable/expected.txt",
+ "1984-structural-redefine-field-trace/expected-stdout.txt",
+ "1988-multi-structural-redefine/expected-stdout.txt",
+ "1989-transform-bad-monitor/expected-stdout.txt",
+ "1990-structural-bad-verify/expected-stdout.txt",
+ "1991-hello-structural-retransform/expected-stdout.txt",
+ "1992-retransform-no-such-field/expected-stdout.txt",
+ "1994-final-virtual-structural/expected-stdout.txt",
+ "1995-final-virtual-structural-multithread/expected-stdout.txt",
+ "1996-final-override-virtual-structural/expected-stdout.txt",
+ "1997-structural-shadow-method/expected-stdout.txt",
+ "1998-structural-shadow-field/expected-stdout.txt",
+ "1999-virtual-structural/expected-stdout.txt",
+ "2001-virtual-structural-multithread/expected-stdout.txt",
+ "2002-virtual-structural-initializing/expected-stdout.txt",
+ "2003-double-virtual-structural/expected-stdout.txt",
+ "2004-double-virtual-structural-abstract/expected-stdout.txt",
+ "2005-pause-all-redefine-multithreaded/expected-stdout.txt",
+ "2006-virtual-structural-finalizing/expected-stdout.txt",
+ "2007-virtual-structural-finalizable/expected-stdout.txt",
],
out: ["expected_cts_outputs.jar"],
tools: ["soong_zip"],