Merge "Update libcore script and add a new expectation file."
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
new file mode 100644
index 0000000..8eac1d3
--- /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 5c7e3c5..9fa3fda 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -27,16 +27,18 @@
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[@]}