提交 0edfe2ef 编写于 作者: E eistepan

8062536: [TESTBUG] Conflicting GC combinations in jdk tests

Reviewed-by: brutisso, dholmes
上级 54f64f1c
#
# 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
#
......
#
# 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
#
......
#
# 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
#
......
#
# 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
#
......
#
# 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 @@ runOne MemoryTest 2
# Test MemoryTest with parallel scavenger collector
runOne -XX:+UseParallelGC MemoryTest 2
# Test MemoryTest with concurrent collector
#runOne -XX:+UseConcMarkSweepGC MemoryTest 3
exit 0
#
# 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
#
......
#
# 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()
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
/*
* 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.*;
......
......@@ -92,7 +92,7 @@ public final class JpsHelper {
/**
* 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
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册