From 41120acf7439af5bd8fd5bb03b5492da71351fcd Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Thu, 21 Jun 2018 22:17:22 -0700 Subject: [PATCH] 8172854: [TESTBUG] Exclude runtime/ReservedStack/ReservedStackTest.java from being run with DeoptimizeALot option Reviewed-by: kvn --- .../jtreg/runtime/ReservedStack/ReservedStackTest.java | 5 ++++- .../runtime/ReservedStack/ReservedStackTestCompiler.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java index d1559092480..e029fdf9cd2 100644 --- a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java +++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, 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 @@ -23,9 +23,12 @@ /* * @test ReservedStackTest + * + * @requires vm.opt.DeoptimizeAlot == null | vm.opt.DeoptimizeAlot == false * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation + * * @run main/othervm -XX:MaxInlineLevel=2 -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest */ diff --git a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java index 616788fe251..4cb480a05c5 100644 --- a/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java +++ b/test/hotspot/jtreg/runtime/ReservedStack/ReservedStackTestCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, 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 @@ -24,10 +24,13 @@ /* * @test ReservedStackTestCompiler * @summary Run ReservedStackTest with dedicated compilers C1 and C2. + * * @requires vm.flavor == "server" & !vm.emulatedClient + * @requires vm.opt.DeoptimizeAlot == null | vm.opt.DeoptimizeAlot == false * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation + * * @run main/othervm -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest * @run main/othervm -XX:-TieredCompilation -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest */