OpenJDK / jdk / jdk
changeset 28527:38a80fae1b65
8062450: Timeout in LowMemoryTest.java
Reviewed-by: dholmes
| author | jbachorik |
|---|---|
| date | Mon, 12 Jan 2015 11:01:23 +0100 |
| parents | 7510bb5aba58 |
| children | 6b55dd30a0ba cb15fc6cc038 |
| files | jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Mon Jan 12 08:24:15 2015 +0100 +++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Mon Jan 12 11:01:23 2015 +0100 @@ -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 @@ -33,15 +33,16 @@ * @library /lib/testlibrary/ * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil * @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();