diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-03 11:30:26 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-03 11:30:54 +0000 |
| commit | c3837e4f8b8cf717a81138c1d6ccf132b8d6453b (patch) | |
| tree | 676ee8ebc988a7e38ef38fde50f9fba24fb2bd00 /tools | |
| parent | 6045c9ab329d69773f27498568b7bed8bbf08ff8 (diff) | |
| download | art-c3837e4f8b8cf717a81138c1d6ccf132b8d6453b.tar.gz art-c3837e4f8b8cf717a81138c1d6ccf132b8d6453b.tar.bz2 art-c3837e4f8b8cf717a81138c1d6ccf132b8d6453b.zip | |
Update libcore script and add a new expectation file.
Change-Id: I3ff7784d4b43615f1d70a62c6b8595870f0afe4c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libcore_failures.txt | 21 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 6 |
2 files changed, 25 insertions, 2 deletions
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt new file mode 100644 index 0000000000..8eac1d3a23 --- /dev/null +++ b/tools/libcore_failures.txt @@ -0,0 +1,21 @@ +/* + * This file contains expectations for ART's buildbot. The purpose of this file is + * to temporary and quickly list failing tests and not break the bots, until the + * libcore expectation files get properly updated. The script that uses this file + * is art/tools/run-libcore-tests.sh. + * + * It is also used to enable AOSP experiments, and not mess up with CTS's expectations. + */ + +[ +{ + description: "Assert.java differences between vogar and junit.", + result: EXEC_FAILED, + name: "libcore.java.math.RunCSVTests#test_csv" +}, +{ + description: "Test is currently being updated.", + result: EXEC_FAILED, + name: "libcore.java.util.OldTimeZoneTest#test_getDisplayNameZILjava_util_Locale" +} +] diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 5c7e3c5664..9fa3fda651 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -27,16 +27,18 @@ if [ ! -f $test_jar ]; then exit 1 fi -# Packages that currently report no failures. +# Packages that currently work correctly with the expectation files. working_packages=("libcore.java.lang" + "libcore.java.math" "libcore.java.util" "org.apache.harmony.annotation" "org.apache.harmony.regex" "org.apache.harmony.tests.java.lang" + "org.apache.harmony.tests.java.math" "org.apache.harmony.tests.java.util" "tests.java.lang.String") # Run the tests using vogar. echo "Running tests for the following test packages:" echo ${working_packages[@]} | tr " " "\n" -vogar $@ --classpath $test_jar ${working_packages[@]} +vogar $@ --expectations art/tools/libcore_failures.txt --classpath $test_jar ${working_packages[@]} |