OpenJDK / jdk / jdk
changeset 43442:f5ff8c427f99
Merge
| author | dfazunen |
|---|---|
| date | Thu, 12 Jan 2017 10:31:00 +0000 |
| parents | d9067cd7f684 577efc45fed8 |
| children | f444a6847614 e7abeb81e94a |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithCMS.java Wed Jan 11 17:43:36 2017 +0300 +++ b/hotspot/test/gc/stress/gcbasher/TestGCBasherWithCMS.java Thu Jan 12 10:31:00 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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 @@ -31,7 +31,7 @@ * @requires vm.gc.ConcMarkSweep * @requires vm.flavor == "server" * @summary Stress the CMS GC by trying to make old objects more likely to be garbage than young objects. - * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx128m -server -XX:+UseConcMarkSweepGC TestGCBasherWithCMS 120000 + * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseConcMarkSweepGC TestGCBasherWithCMS 120000 */ public class TestGCBasherWithCMS { public static void main(String[] args) throws IOException {
--- a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithG1.java Wed Jan 11 17:43:36 2017 +0300 +++ b/hotspot/test/gc/stress/gcbasher/TestGCBasherWithG1.java Thu Jan 12 10:31:00 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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 @@ -31,7 +31,7 @@ * @requires vm.gc.G1 * @requires vm.flavor == "server" * @summary Stress the G1 GC by trying to make old objects more likely to be garbage than young objects. - * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx128m -server -XX:+UseG1GC TestGCBasherWithG1 120000 + * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseG1GC TestGCBasherWithG1 120000 */ public class TestGCBasherWithG1 { public static void main(String[] args) throws IOException {
--- a/hotspot/test/gc/stress/gcbasher/TestGCBasherWithSerial.java Wed Jan 11 17:43:36 2017 +0300 +++ b/hotspot/test/gc/stress/gcbasher/TestGCBasherWithSerial.java Thu Jan 12 10:31:00 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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 @@ -31,7 +31,7 @@ * @requires vm.gc.Serial * @requires vm.flavor == "server" * @summary Stress the Serial GC by trying to make old objects more likely to be garbage than young objects. - * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx128m -server -XX:+UseSerialGC TestGCBasherWithSerial 120000 + * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseSerialGC TestGCBasherWithSerial 120000 */ public class TestGCBasherWithSerial { public static void main(String[] args) throws IOException {