OpenJDK / portola / portola
changeset 28528:6b55dd30a0ba
Merge
| author | amurillo |
|---|---|
| date | Thu, 15 Jan 2015 19:23:49 -0800 |
| parents | a4f35c6aa3cc 38a80fae1b65 |
| children | 0388b3b63648 9a2e5d103695 4dbf48487f1f 50a355c9b0a6 |
| files | jdk/test/ProblemList.txt jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/ProblemList.txt Thu Jan 15 16:45:02 2015 -0800 +++ b/jdk/test/ProblemList.txt Thu Jan 15 19:23:49 2015 -0800 @@ -296,6 +296,9 @@ # 8058616 com/sun/jdi/RedefinePop.sh generic-all +# 8068645 +com/sun/jdi/CatchPatternTest.sh generic-all + ############################################################################ # jdk_util @@ -332,6 +335,9 @@ # 8057732 sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java generic-all +# 8064572 8060736 8062938 +sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all + # 8060088 com/sun/tracing/BasicWithSecurityMgr.java generic-all
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Thu Jan 15 16:45:02 2015 -0800 +++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Thu Jan 15 19:23:49 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,15 +34,16 @@ * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null" * @run main/timeout=600 LowMemoryTest + * @requires vm.opt.ExplicitGCInvokesConcurrent != "true" + * @requires vm.opt.ExplicitGCInvokesConcurrentAndUnloadsClasses != "true" + * @requires vm.opt.DisableExplicitGC != "true" */ -import com.sun.management.DiagnosticCommandMBean; import java.lang.management.*; import java.util.*; import java.util.concurrent.Phaser; import javax.management.*; import javax.management.openmbean.CompositeData; -import sun.management.ManagementFactoryHelper; public class LowMemoryTest { private static final MemoryMXBean mm = ManagementFactory.getMemoryMXBean();