summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2025-03-06 11:54:54 -0800
committer Elliott Hughes <enh@google.com> 2025-03-07 05:36:13 -0800
commit3e768b62a0051ee331a00e874cafed81bc6a57be (patch)
tree9ee158787e07a1db69225c09c01129d00028dc3f
parent2505d2028afe36367c9cfaff3ec5810658129a83 (diff)
Remove fugu workarounds from run-libcore-tests.py.
We no longer have working fugu devices. Change-Id: I9cc60017027dd49cfa267c5bab95108217e8a1fd
-rwxr-xr-xtest/testrunner/testrunner.py2
-rwxr-xr-xtools/buildbot-setup-device.sh7
-rw-r--r--tools/libcore_fugu_failures.txt236
-rwxr-xr-xtools/run-libcore-tests.py113
4 files changed, 1 insertions, 357 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 66412501f9..447bdd2494 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -317,8 +317,6 @@ def setup_test_env():
# Use only part of the cores since fully loading the device tends to lead to timeouts.
fraction = 1.0 if env.ART_TEST_ON_VM else 0.75
n_thread = max(1, int(get_target_cpu_count() * fraction))
- if device_name == 'fugu':
- n_thread = 1
else:
device_name = "host"
if n_thread == 0:
diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh
index 9bff48b804..466595f202 100755
--- a/tools/buildbot-setup-device.sh
+++ b/tools/buildbot-setup-device.sh
@@ -93,13 +93,6 @@ adb shell setprop ctl.stop llkd-1
product_name=$(adb shell getprop ro.build.product)
-if [ "x$product_name" = xfugu ]; then
- # Kill logd first, so that when we set the adb buffer size later in this file,
- # it is brought up again.
- msginfo "Killing logd, seen leaking on fugu/N"
- adb shell pkill -9 -U logd logd && msginfo "...logd killed"
-fi
-
# Update date on device if the difference with host is more than one hour.
if [ $abs_time_difference_in_seconds -gt $seconds_per_hour ]; then
msginfo "Update date on device"
diff --git a/tools/libcore_fugu_failures.txt b/tools/libcore_fugu_failures.txt
deleted file mode 100644
index 60b43d0571..0000000000
--- a/tools/libcore_fugu_failures.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * This file contains expectations for ART's Buildbot when running on fugu devices
- * (Nexus Player, kernel 3.10).
- *
- * The script that uses this file is art/tools/run-libcore-tests.sh.
- */
-
-[
-{
- description: "Test using memfd_create() syscall, only available from Linux 3.17.",
- result: EXEC_FAILED,
- bug: 146113753,
- modes: [device],
- names: [
- "libcore.android.system.OsTest#testMemfdCreate",
- "libcore.android.system.OsTest#testMemfdCreateErrno",
- "libcore.android.system.OsTest#testMemfdCreateFlags"
- ]
-},
-{
- description: "Test using the getrandom() syscall, only available from Linux 3.17.",
- result: EXEC_FAILED,
- bug: 141230711,
- modes: [device],
- names: [
- "libcore.java.math.BigIntegerTest#test_Constructor_IILjava_util_Random",
- "libcore.java.math.BigIntegerTest#test_probablePrime",
- "libcore.java.util.UUIDTest#testJava11Implementation_invalidInputs",
- "libcore.java.util.UUIDTest#testJava8Implementation_allowsLongInputs",
- "libcore.javax.crypto.CipherInputStreamTest#testDecryptCorruptGCM",
- "libcore.javax.crypto.CipherOutputStreamTest#testDecryptCorruptGCM",
- "libcore.libcore.timezone.TelephonyLookupTest#createInstanceWithFallback",
- "libcore.libcore.timezone.TelephonyLookupTest#getTelephonyNetworkFinder",
- "libcore.libcore.timezone.TelephonyLookupTest#validateCountryCodeLowerCase",
- "libcore.libcore.timezone.TelephonyLookupTest#validateDuplicateMccMnc",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_emptyFile",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_emptyNetworksOk",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_missingCountryCodeAttribute",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_missingMccAttribute",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_missingMncAttribute",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_missingNetworks",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_truncatedInput",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_unexpectedComments",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_unexpectedElementsIgnored",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_unexpectedRootElement",
- "libcore.libcore.timezone.TelephonyLookupTest#xmlParsing_unexpectedTextIgnored",
- "libcore.libcore.timezone.TimeZoneFinderTest#createInstanceWithFallback",
- "libcore.libcore.timezone.TimeZoneFinderTest#getCountryZonesFinder",
- "libcore.libcore.timezone.TimeZoneFinderTest#getCountryZonesFinder_empty",
- "libcore.libcore.timezone.TimeZoneFinderTest#getCountryZonesFinder_invalid",
- "libcore.libcore.timezone.TimeZoneFinderTest#getIanaVersion",
- "libcore.libcore.timezone.TimeZoneFinderTest#lookupCountryTimeZones_caseInsensitive",
- "libcore.libcore.timezone.TimeZoneFinderTest#lookupCountryTimeZones_unknownCountryReturnsNull",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_badCountryDefaultBoost",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_badCountryEverUtc",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_badTimeZoneMappingNotAfter",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_badTimeZoneMappingPicker",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_countryDefaultBoost",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_emptyFile",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_missingCountryCode",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_missingCountryDefault",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_missingCountryEverUtc",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_missingCountryZones",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_missingIanaVersionAttribute",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_noCountriesOk",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_timeZoneMappingNotAfter",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_timeZoneMappingPicker",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_truncatedInput",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_unexpectedChildInTimeZoneIdThrows",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_unexpectedComments",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_unexpectedElementsIgnored",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_unexpectedRootElement",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_unexpectedTextIgnored",
- "libcore.libcore.timezone.TimeZoneFinderTest#xmlParsing_unknownTimeZoneIdIgnored",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherInputStream1Test#test_ConstructorLjava_io_InputStreamLjavax_crypto_Cipher",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherOutputStream1Test#test_ConstructorLjava_io_OutputStreamLjavax_crypto_Cipher",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherTest#test_",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherTest#test_doFinalLjava_nio_ByteBufferLjava_nio_ByteBuffer",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherTest#test_initWithKey",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherTest#test_initWithSecureRandom",
- "org.apache.harmony.crypto.tests.javax.crypto.CipherTest#test_updateLjava_nio_ByteBufferLjava_nio_ByteBuffer",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecCipher01",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecCipher02",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecKey01",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecKey02",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecKeyProvider01",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecKeyProvider02",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecKeyString01",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_ROUNDTRIP_GetKeySpecKeyString02",
- "org.apache.harmony.crypto.tests.javax.crypto.EncryptedPrivateKeyInfoTest#test_getAlgName",
- "org.apache.harmony.crypto.tests.javax.crypto.ExemptionMechanismTest#test_initLjava_security_Key",
- "org.apache.harmony.crypto.tests.javax.crypto.ExemptionMechanismTest#test_initLjava_security_KeyLjava_security_AlgorithmParameters",
- "org.apache.harmony.crypto.tests.javax.crypto.ExemptionMechanismTest#test_initLjava_security_KeyLjava_security_spec_AlgorithmParameterSpec",
- "org.apache.harmony.crypto.tests.javax.crypto.KeyGeneratorTest#testGenerateKey",
- "org.apache.harmony.crypto.tests.javax.crypto.KeyGeneratorTest#test_initLjava_security_spec_AlgorithmParameterSpec",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testDeserialization",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testGetAlgorithm",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testGetAlgorithmAfterSerialization",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testGetObject1",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testGetObject2",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testGetObject3",
- "org.apache.harmony.crypto.tests.javax.crypto.SealedObjectTest#testSealedObject1",
- "org.apache.harmony.crypto.tests.javax.crypto.SecretKeyFactoryTest#test_translateKeyLjavax_crypto_SecretKey",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherAesTest#test_AesISO",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherAesTest#test_AesNoISO",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherAesWrapTest#test_AesWrap",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherDESedeTest#test_DESedeISO",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherDESedeTest#test_DESedeNoISO",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherDESedeWrapTest#test_DESedeWrap",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherDesTest#test_DesISO",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherDesTest#test_DesNoISO",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherPBETest#test_PBEWithMD5AndDES",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherPBETest#test_PBEWithSHAand3KeyTripleDES",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherRSATest#test_RSANoPadding",
- "org.apache.harmony.crypto.tests.javax.crypto.func.CipherRSATest#test_RSAShortKey",
- "org.apache.harmony.crypto.tests.javax.crypto.func.KeyGeneratorFunctionalTest#test_",
- "org.apache.harmony.tests.java.math.BigIntegerTest#test_isProbablePrimeI",
- "org.apache.harmony.tests.java.math.OldBigIntegerTest#test_ConstructorIILjava_util_Random",
- "org.apache.harmony.tests.java.math.OldBigIntegerTest#test_isProbablePrimeI",
- "org.apache.harmony.tests.java.math.OldBigIntegerTest#test_nextProbablePrime",
- "org.apache.harmony.tests.java.math.OldBigIntegerTest#test_probablePrime",
- "org.apache.harmony.tests.java.util.ScannerTest#test_ConstructorLjava_nio_file_Path",
- "org.apache.harmony.tests.java.util.ScannerTest#test_ConstructorLjava_nio_file_PathLjava_lang_String",
- "org.apache.harmony.tests.java.util.ScannerTest#test_ConstructorLjava_nio_file_PathLjava_lang_String_Exception",
- "org.apache.harmony.tests.java.util.UUIDTest#test_randomUUID",
- "org.apache.harmony.tests.javax.security.OldSHA1PRNGSecureRandomTest#testGenerateSeedint02",
- "org.apache.harmony.tests.javax.security.OldSHA1PRNGSecureRandomTest#testGenerateSeedint03",
- "org.apache.harmony.tests.javax.security.OldSHA1PRNGSecureRandomTest#testNextBytesbyteArray03",
- "org.apache.harmony.tests.javax.security.OldSHA1PRNGSecureRandomTest#testSetSeedbyteArray02"
- ]
-},
-{
- description: "Test using the getrandom() syscall, only available from Linux 3.17.",
- result: ERROR,
- bug: 141230711,
- modes: [device],
- names: [
- "test.java.awt",
- "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.Boolean",
- "test.java.lang.ClassLoader",
- "test.java.lang.Double",
- "test.java.lang.Float",
- "test.java.lang.Integer",
- "test.java.lang.Long",
- "test.java.lang.StackWalker#main",
- "test.java.lang.StrictMath.CubeRootTests",
- "test.java.lang.StrictMath.ExactArithTests",
- "test.java.lang.StrictMath.Expm1Tests",
- "test.java.lang.StrictMath.ExpTests",
- "test.java.lang.StrictMath.HyperbolicTests",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard1",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard2",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard3",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard4",
- "test.java.lang.StrictMath.HypotTests#testHypot",
- "test.java.lang.StrictMath.Log1pTests",
- "test.java.lang.StrictMath.Log10Tests",
- "test.java.lang.StrictMath.MultiplicationTests",
- "test.java.lang.StrictMath.PowTests",
- "test.java.lang.String",
- "test.java.lang.Thread",
- "test.java.lang.invoke",
- "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.BigDecimal",
- "test.java.math.BigInteger#testArithmetic",
- "test.java.math.BigInteger#testBitCount",
- "test.java.math.BigInteger#testBitLength",
- "test.java.math.BigInteger#testbitOps",
- "test.java.math.BigInteger#testBitwise",
- "test.java.math.BigInteger#testByteArrayConv",
- "test.java.math.BigInteger#testConstructor",
- "test.java.math.BigInteger#testDivideAndReminder",
- "test.java.math.BigInteger#testDivideLarge",
- "test.java.math.BigInteger#testModExp",
- "test.java.math.BigInteger#testMultiplyLarge",
- "test.java.math.BigInteger#testNextProbablePrime",
- "test.java.math.BigInteger#testPow",
- "test.java.math.BigInteger#testSerialize",
- "test.java.math.BigInteger#testShift",
- "test.java.math.BigInteger#testSquare",
- "test.java.math.BigInteger#testSquareLarge",
- "test.java.math.BigInteger#testSquareRootAndReminder",
- "test.java.math.BigInteger#testStringConv_generic",
- "test.java.math.RoundingMode",
- "test.java.net.DatagramSocket",
- "test.java.net.Socket",
- "test.java.net.SocketOptions",
- "test.java.net.URLDecoder",
- "test.java.net.URLEncoder",
- "test.java.nio.channels.Channels",
- "test.java.nio.channels.SelectionKey",
- "test.java.nio.channels.Selector",
- "test.java.nio.file",
- "test.java.security.cert",
- "test.java.security.KeyAgreement.KeyAgreementTest",
- "test.java.security.KeyAgreement.KeySizeTest#testECDHKeySize",
- "test.java.security.KeyAgreement.KeySpecTest",
- "test.java.security.KeyAgreement.MultiThreadTest",
- "test.java.security.KeyAgreement.NegativeTest",
- "test.java.security.KeyStore",
- "test.java.security.Provider",
- "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.TimeZone",
- "test.java.util.concurrent",
- "test.java.util.function",
- "test.java.util.stream",
- "test.java.util.zip.ZipFile"
- ]
-}
-]
diff --git a/tools/run-libcore-tests.py b/tools/run-libcore-tests.py
index 1473e0560e..486e21354c 100755
--- a/tools/run-libcore-tests.py
+++ b/tools/run-libcore-tests.py
@@ -34,8 +34,6 @@ def parse_args():
help='Use debug version of ART (device|host only).')
parser.add_argument('--dry-run', action='store_true',
help='Print vogar command-line, but do not run.')
- parser.add_argument('--no-getrandom', action='store_false', dest='getrandom',
- help='Ignore failures from getrandom() (for kernel < 3.17).')
parser.add_argument('--no-jit', action='store_false', dest='jit',
help='Disable JIT (device|host only).')
parser.add_argument('--gcstress', action='store_true',
@@ -270,104 +268,6 @@ DISABLED_GCSTRESS_DEBUG_TESTS = {
"test.java.util.Collection",
}
-DISABLED_FUGU_TESTS = {
- "org.apache.harmony.luni.tests.internal.net.www.protocol.http.HttpURLConnection",
- "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnection",
- "test.java.awt",
- "test.java.io.ByteArrayInputStream",
- "test.java.io.ByteArrayOutputStream",
- "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.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.CubeRootTests",
- "test.java.lang.StrictMath.Expm1Tests",
- "test.java.lang.StrictMath.ExpTests",
- "test.java.lang.StrictMath.HyperbolicTests",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard1",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard2",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard3",
- "test.java.lang.StrictMath.HypotTests#testAgainstTranslit_shard4",
- "test.java.lang.StrictMath.HypotTests#testHypot",
- "test.java.lang.StrictMath.Log1pTests",
- "test.java.lang.StrictMath.Log10Tests",
- "test.java.lang.StrictMath.MultiplicationTests",
- "test.java.lang.StrictMath.PowTests",
- "test.java.lang.String",
- "test.java.lang.Thread",
- "test.java.lang.invoke",
- "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.BigDecimal",
- "test.java.math.BigInteger#testArithmetic",
- "test.java.math.BigInteger#testBitCount",
- "test.java.math.BigInteger#testBitLength",
- "test.java.math.BigInteger#testbitOps",
- "test.java.math.BigInteger#testBitwise",
- "test.java.math.BigInteger#testByteArrayConv",
- "test.java.math.BigInteger#testConstructor",
- "test.java.math.BigInteger#testDivideAndReminder",
- "test.java.math.BigInteger#testDivideLarge",
- "test.java.math.BigInteger#testModExp",
- "test.java.math.BigInteger#testMultiplyLarge",
- "test.java.math.BigInteger#testNextProbablePrime",
- "test.java.math.BigInteger#testPow",
- "test.java.math.BigInteger#testSerialize",
- "test.java.math.BigInteger#testShift",
- "test.java.math.BigInteger#testSquare",
- "test.java.math.BigInteger#testSquareLarge",
- "test.java.math.BigInteger#testSquareRootAndReminder",
- "test.java.math.BigInteger#testStringConv_generic",
- "test.java.math.RoundingMode",
- "test.java.net.DatagramSocket",
- "test.java.net.Socket",
- "test.java.net.SocketOptions",
- "test.java.net.URLDecoder",
- "test.java.net.URLEncoder",
- "test.java.nio.channels.Channels",
- "test.java.nio.channels.SelectionKey",
- "test.java.nio.channels.Selector",
- "test.java.nio.file",
- "test.java.security.cert",
- "test.java.security.KeyAgreement.KeyAgreementTest",
- "test.java.security.KeyAgreement.KeySizeTest#testECDHKeySize",
- "test.java.security.KeyAgreement.KeySpecTest",
- "test.java.security.KeyAgreement.MultiThreadTest",
- "test.java.security.KeyAgreement.NegativeTest",
- "test.java.security.KeyStore",
- "test.java.security.Provider",
- "test.java.time",
- "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.function",
- "test.java.util.stream",
- "tck.java.time",
-}
-
def get_jar_filename(classpath):
base_path = (ANDROID_PRODUCT_OUT + "/../..") if ANDROID_PRODUCT_OUT else "out/target"
base_path = os.path.normpath(base_path) # Normalize ".." components for readability.
@@ -388,10 +288,8 @@ def get_expected_failures():
failures.append("art/tools/libcore_gcstress_failures.txt")
if args.gcstress and args.debug:
failures.append("art/tools/libcore_gcstress_debug_failures.txt")
- if args.debug and not args.gcstress and args.getrandom:
+ if args.debug and not args.gcstress:
failures.append("art/tools/libcore_debug_failures.txt")
- if not args.getrandom:
- failures.append("art/tools/libcore_fugu_failures.txt")
return failures
def get_test_names():
@@ -404,10 +302,6 @@ def get_test_names():
test_names = list(filter(lambda x: x not in SLOW_OJLUNI_TESTS, test_names))
if args.gcstress and args.debug:
test_names = list(filter(lambda x: x not in DISABLED_GCSTRESS_DEBUG_TESTS, test_names))
- if not args.getrandom:
- # Disable libcore.highmemorytest due to limited ram on fugu. http://b/258173036
- test_names = list(filter(lambda x: x not in DISABLED_FUGU_TESTS and
- not x.startswith("libcore.highmemorytest"), test_names))
return test_names
def get_vogar_command(test_name):
@@ -432,11 +326,6 @@ def get_vogar_command(test_name):
if args.debug:
cmd.append("--vm-arg -XXlib:libartd.so --vm-arg -XX:SlowDebug=true")
- # The only device in go/art-buildbot without getrandom is fugu. We limit the amount of memory
- # per runtime for fugu to avoid low memory killer, fugu has 4-cores 1GB RAM (b/258171768).
- if not args.getrandom:
- cmd.append("--vm-arg -Xmx128M")
-
if args.mode == "device":
if ART_TEST_CHROOT:
cmd.append(f"--chroot {ART_TEST_CHROOT} --device-dir=/tmp/vogar/test-{test_name}")