Enable upstream OpenJDK core-ojtests in run-libcore-tests.sh
Bug: 228441328
Bug: 228174249
Bug: 208639267
Test: art/tools/run-libcore-tests.sh --mode=host
Test: art/tools/run-libcore-tests.sh --mode=device
Change-Id: Ia85674105cd867677dc729cc62fb6b9404ddaf7c
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index 1280038..6e6ccb8 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -283,5 +283,52 @@
"libcore.javax.net.ssl.DefaultHostnameVerifierTest#testSubjectWithWildAltNamesCert",
"libcore.javax.net.ssl.DefaultHostnameVerifierTest#testWildAltNameOnlyCert"],
bug: 166619732
+},
+{
+ description: "Test failures on host x86 and device",
+ result: EXEC_FAILED,
+ bug: 228441328,
+ names: ["test.java.lang.Math.CeilAndFloorTests#nearIntegerTests",
+ "test.java.time.chrono.TestEraDisplayName",
+ "test.java.time.format.TestDateTimeFormatterBuilderWithLocale",
+ "test.java.util.TestFormatter"]
+},
+{
+ description: "Fails on armv8 device",
+ result: EXEC_FAILED,
+ modes: [device],
+ bug: 228441328,
+ names: ["test.java.util.zip.ZipFile.Zip64SizeTest#validateZipEntrySizes"]
+},
+{
+ description: "libcore.android.system.OsTest socket tests work on device only",
+ result: EXEC_FAILED,
+ modes: [host],
+ names: ["libcore.android.system.OsTest#test_sendmsg_af_inet6_4K",
+ "libcore.android.system.OsTest#test_sendmsg_af_inet6_4K_directBuffer",
+ "libcore.android.system.OsTest#test_sendmsg_af_inet_16K_receiveall_without_recv_msgname",
+ "libcore.android.system.OsTest#test_sendmsg_af_inet_16K_reciveall",
+ "libcore.android.system.OsTest#test_sendmsg_af_inet_16K_recvparts",
+ "libcore.android.system.OsTest#test_sendmsg_af_inet_16K_without_send_msgcontrl",
+ "libcore.android.system.OsTest#test_sendmsg_af_inet_4K",
+ "libcore.android.system.OsTest#test_socket_udpGro_setAndGet",
+ "libcore.android.system.OsTest#test_socket_udpGso_set",
+ "libcore.android.system.OsTest#testUnixDomainSocket_abstract_name"]
+},
+{
+ description: "java.lang.Math sin/cos/cbrt on host differs from device",
+ result: ERROR,
+ modes: [host],
+ bug: 228174249,
+ names: ["test.java.lang.Math.SinCosCornerCasesTests#testCornerCasesCos",
+ "test.java.lang.Math.SinCosCornerCasesTests#testCornerCasesSin",
+ "test.java.lang.Math.CubeRootTests#testCubeRoot"]
+},
+{
+ description: "Multiple failures",
+ result: ERROR,
+ bug: 228441328,
+ names: ["tck.java.time",
+ "test.java.time"]
}
]
diff --git a/tools/run-libcore-tests.py b/tools/run-libcore-tests.py
index b485c73..1675716 100755
--- a/tools/run-libcore-tests.py
+++ b/tools/run-libcore-tests.py
@@ -49,6 +49,7 @@
ANDROID_PRODUCT_OUT = os.environ.get("ANDROID_PRODUCT_OUT")
LIBCORE_TEST_NAMES = [
+ ### luni tests. ###
# Naive critical path optimization: Run the longest tests first.
"org.apache.harmony.tests.java.util", # 90min under gcstress
"libcore.java.lang", # 90min under gcstress
@@ -66,7 +67,7 @@
"libcore.highmemorytest.java.util.CalendarTest",
"libcore.highmemorytest.java.util.CurrencyTest",
"libcore.highmemorytest.libcore.icu.SimpleDateFormatDataTest",
- # All other tests in alphabetical order.
+ # All other luni tests in alphabetical order.
"libcore.android.system",
"libcore.build",
"libcore.dalvik.system",
@@ -98,6 +99,86 @@
"org.apache.harmony.tests.java.math",
"org.apache.harmony.tests.javax.security",
"tests.java.lang.String",
+ ### OpenJDK upstream tests (ojluni). ###
+ # "test.java.awt",
+ "test.java.awt",
+ # test.java.io
+ "test.java.io.ByteArrayInputStream",
+ "test.java.io.ByteArrayOutputStream",
+ "test.java.io.FileReader",
+ "test.java.io.FileWriter",
+ "test.java.io.InputStream",
+ "test.java.io.OutputStream",
+ "test.java.io.PrintStream",
+ "test.java.io.PrintWriter",
+ "test.java.io.Reader",
+ "test.java.io.Writer",
+ # test.java.lang
+ "test.java.lang.Boolean",
+ "test.java.lang.ClassLoader",
+ "test.java.lang.Double",
+ "test.java.lang.Float",
+ "test.java.lang.Integer",
+ "test.java.lang.Long",
+ "test.java.lang.StrictMath",
+ "test.java.lang.String",
+ "test.java.lang.Thread",
+ # test.java.lang.invoke
+ "test.java.lang.invoke",
+ # test.java.lang.ref
+ "test.java.lang.ref.SoftReference",
+ "test.java.lang.ref.BasicTest",
+ "test.java.lang.ref.EnqueueNullRefTest",
+ "test.java.lang.ref.EnqueuePollRaceTest",
+ "test.java.lang.ref.ReferenceCloneTest",
+ "test.java.lang.ref.ReferenceEnqueuePendingTest",
+ # test.java.math
+ "test.java.math.BigDecimal",
+ "test.java.math.BigInteger",
+ "test.java.math.RoundingMode",
+ # test.java.net
+ "test.java.net.DatagramSocket",
+ "test.java.net.Socket",
+ "test.java.net.SocketOptions",
+ "test.java.net.URLDecoder",
+ "test.java.net.URLEncoder",
+ # test.java.nio
+ "test.java.nio.channels.Channels",
+ "test.java.nio.channels.SelectionKey",
+ "test.java.nio.channels.Selector",
+ "test.java.nio.file",
+ # test.java.security
+ "test.java.security.cert",
+ "test.java.security.KeyAgreement",
+ "test.java.security.KeyStore",
+ "test.java.security.Provider",
+ # test.java.time
+ "test.java.time",
+ # test.java.util
+ "test.java.util.Arrays",
+ "test.java.util.Collection",
+ "test.java.util.Collections",
+ "test.java.util.Date",
+ "test.java.util.EnumMap",
+ "test.java.util.EnumSet",
+ "test.java.util.GregorianCalendar",
+ "test.java.util.LinkedHashMap",
+ "test.java.util.LinkedHashSet",
+ "test.java.util.List",
+ "test.java.util.Map",
+ "test.java.util.Optional",
+ "test.java.util.TestFormatter",
+ "test.java.util.TimeZone",
+ # test.java.util.concurrent
+ "test.java.util.concurrent",
+ # test.java.util.function
+ "test.java.util.function",
+ # test.java.util.stream
+ "test.java.util.stream",
+ # test.java.util.zip
+ "test.java.util.zip.ZipFile",
+ # tck.java.time
+ "tck.java.time",
]
# "org.apache.harmony.security", # We don't have rights to revert changes in case of failures.