diff options
Diffstat (limited to 'tools/run-libcore-tests.py')
| -rwxr-xr-x | tools/run-libcore-tests.py | 113 |
1 files changed, 1 insertions, 112 deletions
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}") |