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/158-app-image-class-table/Android.bp b/test/158-app-image-class-table/Android.bp
index a6bedba..eb9c48c 100644
--- a/test/158-app-image-class-table/Android.bp
+++ b/test/158-app-image-class-table/Android.bp
@@ -8,13 +8,13 @@
defaults: ["art-run-test-defaults"],
test_config_template: ":art-run-test-target-no-test-suite-tag-template",
srcs: ["src/**/*.java"],
- data: [":art-run-test-158-app-image-class-table-expected"],
+ data: [":art-run-test-158-app-image-class-table-expected-stdout"],
}
// Test's expected output.
genrule {
- name: "art-run-test-158-app-image-class-table-expected",
- out: ["art-run-test-158-app-image-class-table-expected.txt"],
- srcs: ["expected.txt"],
+ name: "art-run-test-158-app-image-class-table-expected-stdout",
+ out: ["art-run-test-158-app-image-class-table-expected-stdout.txt"],
+ srcs: ["expected-stdout.txt"],
cmd: "cp -f $(in) $(out)",
}
diff --git a/test/158-app-image-class-table/expected.txt b/test/158-app-image-class-table/expected-stdout.txt
similarity index 100%
rename from test/158-app-image-class-table/expected.txt
rename to test/158-app-image-class-table/expected-stdout.txt
diff --git a/test/158-app-image-class-table/src/Main.java b/test/158-app-image-class-table/src/Main.java
index 97aa14d..f427431 100644
--- a/test/158-app-image-class-table/src/Main.java
+++ b/test/158-app-image-class-table/src/Main.java
@@ -23,7 +23,7 @@
System.loadLibrary(args[0]);
} catch (ClassNotFoundException e) {
usingRI = true;
- // Add expected JNI_OnLoad log line to match expected.txt.
+ // Add expected JNI_OnLoad log line to match expected-stdout.txt.
System.out.println("JNI_OnLoad called");
}
try {