From a073f46104fbce0482fb759d5ccfb32ee39cc973 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Wed, 28 Oct 2020 12:48:24 +0000 Subject: 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 --- test/028-array-write/Android.bp | 8 ++++---- test/028-array-write/expected-stdout.txt | 3 +++ test/028-array-write/expected.txt | 3 --- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 test/028-array-write/expected-stdout.txt delete mode 100644 test/028-array-write/expected.txt (limited to 'test/028-array-write') diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp index 9417f40f6f..0f1558c096 100644 --- a/test/028-array-write/Android.bp +++ b/test/028-array-write/Android.bp @@ -8,13 +8,13 @@ java_test { defaults: ["art-run-test-defaults"], test_config_template: ":art-run-test-target-template", srcs: ["src/**/*.java"], - data: [":art-run-test-028-array-write-expected"], + data: [":art-run-test-028-array-write-expected-stdout"], } // Test's expected output. genrule { - name: "art-run-test-028-array-write-expected", - out: ["art-run-test-028-array-write-expected.txt"], - srcs: ["expected.txt"], + name: "art-run-test-028-array-write-expected-stdout", + out: ["art-run-test-028-array-write-expected-stdout.txt"], + srcs: ["expected-stdout.txt"], cmd: "cp -f $(in) $(out)", } diff --git a/test/028-array-write/expected-stdout.txt b/test/028-array-write/expected-stdout.txt new file mode 100644 index 0000000000..85986b5eb0 --- /dev/null +++ b/test/028-array-write/expected-stdout.txt @@ -0,0 +1,3 @@ +Running writeTest... +Running copyTest... +Done! diff --git a/test/028-array-write/expected.txt b/test/028-array-write/expected.txt deleted file mode 100644 index 85986b5eb0..0000000000 --- a/test/028-array-write/expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -Running writeTest... -Running copyTest... -Done! -- cgit v1.2.3-59-g8ed1b