From b15e8797d2ca6fb480a940887c66dd2aae7c9065 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Wed, 28 Oct 2020 12:20:59 +0000 Subject: Verify ART run-tests' standard output and standard error separately. Introduce expected standard error files for ART run-tests. Collect tests' standard output and standard error separately and check them against the corresponding expectation file. Test: Run ART run-tests on host and device using `testrunner.py`. Test: atest --test-mapping art:all Test: atest --test-mapping cts/hostsidetests/jvmti:all Bug: 171865375 Bug: 147812905 Change-Id: Ie95bec4a4684ff6791d464124ce8976339432d1f --- test/572-checker-array-get-regression/Android.bp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'test/572-checker-array-get-regression/Android.bp') diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp index e6564d53ef..bbd6107ac3 100644 --- a/test/572-checker-array-get-regression/Android.bp +++ b/test/572-checker-array-get-regression/Android.bp @@ -8,16 +8,27 @@ java_test { defaults: ["art-run-test-defaults"], test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], - data: [":art-run-test-572-checker-array-get-regression-expected-stdout"], + data: [ + ":art-run-test-572-checker-array-get-regression-expected-stdout", + ":art-run-test-572-checker-array-get-regression-expected-stderr", + ], // Include the Java source files in the test's artifacts, to make Checker assertions // available to the TradeFed test runner. include_srcs: true, } -// Test's expected output. +// Test's expected standard output. genrule { name: "art-run-test-572-checker-array-get-regression-expected-stdout", out: ["art-run-test-572-checker-array-get-regression-expected-stdout.txt"], srcs: ["expected-stdout.txt"], cmd: "cp -f $(in) $(out)", } + +// Test's expected standard error. +genrule { + name: "art-run-test-572-checker-array-get-regression-expected-stderr", + out: ["art-run-test-572-checker-array-get-regression-expected-stderr.txt"], + srcs: ["expected-stderr.txt"], + cmd: "cp -f $(in) $(out)", +} -- cgit v1.2.3-59-g8ed1b