Mercurial > hg > openjdk > jdk8u > jdk
changeset 11445:5972ad24ef27
8062536: [TESTBUG] Conflicting GC combinations in jdk tests
Reviewed-by: brutisso, dholmes
author | eistepan |
---|---|
date | Wed, 19 Nov 2014 17:51:06 +0300 |
parents | 08f5204fbcdd |
children | 041d28c98c29 |
files | test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh test/java/lang/management/MemoryMXBean/PendingAllGC.sh test/java/lang/management/RuntimeMXBean/TestInputArgument.sh test/java/lang/ref/EnqueuePollRace.java test/sun/tools/jps/JpsHelper.java |
diffstat | 9 files changed, 18 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2014, 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 @@ -25,7 +25,7 @@ # @test # @bug 4982128 # @summary Test low memory detection of non-heap memory pool -# +# @requires vm.gc=="null" # @run build LowMemoryTest2 MemoryUtil # @run shell/timeout=600 LowMemoryTest2.sh #
--- a/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary Run MemoryManagement test with concurrent mark sweep GC # @author Mandy Chung -# +# @requires vm.gc=="ConcMarkSweep" | vm.gc=="null" # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementConcMarkSweepGC.sh #
--- a/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary Run MemoryManagement test with parallel GC # @author Mandy Chung -# +# @requires vm.gc=="Parallel" | vm.gc=="null" # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementParallelGC.sh #
--- a/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary Run MemoryManagement test with serial GC # @author Mandy Chung -# +# @requires vm.gc=="Serial" | vm.gc=="null" # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementSerialGC.sh #
--- a/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary # @author Mandy Chung -# +# @requires vm.gc=="Parallel" | vm.gc=="null" # @run compile MemoryTest.java # @run shell MemoryTestAllGC.sh # @@ -52,7 +52,5 @@ # Test MemoryTest with parallel scavenger collector runOne -XX:+UseParallelGC MemoryTest 2 -# Test MemoryTest with concurrent collector -#runOne -XX:+UseConcMarkSweepGC MemoryTest 3 exit 0
--- a/test/java/lang/management/MemoryMXBean/PendingAllGC.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/MemoryMXBean/PendingAllGC.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -26,7 +26,7 @@ # @bug 4530538 # @summary # @author Mandy Chung -# +# @requires vm.gc=="null" # @run compile Pending.java # @run shell PendingAllGC.sh #
--- a/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2014, 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 @@ -26,7 +26,6 @@ # @bug 4530538 # @summary # @author Mandy Chung -# # @run compile InputArgument.java # @run shell TestInputArgument.sh # @@ -48,8 +47,8 @@ runOne InputArgument -runOne -XX:+UseParallelGC -XX:+PrintGCDetails InputArgument -XX:+PrintGCDetails -runOne -XX:+UseParallelGC -XX:+PrintGCDetails InputArgument -XX:+UseParallelGC +runOne -XX:+UseFastJNIAccessors -XX:+PrintGCDetails InputArgument -XX:+PrintGCDetails +runOne -XX:+UseFastJNIAccessors -XX:+PrintGCDetails InputArgument -XX:+UseFastJNIAccessors runOne "-Dprops=one two three" InputArgument "-Dprops=one two three" exit 0
--- a/test/java/lang/ref/EnqueuePollRace.java Mon Feb 29 15:59:02 2016 +0300 +++ b/test/java/lang/ref/EnqueuePollRace.java Wed Nov 19 17:51:06 2014 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 @@ -25,7 +25,7 @@ * @bug 8014890 * @summary Verify that a race between ReferenceQueue.enqueue() and poll() does not occur. * @author thomas.schatzl@oracle.com - * @run main/othervm -XX:+UseSerialGC -Xmx10M EnqueuePollRace + * @run main/othervm -Xmx10M EnqueuePollRace */ import java.lang.ref.*;
--- a/test/sun/tools/jps/JpsHelper.java Mon Feb 29 15:59:02 2016 +0300 +++ b/test/sun/tools/jps/JpsHelper.java Wed Nov 19 17:51:06 2014 +0300 @@ -92,7 +92,7 @@ /** * VM arguments to start test application with */ - public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+UseParallelGC"}; + public static final String[] VM_ARGS = {"-Xmx512m", "-XX:+PrintGCDetails"}; /** * VM flag to start test application with */