From 4d13bf33d4932cc210a29c4e3a68f848db18575b Mon Sep 17 00:00:00 2001 From: Jerry Zhou Date: Fri, 17 Jul 2020 01:50:44 +0000 Subject: [PATCH 001/100] 8249628: Remove EA from JDK 15 version string starting with Initial RC promotion Reviewed-by: tbell, erikj --- make/autoconf/version-numbers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/autoconf/version-numbers b/make/autoconf/version-numbers index 7f6fac8de2b..aabdc5bed20 100644 --- a/make/autoconf/version-numbers +++ b/make/autoconf/version-numbers @@ -38,7 +38,7 @@ DEFAULT_VERSION_CLASSFILE_MAJOR=59 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" DEFAULT_VERSION_CLASSFILE_MINOR=0 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="14 15" DEFAULT_JDK_SOURCE_TARGET_VERSION=15 -DEFAULT_PROMOTED_VERSION_PRE=ea +DEFAULT_PROMOTED_VERSION_PRE= LAUNCHER_NAME=openjdk PRODUCT_NAME=OpenJDK From 339016a0f2cbbbbc3560e50c6726e14afbf547f6 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 5 Aug 2020 11:32:15 -0700 Subject: [PATCH 002/100] 8250902: Implement MD5 Intrinsics on x86 Reviewed-by: kvn, vdeshpande, ascarpino --- .../cpu/aarch64/vm_version_aarch64.cpp | 5 + src/hotspot/cpu/arm/vm_version_arm_32.cpp | 7 +- src/hotspot/cpu/ppc/vm_version_ppc.cpp | 5 + src/hotspot/cpu/s390/vm_version_s390.cpp | 9 +- src/hotspot/cpu/x86/assembler_x86.cpp | 10 + src/hotspot/cpu/x86/assembler_x86.hpp | 2 + src/hotspot/cpu/x86/macroAssembler_x86.hpp | 3 + .../cpu/x86/macroAssembler_x86_md5.cpp | 204 ++++++++++++++++++ src/hotspot/cpu/x86/stubGenerator_x86_32.cpp | 44 ++++ src/hotspot/cpu/x86/stubGenerator_x86_64.cpp | 41 ++++ src/hotspot/cpu/x86/vm_version_x86.cpp | 4 + src/hotspot/share/classfile/vmSymbols.cpp | 7 +- src/hotspot/share/classfile/vmSymbols.hpp | 8 +- src/hotspot/share/opto/c2compiler.cpp | 1 + src/hotspot/share/opto/escape.cpp | 2 + src/hotspot/share/opto/library_call.cpp | 170 ++++++++------- src/hotspot/share/opto/runtime.cpp | 4 +- src/hotspot/share/opto/runtime.hpp | 4 +- src/hotspot/share/runtime/globals.hpp | 3 + src/hotspot/share/runtime/stubRoutines.cpp | 4 +- src/hotspot/share/runtime/stubRoutines.hpp | 6 +- .../classes/sun/security/provider/MD5.java | 25 ++- .../classes/sun/security/provider/SHA.java | 6 +- .../hotspot/test/CheckGraalIntrinsics.java | 13 ++ .../sha/{TestSHA.java => TestDigest.java} | 76 ++++--- ...ptionsBase.java => DigestOptionsBase.java} | 38 ++-- ...tUseMD5IntrinsicsOptionOnSupportedCPU.java | 48 +++++ ...seMD5IntrinsicsOptionOnUnsupportedCPU.java | 56 +++++ ...UseSHA1IntrinsicsOptionOnSupportedCPU.java | 4 +- ...eSHA1IntrinsicsOptionOnUnsupportedCPU.java | 10 +- ...eSHA256IntrinsicsOptionOnSupportedCPU.java | 4 +- ...HA256IntrinsicsOptionOnUnsupportedCPU.java | 10 +- ...eSHA512IntrinsicsOptionOnSupportedCPU.java | 4 +- ...HA512IntrinsicsOptionOnUnsupportedCPU.java | 10 +- .../cli/TestUseSHAOptionOnSupportedCPU.java | 6 +- .../cli/TestUseSHAOptionOnUnsupportedCPU.java | 10 +- .../testcases/GenericTestCaseForOtherCPU.java | 41 ++-- .../GenericTestCaseForSupportedCPU.java | 127 ++++++----- ...nericTestCaseForUnsupportedAArch64CPU.java | 77 ++++--- .../GenericTestCaseForUnsupportedX86CPU.java | 55 +++-- ...sicsSpecificTestCaseForUnsupportedCPU.java | 12 +- ...UseSHASpecificTestCaseForSupportedCPU.java | 68 +++--- ...eSHASpecificTestCaseForUnsupportedCPU.java | 42 ++-- ...estBase.java => DigestSanityTestBase.java} | 20 +- .../sha/sanity/TestMD5Intrinsics.java | 65 ++++++ .../sanity/TestMD5MultiBlockIntrinsics.java | 73 +++++++ .../sha/sanity/TestSHA1Intrinsics.java | 4 +- .../sanity/TestSHA1MultiBlockIntrinsics.java | 8 +- .../sha/sanity/TestSHA256Intrinsics.java | 4 +- .../TestSHA256MultiBlockIntrinsics.java | 12 +- .../sha/sanity/TestSHA512Intrinsics.java | 4 +- .../TestSHA512MultiBlockIntrinsics.java | 12 +- .../sha/predicate/IntrinsicPredicates.java | 11 + 53 files changed, 1110 insertions(+), 388 deletions(-) create mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_md5.cpp rename test/hotspot/jtreg/compiler/intrinsics/sha/{TestSHA.java => TestDigest.java} (71%) rename test/hotspot/jtreg/compiler/intrinsics/sha/cli/{SHAOptionsBase.java => DigestOptionsBase.java} (79%) create mode 100644 test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java create mode 100644 test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java rename test/hotspot/jtreg/compiler/intrinsics/sha/sanity/{SHASanityTestBase.java => DigestSanityTestBase.java} (85%) create mode 100644 test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java create mode 100644 test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp index f302f798271..25d6b853378 100644 --- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp @@ -358,6 +358,11 @@ void VM_Version::get_processor_features() { FLAG_SET_DEFAULT(UseFMA, true); } + if (UseMD5Intrinsics) { + warning("MD5 intrinsics are not available on this CPU"); + FLAG_SET_DEFAULT(UseMD5Intrinsics, false); + } + if (auxv & (HWCAP_SHA1 | HWCAP_SHA2)) { if (FLAG_IS_DEFAULT(UseSHA)) { FLAG_SET_DEFAULT(UseSHA, true); diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp index bec10b5afdd..7d1949d2e2b 100644 --- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp +++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -209,6 +209,11 @@ void VM_Version::initialize() { FLAG_SET_DEFAULT(UseFMA, false); } + if (UseMD5Intrinsics) { + warning("MD5 intrinsics are not available on this CPU"); + FLAG_SET_DEFAULT(UseMD5Intrinsics, false); + } + if (UseSHA) { warning("SHA instructions are not available on this CPU"); FLAG_SET_DEFAULT(UseSHA, false); diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp index a62255eb72f..306db53018a 100644 --- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp +++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp @@ -284,6 +284,11 @@ void VM_Version::initialize() { FLAG_SET_DEFAULT(UseFMA, true); } + if (UseMD5Intrinsics) { + warning("MD5 intrinsics are not available on this CPU"); + FLAG_SET_DEFAULT(UseMD5Intrinsics, false); + } + if (has_vshasig()) { if (FLAG_IS_DEFAULT(UseSHA)) { UseSHA = true; diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp index 3aab4203179..663b8d1dc44 100644 --- a/src/hotspot/cpu/s390/vm_version_s390.cpp +++ b/src/hotspot/cpu/s390/vm_version_s390.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2016, 2019 SAP SE. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020 SAP SE. 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 @@ -179,6 +179,11 @@ void VM_Version::initialize() { FLAG_SET_DEFAULT(UseFMA, true); } + if (UseMD5Intrinsics) { + warning("MD5 intrinsics are not available on this CPU"); + FLAG_SET_DEFAULT(UseMD5Intrinsics, false); + } + // On z/Architecture, we take UseSHA as the general switch to enable/disable the SHA intrinsics. // The specific switches UseSHAxxxIntrinsics will then be set depending on the actual // machine capabilities. diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp index 1cb1df54968..20b0dbc4f89 100644 --- a/src/hotspot/cpu/x86/assembler_x86.cpp +++ b/src/hotspot/cpu/x86/assembler_x86.cpp @@ -4301,6 +4301,16 @@ void Assembler::ret(int imm16) { } } +void Assembler::roll(Register dst, int imm8) { + assert(isShiftCount(imm8 >> 1), "illegal shift count"); + int encode = prefix_and_encode(dst->encoding()); + if (imm8 == 1) { + emit_int16((unsigned char)0xD1, (0xC0 | encode)); + } else { + emit_int24((unsigned char)0xC1, (0xc0 | encode), imm8); + } +} + void Assembler::sahf() { #ifdef _LP64 // Not supported in 64bit mode diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp index 01d92f896f3..38637cc2a32 100644 --- a/src/hotspot/cpu/x86/assembler_x86.hpp +++ b/src/hotspot/cpu/x86/assembler_x86.hpp @@ -1827,6 +1827,8 @@ private: void ret(int imm16); + void roll(Register dst, int imm8); + #ifdef _LP64 void rorq(Register dst, int imm8); void rorxq(Register dst, Register src, int imm8); diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp index a939e7794d4..d77d74311a6 100644 --- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp @@ -956,6 +956,9 @@ public: #endif + void fast_md5(Register buf, Address state, Address ofs, Address limit, + bool multi_block); + void fast_sha1(XMMRegister abcd, XMMRegister e0, XMMRegister e1, XMMRegister msg0, XMMRegister msg1, XMMRegister msg2, XMMRegister msg3, XMMRegister shuf_mask, Register buf, Register state, Register ofs, Register limit, Register rsp, diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_md5.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_md5.cpp new file mode 100644 index 00000000000..506147166de --- /dev/null +++ b/src/hotspot/cpu/x86/macroAssembler_x86_md5.cpp @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2020 Microsoft Corporation. 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/* + * Copyright (c) 2017 Project Nayuki. (MIT License) + * https://www.nayuki.io/page/fast-md5-hash-implementation-in-x86-assembly + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * - The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * - The Software is provided "as is", without warranty of any kind, express or + * implied, including but not limited to the warranties of merchantability, + * fitness for a particular purpose and noninfringement. In no event shall the + * authors or copyright holders be liable for any claim, damages or other + * liability, whether in an action of contract, tort or otherwise, arising from, + * out of or in connection with the Software or the use or other dealings in the + * Software. + */ + +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" +#include "runtime/stubRoutines.hpp" +#include "macroAssembler_x86.hpp" + +// int com.sun.security.provider.MD5.implCompress0(byte[] b, int ofs) +void MacroAssembler::fast_md5(Register buf, Address state, Address ofs, Address limit, bool multi_block) { + + Label start, done_hash, loop0; + + bind(start); + + bind(loop0); + + // Save hash values for addition after rounds + movptr(rdi, state); + movl(rax, Address(rdi, 0)); + movl(rbx, Address(rdi, 4)); + movl(rcx, Address(rdi, 8)); + movl(rdx, Address(rdi, 12)); + +#define FF(r1, r2, r3, r4, k, s, t) \ + movl(rsi, r3); \ + addl(r1, Address(buf, k*4)); \ + xorl(rsi, r4); \ + andl(rsi, r2); \ + xorl(rsi, r4); \ + leal(r1, Address(r1, rsi, Address::times_1, t)); \ + roll(r1, s); \ + addl(r1, r2); + +#define GG(r1, r2, r3, r4, k, s, t) \ + movl(rsi, r4); \ + movl(rdi, r4); \ + addl(r1, Address(buf, k*4)); \ + notl(rsi); \ + andl(rdi, r2); \ + andl(rsi, r3); \ + orl(rsi, rdi); \ + leal(r1, Address(r1, rsi, Address::times_1, t)); \ + roll(r1, s); \ + addl(r1, r2); + +#define HH(r1, r2, r3, r4, k, s, t) \ + movl(rsi, r3); \ + addl(r1, Address(buf, k*4)); \ + xorl(rsi, r4); \ + xorl(rsi, r2); \ + leal(r1, Address(r1, rsi, Address::times_1, t)); \ + roll(r1, s); \ + addl(r1, r2); + +#define II(r1, r2, r3, r4, k, s, t) \ + movl(rsi, r4); \ + notl(rsi); \ + addl(r1, Address(buf, k*4)); \ + orl(rsi, r2); \ + xorl(rsi, r3); \ + leal(r1, Address(r1, rsi, Address::times_1, t)); \ + roll(r1, s); \ + addl(r1, r2); + + // Round 1 + FF(rax, rbx, rcx, rdx, 0, 7, 0xd76aa478) + FF(rdx, rax, rbx, rcx, 1, 12, 0xe8c7b756) + FF(rcx, rdx, rax, rbx, 2, 17, 0x242070db) + FF(rbx, rcx, rdx, rax, 3, 22, 0xc1bdceee) + FF(rax, rbx, rcx, rdx, 4, 7, 0xf57c0faf) + FF(rdx, rax, rbx, rcx, 5, 12, 0x4787c62a) + FF(rcx, rdx, rax, rbx, 6, 17, 0xa8304613) + FF(rbx, rcx, rdx, rax, 7, 22, 0xfd469501) + FF(rax, rbx, rcx, rdx, 8, 7, 0x698098d8) + FF(rdx, rax, rbx, rcx, 9, 12, 0x8b44f7af) + FF(rcx, rdx, rax, rbx, 10, 17, 0xffff5bb1) + FF(rbx, rcx, rdx, rax, 11, 22, 0x895cd7be) + FF(rax, rbx, rcx, rdx, 12, 7, 0x6b901122) + FF(rdx, rax, rbx, rcx, 13, 12, 0xfd987193) + FF(rcx, rdx, rax, rbx, 14, 17, 0xa679438e) + FF(rbx, rcx, rdx, rax, 15, 22, 0x49b40821) + + // Round 2 + GG(rax, rbx, rcx, rdx, 1, 5, 0xf61e2562) + GG(rdx, rax, rbx, rcx, 6, 9, 0xc040b340) + GG(rcx, rdx, rax, rbx, 11, 14, 0x265e5a51) + GG(rbx, rcx, rdx, rax, 0, 20, 0xe9b6c7aa) + GG(rax, rbx, rcx, rdx, 5, 5, 0xd62f105d) + GG(rdx, rax, rbx, rcx, 10, 9, 0x02441453) + GG(rcx, rdx, rax, rbx, 15, 14, 0xd8a1e681) + GG(rbx, rcx, rdx, rax, 4, 20, 0xe7d3fbc8) + GG(rax, rbx, rcx, rdx, 9, 5, 0x21e1cde6) + GG(rdx, rax, rbx, rcx, 14, 9, 0xc33707d6) + GG(rcx, rdx, rax, rbx, 3, 14, 0xf4d50d87) + GG(rbx, rcx, rdx, rax, 8, 20, 0x455a14ed) + GG(rax, rbx, rcx, rdx, 13, 5, 0xa9e3e905) + GG(rdx, rax, rbx, rcx, 2, 9, 0xfcefa3f8) + GG(rcx, rdx, rax, rbx, 7, 14, 0x676f02d9) + GG(rbx, rcx, rdx, rax, 12, 20, 0x8d2a4c8a) + + // Round 3 + HH(rax, rbx, rcx, rdx, 5, 4, 0xfffa3942) + HH(rdx, rax, rbx, rcx, 8, 11, 0x8771f681) + HH(rcx, rdx, rax, rbx, 11, 16, 0x6d9d6122) + HH(rbx, rcx, rdx, rax, 14, 23, 0xfde5380c) + HH(rax, rbx, rcx, rdx, 1, 4, 0xa4beea44) + HH(rdx, rax, rbx, rcx, 4, 11, 0x4bdecfa9) + HH(rcx, rdx, rax, rbx, 7, 16, 0xf6bb4b60) + HH(rbx, rcx, rdx, rax, 10, 23, 0xbebfbc70) + HH(rax, rbx, rcx, rdx, 13, 4, 0x289b7ec6) + HH(rdx, rax, rbx, rcx, 0, 11, 0xeaa127fa) + HH(rcx, rdx, rax, rbx, 3, 16, 0xd4ef3085) + HH(rbx, rcx, rdx, rax, 6, 23, 0x04881d05) + HH(rax, rbx, rcx, rdx, 9, 4, 0xd9d4d039) + HH(rdx, rax, rbx, rcx, 12, 11, 0xe6db99e5) + HH(rcx, rdx, rax, rbx, 15, 16, 0x1fa27cf8) + HH(rbx, rcx, rdx, rax, 2, 23, 0xc4ac5665) + + // Round 4 + II(rax, rbx, rcx, rdx, 0, 6, 0xf4292244) + II(rdx, rax, rbx, rcx, 7, 10, 0x432aff97) + II(rcx, rdx, rax, rbx, 14, 15, 0xab9423a7) + II(rbx, rcx, rdx, rax, 5, 21, 0xfc93a039) + II(rax, rbx, rcx, rdx, 12, 6, 0x655b59c3) + II(rdx, rax, rbx, rcx, 3, 10, 0x8f0ccc92) + II(rcx, rdx, rax, rbx, 10, 15, 0xffeff47d) + II(rbx, rcx, rdx, rax, 1, 21, 0x85845dd1) + II(rax, rbx, rcx, rdx, 8, 6, 0x6fa87e4f) + II(rdx, rax, rbx, rcx, 15, 10, 0xfe2ce6e0) + II(rcx, rdx, rax, rbx, 6, 15, 0xa3014314) + II(rbx, rcx, rdx, rax, 13, 21, 0x4e0811a1) + II(rax, rbx, rcx, rdx, 4, 6, 0xf7537e82) + II(rdx, rax, rbx, rcx, 11, 10, 0xbd3af235) + II(rcx, rdx, rax, rbx, 2, 15, 0x2ad7d2bb) + II(rbx, rcx, rdx, rax, 9, 21, 0xeb86d391) + +#undef FF +#undef GG +#undef HH +#undef II + + // write hash values back in the correct order + movptr(rdi, state); + addl(Address(rdi, 0), rax); + addl(Address(rdi, 4), rbx); + addl(Address(rdi, 8), rcx); + addl(Address(rdi, 12), rdx); + + if (multi_block) { + // increment data pointer and loop if more to process + addptr(buf, 64); + addl(ofs, 64); + movl(rsi, ofs); + cmpl(rsi, limit); + jcc(Assembler::belowEqual, loop0); + movptr(rax, rsi); //return ofs + } + + bind(done_hash); +} diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp index 2d05442a940..c5d0effae0f 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp @@ -2884,6 +2884,46 @@ class StubGenerator: public StubCodeGenerator { return start; } + // ofs and limit are use for multi-block byte array. + // int com.sun.security.provider.MD5.implCompress(byte[] b, int ofs) + address generate_md5_implCompress(bool multi_block, const char *name) { + __ align(CodeEntryAlignment); + StubCodeMark mark(this, "StubRoutines", name); + address start = __ pc(); + + const Register buf_param = rbp; + const Address state_param(rsp, 0 * wordSize); + const Address ofs_param (rsp, 1 * wordSize); + const Address limit_param(rsp, 2 * wordSize); + + __ enter(); + __ push(rbx); + __ push(rdi); + __ push(rsi); + __ push(rbp); + __ subptr(rsp, 3 * wordSize); + + __ movptr(rsi, Address(rbp, 8 + 4)); + __ movptr(state_param, rsi); + if (multi_block) { + __ movptr(rsi, Address(rbp, 8 + 8)); + __ movptr(ofs_param, rsi); + __ movptr(rsi, Address(rbp, 8 + 12)); + __ movptr(limit_param, rsi); + } + __ movptr(buf_param, Address(rbp, 8 + 0)); // do it last because it override rbp + __ fast_md5(buf_param, state_param, ofs_param, limit_param, multi_block); + + __ addptr(rsp, 3 * wordSize); + __ pop(rbp); + __ pop(rsi); + __ pop(rdi); + __ pop(rbx); + __ leave(); + __ ret(0); + return start; + } + address generate_upper_word_mask() { __ align(64); StubCodeMark mark(this, "StubRoutines", "upper_word_mask"); @@ -3886,6 +3926,10 @@ class StubGenerator: public StubCodeGenerator { StubRoutines::_counterMode_AESCrypt = generate_counterMode_AESCrypt_Parallel(); } + if (UseMD5Intrinsics) { + StubRoutines::_md5_implCompress = generate_md5_implCompress(false, "md5_implCompress"); + StubRoutines::_md5_implCompressMB = generate_md5_implCompress(true, "md5_implCompressMB"); + } if (UseSHA1Intrinsics) { StubRoutines::x86::_upper_word_mask_addr = generate_upper_word_mask(); StubRoutines::x86::_shuffle_byte_flip_mask_addr = generate_shuffle_byte_flip_mask(); diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp index a127f48bf6c..3d2c7671304 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp @@ -3646,6 +3646,43 @@ class StubGenerator: public StubCodeGenerator { return start; } + // ofs and limit are use for multi-block byte array. + // int com.sun.security.provider.MD5.implCompress(byte[] b, int ofs) + address generate_md5_implCompress(bool multi_block, const char *name) { + __ align(CodeEntryAlignment); + StubCodeMark mark(this, "StubRoutines", name); + address start = __ pc(); + + const Register buf_param = r15; + const Address state_param(rsp, 0 * wordSize); + const Address ofs_param (rsp, 1 * wordSize ); + const Address limit_param(rsp, 1 * wordSize + 4); + + __ enter(); + __ push(rbx); + __ push(rdi); + __ push(rsi); + __ push(r15); + __ subptr(rsp, 2 * wordSize); + + __ movptr(buf_param, c_rarg0); + __ movptr(state_param, c_rarg1); + if (multi_block) { + __ movl(ofs_param, c_rarg2); + __ movl(limit_param, c_rarg3); + } + __ fast_md5(buf_param, state_param, ofs_param, limit_param, multi_block); + + __ addptr(rsp, 2 * wordSize); + __ pop(r15); + __ pop(rsi); + __ pop(rdi); + __ pop(rbx); + __ leave(); + __ ret(0); + return start; + } + address generate_upper_word_mask() { __ align(64); StubCodeMark mark(this, "StubRoutines", "upper_word_mask"); @@ -6327,6 +6364,10 @@ address generate_avx_ghash_processBlocks() { } } + if (UseMD5Intrinsics) { + StubRoutines::_md5_implCompress = generate_md5_implCompress(false, "md5_implCompress"); + StubRoutines::_md5_implCompressMB = generate_md5_implCompress(true, "md5_implCompressMB"); + } if (UseSHA1Intrinsics) { StubRoutines::x86::_upper_word_mask_addr = generate_upper_word_mask(); StubRoutines::x86::_shuffle_byte_flip_mask_addr = generate_shuffle_byte_flip_mask(); diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp index b57507ed617..42289037576 100644 --- a/src/hotspot/cpu/x86/vm_version_x86.cpp +++ b/src/hotspot/cpu/x86/vm_version_x86.cpp @@ -945,6 +945,10 @@ void VM_Version::get_processor_features() { FLAG_SET_DEFAULT(UseFMA, false); } + if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) { + UseMD5Intrinsics = true; + } + if (supports_sha() LP64_ONLY(|| supports_avx2() && supports_bmi2())) { if (FLAG_IS_DEFAULT(UseSHA)) { UseSHA = true; diff --git a/src/hotspot/share/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp index 1b33b8c1cf4..32ce4aa3bc1 100644 --- a/src/hotspot/share/classfile/vmSymbols.cpp +++ b/src/hotspot/share/classfile/vmSymbols.cpp @@ -455,7 +455,7 @@ int vmIntrinsics::predicates_needed(vmIntrinsics::ID id) { case vmIntrinsics::_counterMode_AESCrypt: return 1; case vmIntrinsics::_digestBase_implCompressMB: - return 3; + return 4; default: return 0; } @@ -699,6 +699,9 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) { case vmIntrinsics::_counterMode_AESCrypt: if (!UseAESCTRIntrinsics) return true; break; + case vmIntrinsics::_md5_implCompress: + if (!UseMD5Intrinsics) return true; + break; case vmIntrinsics::_sha_implCompress: if (!UseSHA1Intrinsics) return true; break; @@ -709,7 +712,7 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) { if (!UseSHA512Intrinsics) return true; break; case vmIntrinsics::_digestBase_implCompressMB: - if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) return true; + if (!(UseMD5Intrinsics || UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) return true; break; case vmIntrinsics::_ghash_processBlocks: if (!UseGHASHIntrinsics) return true; diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp index 44915b4320f..ab0a108b240 100644 --- a/src/hotspot/share/classfile/vmSymbols.hpp +++ b/src/hotspot/share/classfile/vmSymbols.hpp @@ -1044,11 +1044,15 @@ do_intrinsic(_counterMode_AESCrypt, com_sun_crypto_provider_counterMode, crypt_name, byteArray_int_int_byteArray_int_signature, F_R) \ do_name( crypt_name, "implCrypt") \ \ + /* support for sun.security.provider.MD5 */ \ + do_class(sun_security_provider_md5, "sun/security/provider/MD5") \ + do_intrinsic(_md5_implCompress, sun_security_provider_md5, implCompress_name, implCompress_signature, F_R) \ + do_name( implCompress_name, "implCompress0") \ + do_signature(implCompress_signature, "([BI)V") \ + \ /* support for sun.security.provider.SHA */ \ do_class(sun_security_provider_sha, "sun/security/provider/SHA") \ do_intrinsic(_sha_implCompress, sun_security_provider_sha, implCompress_name, implCompress_signature, F_R) \ - do_name( implCompress_name, "implCompress0") \ - do_signature(implCompress_signature, "([BI)V") \ \ /* support for sun.security.provider.SHA2 */ \ do_class(sun_security_provider_sha2, "sun/security/provider/SHA2") \ diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp index 6fa827018f4..e1ac66968a4 100644 --- a/src/hotspot/share/opto/c2compiler.cpp +++ b/src/hotspot/share/opto/c2compiler.cpp @@ -620,6 +620,7 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt case vmIntrinsics::_electronicCodeBook_encryptAESCrypt: case vmIntrinsics::_electronicCodeBook_decryptAESCrypt: case vmIntrinsics::_counterMode_AESCrypt: + case vmIntrinsics::_md5_implCompress: case vmIntrinsics::_sha_implCompress: case vmIntrinsics::_sha2_implCompress: case vmIntrinsics::_sha5_implCompress: diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp index 5d0147ba04e..681fdb82510 100644 --- a/src/hotspot/share/opto/escape.cpp +++ b/src/hotspot/share/opto/escape.cpp @@ -993,6 +993,8 @@ void ConnectionGraph::process_call_arguments(CallNode *call) { strcmp(call->as_CallLeaf()->_name, "counterMode_AESCrypt") == 0 || strcmp(call->as_CallLeaf()->_name, "ghash_processBlocks") == 0 || strcmp(call->as_CallLeaf()->_name, "encodeBlock") == 0 || + strcmp(call->as_CallLeaf()->_name, "md5_implCompress") == 0 || + strcmp(call->as_CallLeaf()->_name, "md5_implCompressMB") == 0 || strcmp(call->as_CallLeaf()->_name, "sha1_implCompress") == 0 || strcmp(call->as_CallLeaf()->_name, "sha1_implCompressMB") == 0 || strcmp(call->as_CallLeaf()->_name, "sha256_implCompress") == 0 || diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp index 87ac8964c54..d8e09638e01 100644 --- a/src/hotspot/share/opto/library_call.cpp +++ b/src/hotspot/share/opto/library_call.cpp @@ -305,13 +305,13 @@ class LibraryCallKit : public GraphKit { Node* get_original_key_start_from_aescrypt_object(Node* aescrypt_object); bool inline_ghash_processBlocks(); bool inline_base64_encodeBlock(); - bool inline_sha_implCompress(vmIntrinsics::ID id); + bool inline_digestBase_implCompress(vmIntrinsics::ID id); bool inline_digestBase_implCompressMB(int predicate); - bool inline_sha_implCompressMB(Node* digestBaseObj, ciInstanceKlass* instklass_SHA, - bool long_state, address stubAddr, const char *stubName, - Node* src_start, Node* ofs, Node* limit); - Node* get_state_from_sha_object(Node *sha_object); - Node* get_state_from_sha5_object(Node *sha_object); + bool inline_digestBase_implCompressMB(Node* digestBaseObj, ciInstanceKlass* instklass, + bool long_state, address stubAddr, const char *stubName, + Node* src_start, Node* ofs, Node* limit); + Node* get_state_from_digest_object(Node *digestBase_object); + Node* get_long_state_from_digest_object(Node *digestBase_object); Node* inline_digestBase_implCompressMB_predicate(int predicate); bool inline_encodeISOArray(); bool inline_updateCRC32(); @@ -826,10 +826,11 @@ bool LibraryCallKit::try_to_inline(int predicate) { case vmIntrinsics::_counterMode_AESCrypt: return inline_counterMode_AESCrypt(intrinsic_id()); + case vmIntrinsics::_md5_implCompress: case vmIntrinsics::_sha_implCompress: case vmIntrinsics::_sha2_implCompress: case vmIntrinsics::_sha5_implCompress: - return inline_sha_implCompress(intrinsic_id()); + return inline_digestBase_implCompress(intrinsic_id()); case vmIntrinsics::_digestBase_implCompressMB: return inline_digestBase_implCompressMB(predicate); @@ -6412,7 +6413,10 @@ bool LibraryCallKit::inline_base64_encodeBlock() { return true; } -//------------------------------inline_sha_implCompress----------------------- +//------------------------------inline_digestBase_implCompress----------------------- +// +// Calculate MD5 for single-block byte[] array. +// void com.sun.security.provider.MD5.implCompress(byte[] buf, int ofs) // // Calculate SHA (i.e., SHA-1) for single-block byte[] array. // void com.sun.security.provider.SHA.implCompress(byte[] buf, int ofs) @@ -6423,12 +6427,12 @@ bool LibraryCallKit::inline_base64_encodeBlock() { // Calculate SHA5 (i.e., SHA-384 or SHA-512) for single-block byte[] array. // void com.sun.security.provider.SHA5.implCompress(byte[] buf, int ofs) // -bool LibraryCallKit::inline_sha_implCompress(vmIntrinsics::ID id) { +bool LibraryCallKit::inline_digestBase_implCompress(vmIntrinsics::ID id) { assert(callee()->signature()->size() == 2, "sha_implCompress has 2 parameters"); - Node* sha_obj = argument(0); - Node* src = argument(1); // type oop - Node* ofs = argument(2); // type int + Node* digestBase_obj = argument(0); + Node* src = argument(1); // type oop + Node* ofs = argument(2); // type int const Type* src_type = src->Value(&_gvn); const TypeAryPtr* top_src = src_type->isa_aryptr(); @@ -6449,21 +6453,27 @@ bool LibraryCallKit::inline_sha_implCompress(vmIntrinsics::ID id) { const char *stubName; switch(id) { + case vmIntrinsics::_md5_implCompress: + assert(UseMD5Intrinsics, "need MD5 instruction support"); + state = get_state_from_digest_object(digestBase_obj); + stubAddr = StubRoutines::md5_implCompress(); + stubName = "md5_implCompress"; + break; case vmIntrinsics::_sha_implCompress: assert(UseSHA1Intrinsics, "need SHA1 instruction support"); - state = get_state_from_sha_object(sha_obj); + state = get_state_from_digest_object(digestBase_obj); stubAddr = StubRoutines::sha1_implCompress(); stubName = "sha1_implCompress"; break; case vmIntrinsics::_sha2_implCompress: assert(UseSHA256Intrinsics, "need SHA256 instruction support"); - state = get_state_from_sha_object(sha_obj); + state = get_state_from_digest_object(digestBase_obj); stubAddr = StubRoutines::sha256_implCompress(); stubName = "sha256_implCompress"; break; case vmIntrinsics::_sha5_implCompress: assert(UseSHA512Intrinsics, "need SHA512 instruction support"); - state = get_state_from_sha5_object(sha_obj); + state = get_long_state_from_digest_object(digestBase_obj); stubAddr = StubRoutines::sha512_implCompress(); stubName = "sha512_implCompress"; break; @@ -6477,7 +6487,7 @@ bool LibraryCallKit::inline_sha_implCompress(vmIntrinsics::ID id) { if (stubAddr == NULL) return false; // Call the stub. - Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::sha_implCompress_Type(), + Node* call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::digestBase_implCompress_Type(), stubAddr, stubName, TypePtr::BOTTOM, src_start, state); @@ -6486,13 +6496,13 @@ bool LibraryCallKit::inline_sha_implCompress(vmIntrinsics::ID id) { //------------------------------inline_digestBase_implCompressMB----------------------- // -// Calculate SHA/SHA2/SHA5 for multi-block byte[] array. +// Calculate MD5/SHA/SHA2/SHA5 for multi-block byte[] array. // int com.sun.security.provider.DigestBase.implCompressMultiBlock(byte[] b, int ofs, int limit) // bool LibraryCallKit::inline_digestBase_implCompressMB(int predicate) { - assert(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics, - "need SHA1/SHA256/SHA512 instruction support"); - assert((uint)predicate < 3, "sanity"); + assert(UseMD5Intrinsics || UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics, + "need MD5/SHA1/SHA256/SHA512 instruction support"); + assert((uint)predicate < 4, "sanity"); assert(callee()->signature()->size() == 3, "digestBase_implCompressMB has 3 parameters"); Node* digestBase_obj = argument(0); // The receiver was checked for NULL already. @@ -6515,38 +6525,45 @@ bool LibraryCallKit::inline_digestBase_implCompressMB(int predicate) { src = must_be_not_null(src, false); Node* src_start = array_element_address(src, ofs, src_elem); - const char* klass_SHA_name = NULL; + const char* klass_digestBase_name = NULL; const char* stub_name = NULL; address stub_addr = NULL; bool long_state = false; switch (predicate) { case 0: + if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_md5_implCompress)) { + klass_digestBase_name = "sun/security/provider/MD5"; + stub_name = "md5_implCompressMB"; + stub_addr = StubRoutines::md5_implCompressMB(); + } + break; + case 1: if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_sha_implCompress)) { - klass_SHA_name = "sun/security/provider/SHA"; + klass_digestBase_name = "sun/security/provider/SHA"; stub_name = "sha1_implCompressMB"; stub_addr = StubRoutines::sha1_implCompressMB(); } break; - case 1: + case 2: if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_sha2_implCompress)) { - klass_SHA_name = "sun/security/provider/SHA2"; + klass_digestBase_name = "sun/security/provider/SHA2"; stub_name = "sha256_implCompressMB"; stub_addr = StubRoutines::sha256_implCompressMB(); } break; - case 2: + case 3: if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_sha5_implCompress)) { - klass_SHA_name = "sun/security/provider/SHA5"; + klass_digestBase_name = "sun/security/provider/SHA5"; stub_name = "sha512_implCompressMB"; stub_addr = StubRoutines::sha512_implCompressMB(); long_state = true; } break; default: - fatal("unknown SHA intrinsic predicate: %d", predicate); + fatal("unknown DigestBase intrinsic predicate: %d", predicate); } - if (klass_SHA_name != NULL) { + if (klass_digestBase_name != NULL) { assert(stub_addr != NULL, "Stub is generated"); if (stub_addr == NULL) return false; @@ -6555,27 +6572,28 @@ bool LibraryCallKit::inline_digestBase_implCompressMB(int predicate) { assert(tinst != NULL, "digestBase_obj is not instance???"); assert(tinst->klass()->is_loaded(), "DigestBase is not loaded"); - ciKlass* klass_SHA = tinst->klass()->as_instance_klass()->find_klass(ciSymbol::make(klass_SHA_name)); - assert(klass_SHA->is_loaded(), "predicate checks that this class is loaded"); - ciInstanceKlass* instklass_SHA = klass_SHA->as_instance_klass(); - return inline_sha_implCompressMB(digestBase_obj, instklass_SHA, long_state, stub_addr, stub_name, src_start, ofs, limit); + ciKlass* klass_digestBase = tinst->klass()->as_instance_klass()->find_klass(ciSymbol::make(klass_digestBase_name)); + assert(klass_digestBase->is_loaded(), "predicate checks that this class is loaded"); + ciInstanceKlass* instklass_digestBase = klass_digestBase->as_instance_klass(); + return inline_digestBase_implCompressMB(digestBase_obj, instklass_digestBase, long_state, stub_addr, stub_name, src_start, ofs, limit); } return false; } -//------------------------------inline_sha_implCompressMB----------------------- -bool LibraryCallKit::inline_sha_implCompressMB(Node* digestBase_obj, ciInstanceKlass* instklass_SHA, - bool long_state, address stubAddr, const char *stubName, - Node* src_start, Node* ofs, Node* limit) { - const TypeKlassPtr* aklass = TypeKlassPtr::make(instklass_SHA); + +//------------------------------inline_digestBase_implCompressMB----------------------- +bool LibraryCallKit::inline_digestBase_implCompressMB(Node* digestBase_obj, ciInstanceKlass* instklass_digestBase, + bool long_state, address stubAddr, const char *stubName, + Node* src_start, Node* ofs, Node* limit) { + const TypeKlassPtr* aklass = TypeKlassPtr::make(instklass_digestBase); const TypeOopPtr* xtype = aklass->as_instance_type(); - Node* sha_obj = new CheckCastPPNode(control(), digestBase_obj, xtype); - sha_obj = _gvn.transform(sha_obj); + Node* digest_obj = new CheckCastPPNode(control(), digestBase_obj, xtype); + digest_obj = _gvn.transform(digest_obj); Node* state; if (long_state) { - state = get_state_from_sha5_object(sha_obj); + state = get_long_state_from_digest_object(digest_obj); } else { - state = get_state_from_sha_object(sha_obj); + state = get_state_from_digest_object(digest_obj); } if (state == NULL) return false; @@ -6591,37 +6609,37 @@ bool LibraryCallKit::inline_sha_implCompressMB(Node* digestBase_obj, ciInstanceK return true; } -//------------------------------get_state_from_sha_object----------------------- -Node * LibraryCallKit::get_state_from_sha_object(Node *sha_object) { - Node* sha_state = load_field_from_object(sha_object, "state", "[I", /*is_exact*/ false); - assert (sha_state != NULL, "wrong version of sun.security.provider.SHA/SHA2"); - if (sha_state == NULL) return (Node *) NULL; +//------------------------------get_state_from_digest_object----------------------- +Node * LibraryCallKit::get_state_from_digest_object(Node *digest_object) { + Node* digest_state = load_field_from_object(digest_object, "state", "[I", /*is_exact*/ false); + assert (digest_state != NULL, "wrong version of sun.security.provider.MD5/SHA/SHA2"); + if (digest_state == NULL) return (Node *) NULL; // now have the array, need to get the start address of the state array - Node* state = array_element_address(sha_state, intcon(0), T_INT); + Node* state = array_element_address(digest_state, intcon(0), T_INT); return state; } -//------------------------------get_state_from_sha5_object----------------------- -Node * LibraryCallKit::get_state_from_sha5_object(Node *sha_object) { - Node* sha_state = load_field_from_object(sha_object, "state", "[J", /*is_exact*/ false); - assert (sha_state != NULL, "wrong version of sun.security.provider.SHA5"); - if (sha_state == NULL) return (Node *) NULL; +//------------------------------get_long_state_from_digest_object----------------------- +Node * LibraryCallKit::get_long_state_from_digest_object(Node *digest_object) { + Node* digest_state = load_field_from_object(digest_object, "state", "[J", /*is_exact*/ false); + assert (digest_state != NULL, "wrong version of sun.security.provider.SHA5"); + if (digest_state == NULL) return (Node *) NULL; // now have the array, need to get the start address of the state array - Node* state = array_element_address(sha_state, intcon(0), T_LONG); + Node* state = array_element_address(digest_state, intcon(0), T_LONG); return state; } //----------------------------inline_digestBase_implCompressMB_predicate---------------------------- // Return node representing slow path of predicate check. // the pseudo code we want to emulate with this predicate is: -// if (digestBaseObj instanceof SHA/SHA2/SHA5) do_intrinsic, else do_javapath +// if (digestBaseObj instanceof MD5/SHA/SHA2/SHA5) do_intrinsic, else do_javapath // Node* LibraryCallKit::inline_digestBase_implCompressMB_predicate(int predicate) { - assert(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics, - "need SHA1/SHA256/SHA512 instruction support"); - assert((uint)predicate < 3, "sanity"); + assert(UseMD5Intrinsics || UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics, + "need MD5/SHA1/SHA256/SHA512 instruction support"); + assert((uint)predicate < 4, "sanity"); // The receiver was checked for NULL already. Node* digestBaseObj = argument(0); @@ -6631,44 +6649,50 @@ Node* LibraryCallKit::inline_digestBase_implCompressMB_predicate(int predicate) assert(tinst != NULL, "digestBaseObj is null"); assert(tinst->klass()->is_loaded(), "DigestBase is not loaded"); - const char* klass_SHA_name = NULL; + const char* klass_name = NULL; switch (predicate) { case 0: - if (UseSHA1Intrinsics) { - // we want to do an instanceof comparison against the SHA class - klass_SHA_name = "sun/security/provider/SHA"; + if (UseMD5Intrinsics) { + // we want to do an instanceof comparison against the MD5 class + klass_name = "sun/security/provider/MD5"; } break; case 1: - if (UseSHA256Intrinsics) { - // we want to do an instanceof comparison against the SHA2 class - klass_SHA_name = "sun/security/provider/SHA2"; + if (UseSHA1Intrinsics) { + // we want to do an instanceof comparison against the SHA class + klass_name = "sun/security/provider/SHA"; } break; case 2: + if (UseSHA256Intrinsics) { + // we want to do an instanceof comparison against the SHA2 class + klass_name = "sun/security/provider/SHA2"; + } + break; + case 3: if (UseSHA512Intrinsics) { // we want to do an instanceof comparison against the SHA5 class - klass_SHA_name = "sun/security/provider/SHA5"; + klass_name = "sun/security/provider/SHA5"; } break; default: fatal("unknown SHA intrinsic predicate: %d", predicate); } - ciKlass* klass_SHA = NULL; - if (klass_SHA_name != NULL) { - klass_SHA = tinst->klass()->as_instance_klass()->find_klass(ciSymbol::make(klass_SHA_name)); + ciKlass* klass = NULL; + if (klass_name != NULL) { + klass = tinst->klass()->as_instance_klass()->find_klass(ciSymbol::make(klass_name)); } - if ((klass_SHA == NULL) || !klass_SHA->is_loaded()) { - // if none of SHA/SHA2/SHA5 is loaded, we never take the intrinsic fast path + if ((klass == NULL) || !klass->is_loaded()) { + // if none of MD5/SHA/SHA2/SHA5 is loaded, we never take the intrinsic fast path Node* ctrl = control(); set_control(top()); // no intrinsic path return ctrl; } - ciInstanceKlass* instklass_SHA = klass_SHA->as_instance_klass(); + ciInstanceKlass* instklass = klass->as_instance_klass(); - Node* instofSHA = gen_instanceof(digestBaseObj, makecon(TypeKlassPtr::make(instklass_SHA))); - Node* cmp_instof = _gvn.transform(new CmpINode(instofSHA, intcon(1))); + Node* instof = gen_instanceof(digestBaseObj, makecon(TypeKlassPtr::make(instklass))); + Node* cmp_instof = _gvn.transform(new CmpINode(instof, intcon(1))); Node* bool_instof = _gvn.transform(new BoolNode(cmp_instof, BoolTest::ne)); Node* instof_false = generate_guard(bool_instof, NULL, PROB_MIN); diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp index a5928ae3178..fa84e3bd0b2 100644 --- a/src/hotspot/share/opto/runtime.cpp +++ b/src/hotspot/share/opto/runtime.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -960,7 +960,7 @@ const TypeFunc* OptoRuntime::counterMode_aescrypt_Type() { /* * void implCompress(byte[] buf, int ofs) */ -const TypeFunc* OptoRuntime::sha_implCompress_Type() { +const TypeFunc* OptoRuntime::digestBase_implCompress_Type() { // create input type (domain) int num_args = 2; int argcnt = num_args; diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp index c4c62538d67..c0985c6958a 100644 --- a/src/hotspot/share/opto/runtime.hpp +++ b/src/hotspot/share/opto/runtime.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -278,7 +278,7 @@ private: static const TypeFunc* electronicCodeBook_aescrypt_Type(); static const TypeFunc* counterMode_aescrypt_Type(); - static const TypeFunc* sha_implCompress_Type(); + static const TypeFunc* digestBase_implCompress_Type(); static const TypeFunc* digestBase_implCompressMB_Type(); static const TypeFunc* multiplyToLen_Type(); diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index b540f74286d..1a1b11cc009 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -323,6 +323,9 @@ const size_t minimumSymbolTableSize = 1024; diagnostic(bool, UseAESCTRIntrinsics, false, \ "Use intrinsics for the paralleled version of AES/CTR crypto") \ \ + diagnostic(bool, UseMD5Intrinsics, false, \ + "Use intrinsics for MD5 crypto hash function") \ + \ diagnostic(bool, UseSHA1Intrinsics, false, \ "Use intrinsics for SHA-1 crypto hash function. " \ "Requires that UseSHA is enabled.") \ diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp index 5823106f3ef..5fd47ff57ac 100644 --- a/src/hotspot/share/runtime/stubRoutines.cpp +++ b/src/hotspot/share/runtime/stubRoutines.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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 @@ -138,6 +138,8 @@ address StubRoutines::_counterMode_AESCrypt = NULL; address StubRoutines::_ghash_processBlocks = NULL; address StubRoutines::_base64_encodeBlock = NULL; +address StubRoutines::_md5_implCompress = NULL; +address StubRoutines::_md5_implCompressMB = NULL; address StubRoutines::_sha1_implCompress = NULL; address StubRoutines::_sha1_implCompressMB = NULL; address StubRoutines::_sha256_implCompress = NULL; diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp index 5b7aa2bcf93..6af4caaaa14 100644 --- a/src/hotspot/share/runtime/stubRoutines.hpp +++ b/src/hotspot/share/runtime/stubRoutines.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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 @@ -220,6 +220,8 @@ class StubRoutines: AllStatic { static address _ghash_processBlocks; static address _base64_encodeBlock; + static address _md5_implCompress; + static address _md5_implCompressMB; static address _sha1_implCompress; static address _sha1_implCompressMB; static address _sha256_implCompress; @@ -397,6 +399,8 @@ class StubRoutines: AllStatic { static address counterMode_AESCrypt() { return _counterMode_AESCrypt; } static address ghash_processBlocks() { return _ghash_processBlocks; } static address base64_encodeBlock() { return _base64_encodeBlock; } + static address md5_implCompress() { return _md5_implCompress; } + static address md5_implCompressMB() { return _md5_implCompressMB; } static address sha1_implCompress() { return _sha1_implCompress; } static address sha1_implCompressMB() { return _sha1_implCompressMB; } static address sha256_implCompress() { return _sha256_implCompress; } diff --git a/src/java.base/share/classes/sun/security/provider/MD5.java b/src/java.base/share/classes/sun/security/provider/MD5.java index c168ace71a3..497e0286cf5 100644 --- a/src/java.base/share/classes/sun/security/provider/MD5.java +++ b/src/java.base/share/classes/sun/security/provider/MD5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, 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,8 +26,10 @@ package sun.security.provider; import java.util.Arrays; +import java.util.Objects; import static sun.security.provider.ByteArrayAccess.*; +import jdk.internal.HotSpotIntrinsicCandidate; /** * The MD5 class is used to compute an MD5 message digest over a given @@ -147,8 +149,27 @@ public final class MD5 extends DigestBase { * bytes from the buffer, beginning at the specified offset. */ void implCompress(byte[] buf, int ofs) { - b2iLittle64(buf, ofs, x); + implCompressCheck(buf, ofs); + implCompress0(buf, ofs); + } + private void implCompressCheck(byte[] buf, int ofs) { + Objects.requireNonNull(buf); + + // The checks performed by the method 'b2iBig64' + // are sufficient for the case when the method + // 'implCompressImpl' is replaced with a compiler + // intrinsic. + b2iLittle64(buf, ofs, x); + } + + // The method 'implCompress0 seems not to use its parameters. + // The method can, however, be replaced with a compiler intrinsic + // that operates directly on the array 'buf' (starting from + // offset 'ofs') and not on array 'x', therefore 'buf' and 'ofs' + // must be passed as parameter to the method. + @HotSpotIntrinsicCandidate + void implCompress0(byte[] buf, int ofs) { int a = state[0]; int b = state[1]; int c = state[2]; diff --git a/src/java.base/share/classes/sun/security/provider/SHA.java b/src/java.base/share/classes/sun/security/provider/SHA.java index 1eaeaa4ffc3..1dbbb45f131 100644 --- a/src/java.base/share/classes/sun/security/provider/SHA.java +++ b/src/java.base/share/classes/sun/security/provider/SHA.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, 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 @@ -134,12 +134,12 @@ public final class SHA extends DigestBase { // The checks performed by the method 'b2iBig64' // are sufficient for the case when the method - // 'implCompressImpl' is replaced with a compiler + // 'implCompress0' is replaced with a compiler // intrinsic. b2iBig64(buf, ofs, W); } - // The method 'implCompressImpl seems not to use its parameters. + // The method 'implCompress0 seems not to use its parameters. // The method can, however, be replaced with a compiler intrinsic // that operates directly on the array 'buf' (starting from // offset 'ofs') and not on array 'W', therefore 'buf' and 'ofs' diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java index c1302421d6f..6d2fdbdbf81 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java @@ -423,6 +423,11 @@ public class CheckGraalIntrinsics extends GraalTest { "java/math/BigInteger.shiftRightImplWorker([I[IIII)V"); } + if (isJDK16OrHigher()) { + add(toBeInvestigated, + "sun/security/provider/MD5.implCompress0([BI)V"); + } + if (!config.inlineNotify()) { add(ignore, "java/lang/Object.notify()V"); } @@ -593,6 +598,14 @@ public class CheckGraalIntrinsics extends GraalTest { return JavaVersionUtil.JAVA_SPEC >= 14; } + private static boolean isJDK15OrHigher() { + return JavaVersionUtil.JAVA_SPEC >= 15; + } + + private static boolean isJDK16OrHigher() { + return JavaVersionUtil.JAVA_SPEC >= 16; + } + public interface Refiner { void refine(CheckGraalIntrinsics checker); } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/TestSHA.java b/test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java similarity index 71% rename from test/hotspot/jtreg/compiler/intrinsics/sha/TestSHA.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java index 5ecb7a255f9..4801c3c43fa 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/TestSHA.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,56 +24,62 @@ /** * @test * @bug 8035968 - * @summary C2 support for SHA on SPARC + * @summary C2 support for MD5/SHA-1/SHA-224/SHA-256/SHA-384/SHA-512 * * @run main/othervm/timeout=600 -Xbatch + * -Dalgorithm=MD5 + * compiler.intrinsics.sha.TestDigest + * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-224 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-256 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-384 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-512 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * * @run main/othervm/timeout=600 -Xbatch + * -Dalgorithm=MD5 -Doffset=1 + * compiler.intrinsics.sha.TestDigest + * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-1 -Doffset=1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-224 -Doffset=1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-256 -Doffset=1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-384 -Doffset=1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-512 -Doffset=1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-1 -Dalgorithm2=SHA-256 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-1 -Dalgorithm2=SHA-512 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-256 -Dalgorithm2=SHA-512 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=SHA-1 -Dalgorithm2=MD5 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest * @run main/othervm/timeout=600 -Xbatch * -Dalgorithm=MD5 -Dalgorithm2=SHA-1 - * compiler.intrinsics.sha.TestSHA + * compiler.intrinsics.sha.TestDigest */ package compiler.intrinsics.sha; @@ -81,7 +87,7 @@ package compiler.intrinsics.sha; import java.security.MessageDigest; import java.util.Arrays; -public class TestSHA { +public class TestDigest { private static final int HASH_LEN = 64; /* up to 512-bit */ private static final int ALIGN = 8; /* for different data alignments */ @@ -94,14 +100,14 @@ public class TestSHA { int iters = (args.length > 0 ? Integer.valueOf(args[0]) : 100000); int warmupIters = (args.length > 1 ? Integer.valueOf(args[1]) : 20000); - testSHA(provider, algorithm, msgSize, offset, iters, warmupIters); + testDigest(provider, algorithm, msgSize, offset, iters, warmupIters); if (algorithm2.equals("") == false) { - testSHA(provider, algorithm2, msgSize, offset, iters, warmupIters); + testDigest(provider, algorithm2, msgSize, offset, iters, warmupIters); } } - public static void testSHA(String provider, String algorithm, int msgSize, + public static void testDigest(String provider, String algorithm, int msgSize, int offset, int iters, int warmupIters) throws Exception { System.out.println("provider = " + provider); System.out.println("algorithm = " + algorithm); @@ -117,27 +123,27 @@ public class TestSHA { } try { - MessageDigest sha = MessageDigest.getInstance(algorithm, provider); + MessageDigest digest = MessageDigest.getInstance(algorithm, provider); /* do once, which doesn't use intrinsics */ - sha.reset(); - sha.update(data, offset, msgSize); - expectedHash = sha.digest(); + digest.reset(); + digest.update(data, offset, msgSize); + expectedHash = digest.digest(); /* warm up */ for (int i = 0; i < warmupIters; i++) { - sha.reset(); - sha.update(data, offset, msgSize); - hash = sha.digest(); + digest.reset(); + digest.update(data, offset, msgSize); + hash = digest.digest(); } /* check result */ if (Arrays.equals(hash, expectedHash) == false) { - System.out.println("TestSHA Error: "); + System.out.println("TestDigest Error: "); showArray(expectedHash, "expectedHash"); showArray(hash, "computedHash"); //System.exit(1); - throw new Exception("TestSHA Error"); + throw new Exception("TestDigest Error"); } else { showArray(hash, "hash"); } @@ -145,15 +151,15 @@ public class TestSHA { /* measure performance */ long start = System.nanoTime(); for (int i = 0; i < iters; i++) { - sha.reset(); - sha.update(data, offset, msgSize); - hash = sha.digest(); + digest.reset(); + digest.update(data, offset, msgSize); + hash = digest.digest(); } long end = System.nanoTime(); double total = (double)(end - start)/1e9; /* in seconds */ double thruput = (double)msgSize*iters/1e6/total; /* in MB/s */ - System.out.println("TestSHA runtime = " + total + " seconds"); - System.out.println("TestSHA throughput = " + thruput + " MB/s"); + System.out.println("TestDigest runtime = " + total + " seconds"); + System.out.println("TestDigest throughput = " + thruput + " MB/s"); System.out.println(); } catch (Exception e) { System.out.println("Exception: " + e); diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/SHAOptionsBase.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java similarity index 79% rename from test/hotspot/jtreg/compiler/intrinsics/sha/cli/SHAOptionsBase.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java index 22d027e80a1..04a1f311cec 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/SHAOptionsBase.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -35,7 +35,9 @@ import java.util.function.BooleanSupplier; * Instead of using huge complex tests for each option, each test is constructed * from several test cases shared among different tests. */ -public class SHAOptionsBase extends CommandLineOptionTest { +public class DigestOptionsBase extends CommandLineOptionTest { + public static final String USE_MD5_INTRINSICS_OPTION + = "UseMD5Intrinsics"; public static final String USE_SHA_OPTION = "UseSHA"; public static final String USE_SHA1_INTRINSICS_OPTION = "UseSHA1Intrinsics"; @@ -52,6 +54,8 @@ public class SHAOptionsBase extends CommandLineOptionTest { // Note that strings below will be passed to // CommandLineOptionTest.verifySameJVMStartup and thus are regular // expressions, not just a plain strings. + protected static final String MD5_INTRINSICS_ARE_NOT_AVAILABLE + = "Intrinsics for MD5 crypto hash functions not available on this CPU."; protected static final String SHA_INSTRUCTIONS_ARE_NOT_AVAILABLE = "SHA instructions are not available on this CPU"; protected static final String SHA1_INTRINSICS_ARE_NOT_AVAILABLE @@ -75,14 +79,16 @@ public class SHAOptionsBase extends CommandLineOptionTest { */ public static String getWarningForUnsupportedCPU(String optionName) { switch (optionName) { - case SHAOptionsBase.USE_SHA_OPTION: - return SHAOptionsBase.SHA_INSTRUCTIONS_ARE_NOT_AVAILABLE; - case SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION: - return SHAOptionsBase.SHA1_INTRINSICS_ARE_NOT_AVAILABLE; - case SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION: - return SHAOptionsBase.SHA256_INTRINSICS_ARE_NOT_AVAILABLE; - case SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION: - return SHAOptionsBase.SHA512_INTRINSICS_ARE_NOT_AVAILABLE; + case DigestOptionsBase.USE_MD5_INTRINSICS_OPTION: + return DigestOptionsBase.MD5_INTRINSICS_ARE_NOT_AVAILABLE; + case DigestOptionsBase.USE_SHA_OPTION: + return DigestOptionsBase.SHA_INSTRUCTIONS_ARE_NOT_AVAILABLE; + case DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION: + return DigestOptionsBase.SHA1_INTRINSICS_ARE_NOT_AVAILABLE; + case DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION: + return DigestOptionsBase.SHA256_INTRINSICS_ARE_NOT_AVAILABLE; + case DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION: + return DigestOptionsBase.SHA512_INTRINSICS_ARE_NOT_AVAILABLE; default: throw new Error("Unexpected option " + optionName); } @@ -99,20 +105,22 @@ public class SHAOptionsBase extends CommandLineOptionTest { */ public static BooleanSupplier getPredicateForOption(String optionName) { switch (optionName) { - case SHAOptionsBase.USE_SHA_OPTION: + case DigestOptionsBase.USE_MD5_INTRINSICS_OPTION: + return IntrinsicPredicates.MD5_INSTRUCTION_AVAILABLE; + case DigestOptionsBase.USE_SHA_OPTION: return IntrinsicPredicates.ANY_SHA_INSTRUCTION_AVAILABLE; - case SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION: + case DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION: return IntrinsicPredicates.SHA1_INSTRUCTION_AVAILABLE; - case SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION: + case DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION: return IntrinsicPredicates.SHA256_INSTRUCTION_AVAILABLE; - case SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION: + case DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION: return IntrinsicPredicates.SHA512_INSTRUCTION_AVAILABLE; default: throw new Error("Unexpected option " + optionName); } } - public SHAOptionsBase(TestCase... testCases) { + public DigestOptionsBase(TestCase... testCases) { super(Boolean.TRUE::booleanValue); this.testCases = testCases; } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java new file mode 100644 index 00000000000..47a1dcba814 --- /dev/null +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8035968 + * @summary Verify UseMD5Intrinsics option processing on supported CPU. + * @library /test/lib testcases / + * @modules java.base/jdk.internal.misc + * java.management + * + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI + * compiler.intrinsics.sha.cli.TestUseMD5IntrinsicsOptionOnSupportedCPU + */ + +package compiler.intrinsics.sha.cli; + +import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForSupportedCPU; + +public class TestUseMD5IntrinsicsOptionOnSupportedCPU { + public static void main(String args[]) throws Throwable { + new DigestOptionsBase(new GenericTestCaseForSupportedCPU( + DigestOptionsBase.USE_MD5_INTRINSICS_OPTION, /* checkUseSHA = */ false)).test(); + } +} diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java new file mode 100644 index 00000000000..719c5790f2b --- /dev/null +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnUnsupportedCPU.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8035968 + * @summary Verify UseMD5Intrinsics option processing on unsupported CPU. + * @library /test/lib testcases / + * @modules java.base/jdk.internal.misc + * java.management + * + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI + * compiler.intrinsics.sha.cli.TestUseMD5IntrinsicsOptionOnUnsupportedCPU + */ + +package compiler.intrinsics.sha.cli; + +import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForOtherCPU; +import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedAArch64CPU; +import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForUnsupportedX86CPU; +import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU; + +public class TestUseMD5IntrinsicsOptionOnUnsupportedCPU { + public static void main(String args[]) throws Throwable { + new DigestOptionsBase( + new GenericTestCaseForUnsupportedX86CPU( + DigestOptionsBase.USE_MD5_INTRINSICS_OPTION, /* checkUseSHA = */ false), + new GenericTestCaseForUnsupportedAArch64CPU( + DigestOptionsBase.USE_MD5_INTRINSICS_OPTION, /* checkUseSHA = */ false), + new GenericTestCaseForOtherCPU( + DigestOptionsBase.USE_MD5_INTRINSICS_OPTION, /* checkUseSHA = */ false)).test(); + } +} diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java index 5662b970c95..0542966f15d 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java @@ -42,7 +42,7 @@ import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForSupportedCPU; public class TestUseSHA1IntrinsicsOptionOnSupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase(new GenericTestCaseForSupportedCPU( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION)).test(); + new DigestOptionsBase(new GenericTestCaseForSupportedCPU( + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java index a92c2e47eb4..6f6c484d430 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java @@ -45,14 +45,14 @@ import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseFor public class TestUseSHA1IntrinsicsOptionOnUnsupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase( + new DigestOptionsBase( new GenericTestCaseForUnsupportedX86CPU( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION), new GenericTestCaseForUnsupportedAArch64CPU( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION), new UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION), new GenericTestCaseForOtherCPU( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION)).test(); + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java index 26e20400349..e30793afcf2 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java @@ -42,7 +42,7 @@ import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForSupportedCPU; public class TestUseSHA256IntrinsicsOptionOnSupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase(new GenericTestCaseForSupportedCPU( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION)).test(); + new DigestOptionsBase(new GenericTestCaseForSupportedCPU( + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java index c896ccce34b..b3c40580373 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java @@ -45,14 +45,14 @@ import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseFor public class TestUseSHA256IntrinsicsOptionOnUnsupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase( + new DigestOptionsBase( new GenericTestCaseForUnsupportedX86CPU( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION), new GenericTestCaseForUnsupportedAArch64CPU( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION), new UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION), new GenericTestCaseForOtherCPU( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION)).test(); + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java index 222a48f46cd..857c1276feb 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java @@ -42,7 +42,7 @@ import compiler.intrinsics.sha.cli.testcases.GenericTestCaseForSupportedCPU; public class TestUseSHA512IntrinsicsOptionOnSupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase(new GenericTestCaseForSupportedCPU( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION)).test(); + new DigestOptionsBase(new GenericTestCaseForSupportedCPU( + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java index 83881d0b171..500b608641c 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java @@ -45,14 +45,14 @@ import compiler.intrinsics.sha.cli.testcases.UseSHAIntrinsicsSpecificTestCaseFor public class TestUseSHA512IntrinsicsOptionOnUnsupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase( + new DigestOptionsBase( new GenericTestCaseForUnsupportedX86CPU( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION), new GenericTestCaseForUnsupportedAArch64CPU( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION), new UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION), + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION), new GenericTestCaseForOtherCPU( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION)).test(); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java index 102ad506cd9..23d37cce1a1 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java @@ -43,10 +43,10 @@ import compiler.intrinsics.sha.cli.testcases.UseSHASpecificTestCaseForSupportedC public class TestUseSHAOptionOnSupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase( + new DigestOptionsBase( new GenericTestCaseForSupportedCPU( - SHAOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.USE_SHA_OPTION), new UseSHASpecificTestCaseForSupportedCPU( - SHAOptionsBase.USE_SHA_OPTION)).test(); + DigestOptionsBase.USE_SHA_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java index bcc40cd357e..1f343756583 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java @@ -44,14 +44,14 @@ import compiler.intrinsics.sha.cli.testcases.UseSHASpecificTestCaseForUnsupporte public class TestUseSHAOptionOnUnsupportedCPU { public static void main(String args[]) throws Throwable { - new SHAOptionsBase( + new DigestOptionsBase( new GenericTestCaseForUnsupportedX86CPU( - SHAOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.USE_SHA_OPTION), new GenericTestCaseForUnsupportedAArch64CPU( - SHAOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.USE_SHA_OPTION), new UseSHASpecificTestCaseForUnsupportedCPU( - SHAOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.USE_SHA_OPTION), new GenericTestCaseForOtherCPU( - SHAOptionsBase.USE_SHA_OPTION)).test(); + DigestOptionsBase.USE_SHA_OPTION)).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java index 157e9dc200b..2b8d143dd68 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java @@ -23,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; @@ -35,8 +35,15 @@ import jdk.test.lib.cli.predicate.OrPredicate; * AArch64, PPC, S390x, and X86. */ public class GenericTestCaseForOtherCPU extends - SHAOptionsBase.TestCase { + DigestOptionsBase.TestCase { + + final private boolean checkUseSHA; + public GenericTestCaseForOtherCPU(String optionName) { + this(optionName, true); + } + + public GenericTestCaseForOtherCPU(String optionName, boolean checkUseSHA) { // Execute the test case on any CPU except AArch64, PPC, S390x, and X86. super(optionName, new NotPredicate( new OrPredicate(Platform::isAArch64, @@ -44,6 +51,8 @@ public class GenericTestCaseForOtherCPU extends new OrPredicate(Platform::isPPC, new OrPredicate(Platform::isX64, Platform::isX86)))))); + + this.checkUseSHA = checkUseSHA; } @Override @@ -55,13 +64,13 @@ public class GenericTestCaseForOtherCPU extends CommandLineOptionTest.verifySameJVMStartup(null, new String[] { ".*" + optionName + ".*" }, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); CommandLineOptionTest.verifySameJVMStartup(null, new String[] { ".*" + optionName + ".*" }, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, false)); } @@ -71,24 +80,26 @@ public class GenericTestCaseForOtherCPU extends CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' should be disabled by default", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); // Verify that option is disabled even if it was explicitly enabled // using CLI options. CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' should be off on unsupported " + "CPU even if set to true directly", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); - // Verify that option is disabled when it explicitly disabled - // using CLI options. - CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", - String.format("Option '%s' should be off on unsupported CPU" - + " even if '%s' flag set to JVM", optionName, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag(optionName, false)); + if (checkUseSHA) { + // Verify that option is disabled when it explicitly disabled + // using CLI options. + CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", + String.format("Option '%s' should be off on unsupported CPU" + + " even if '%s' flag set to JVM", optionName, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag(optionName, false)); + } } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java index f158a807aa5..4b3914e75fd 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; @@ -35,9 +35,18 @@ import jdk.test.lib.cli.predicate.OrPredicate; * support instructions required by the tested option. */ public class GenericTestCaseForSupportedCPU extends - SHAOptionsBase.TestCase { + DigestOptionsBase.TestCase { + + final private boolean checkUseSHA; + public GenericTestCaseForSupportedCPU(String optionName) { - super(optionName, SHAOptionsBase.getPredicateForOption(optionName)); + this(optionName, true); + } + + public GenericTestCaseForSupportedCPU(String optionName, boolean checkUseSHA) { + super(optionName, DigestOptionsBase.getPredicateForOption(optionName)); + + this.checkUseSHA = checkUseSHA; } @Override @@ -47,39 +56,41 @@ public class GenericTestCaseForSupportedCPU extends + " '%s' without any warnings", optionName); // Verify that there are no warning when option is explicitly enabled. CommandLineOptionTest.verifySameJVMStartup(null, new String[] { - SHAOptionsBase.getWarningForUnsupportedCPU(optionName) + DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); - // Verify that option could be disabled even if +UseSHA was passed to - // JVM. - CommandLineOptionTest.verifySameJVMStartup(null, new String[] { - SHAOptionsBase.getWarningForUnsupportedCPU(optionName) - }, shouldPassMessage, String.format("It should be able to " - + "disable option '%s' even if %s was passed to JVM", - optionName, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)), - ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true), - CommandLineOptionTest.prepareBooleanFlag(optionName, false)); - - if (!optionName.equals(SHAOptionsBase.USE_SHA_OPTION)) { - // Verify that if -XX:-UseSHA is passed to the JVM, it is not possible - // to enable the tested option and a warning is printed. - CommandLineOptionTest.verifySameJVMStartup( - new String[] { SHAOptionsBase.getWarningForUnsupportedCPU(optionName) }, - null, - shouldPassMessage, - String.format("Enabling option '%s' should not be possible and should result in a warning if %s was passed to JVM", - optionName, - CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false)), + if (checkUseSHA) { + // Verify that option could be disabled even if +UseSHA was passed to + // JVM. + CommandLineOptionTest.verifySameJVMStartup(null, new String[] { + DigestOptionsBase.getWarningForUnsupportedCPU(optionName) + }, shouldPassMessage, String.format("It should be able to " + + "disable option '%s' even if %s was passed to JVM", + optionName, CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)), ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false), - CommandLineOptionTest.prepareBooleanFlag(optionName, true)); + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true), + CommandLineOptionTest.prepareBooleanFlag(optionName, false)); + + if (!optionName.equals(DigestOptionsBase.USE_SHA_OPTION)) { + // Verify that if -XX:-UseSHA is passed to the JVM, it is not possible + // to enable the tested option and a warning is printed. + CommandLineOptionTest.verifySameJVMStartup( + new String[] { DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, + null, + shouldPassMessage, + String.format("Enabling option '%s' should not be possible and should result in a warning if %s was passed to JVM", + optionName, + CommandLineOptionTest.prepareBooleanFlag(DigestOptionsBase.USE_SHA_OPTION, false)), + ExitCode.OK, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag(DigestOptionsBase.USE_SHA_OPTION, false), + CommandLineOptionTest.prepareBooleanFlag(optionName, true)); + } } } @@ -90,43 +101,45 @@ public class GenericTestCaseForSupportedCPU extends CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true", String.format("Option '%s' should be enabled by default", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); // Verify that it is possible to explicitly enable the option. CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true", String.format("Option '%s' was set to have value 'true'", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); // Verify that it is possible to explicitly disable the option. CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' was set to have value 'false'", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, false)); - // verify that option is disabled when -UseSHA was passed to JVM. - CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", - String.format("Option '%s' should have value 'false' when %s" - + " flag set to JVM", optionName, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, false)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag(optionName, true), - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, false)); + if (checkUseSHA) { + // verify that option is disabled when -UseSHA was passed to JVM. + CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", + String.format("Option '%s' should have value 'false' when %s" + + " flag set to JVM", optionName, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, false)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag(optionName, true), + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, false)); - // Verify that it is possible to explicitly disable the tested option - // even if +UseSHA was passed to JVM. - CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", - String.format("Option '%s' should have value 'false' if set so" - + " even if %s flag set to JVM", optionName, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true), - CommandLineOptionTest.prepareBooleanFlag(optionName, false)); + // Verify that it is possible to explicitly disable the tested option + // even if +UseSHA was passed to JVM. + CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", + String.format("Option '%s' should have value 'false' if set so" + + " even if %s flag set to JVM", optionName, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true), + CommandLineOptionTest.prepareBooleanFlag(optionName, false)); + } } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java index 0c8543341d8..4a257c74fc4 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; @@ -35,11 +35,20 @@ import jdk.test.lib.cli.predicate.NotPredicate; * which don't support instruction required by the tested option. */ public class GenericTestCaseForUnsupportedAArch64CPU extends - SHAOptionsBase.TestCase { + DigestOptionsBase.TestCase { + + final private boolean checkUseSHA; + public GenericTestCaseForUnsupportedAArch64CPU(String optionName) { + this(optionName, true); + } + + public GenericTestCaseForUnsupportedAArch64CPU(String optionName, boolean checkUseSHA) { super(optionName, new AndPredicate(Platform::isAArch64, - new NotPredicate(SHAOptionsBase.getPredicateForOption( + new NotPredicate(DigestOptionsBase.getPredicateForOption( optionName)))); + + this.checkUseSHA = checkUseSHA; } @Override @@ -48,27 +57,29 @@ public class GenericTestCaseForUnsupportedAArch64CPU extends + "option '-XX:-%s' without any warnings", optionName); //Verify that option could be disabled without any warnings. CommandLineOptionTest.verifySameJVMStartup(null, new String[] { - SHAOptionsBase.getWarningForUnsupportedCPU(optionName) + DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, false)); - shouldPassMessage = String.format("If JVM is started with '-XX:-" - + "%s' '-XX:+%s', output should contain warning.", - SHAOptionsBase.USE_SHA_OPTION, optionName); + if (checkUseSHA) { + shouldPassMessage = String.format("If JVM is started with '-XX:-" + + "%s' '-XX:+%s', output should contain warning.", + DigestOptionsBase.USE_SHA_OPTION, optionName); - // Verify that when the tested option is enabled, then - // a warning will occur in VM output if UseSHA is disabled. - if (!optionName.equals(SHAOptionsBase.USE_SHA_OPTION)) { - CommandLineOptionTest.verifySameJVMStartup( - new String[] { SHAOptionsBase.getWarningForUnsupportedCPU(optionName) }, - null, - shouldPassMessage, - shouldPassMessage, - ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false), - CommandLineOptionTest.prepareBooleanFlag(optionName, true)); + // Verify that when the tested option is enabled, then + // a warning will occur in VM output if UseSHA is disabled. + if (!optionName.equals(DigestOptionsBase.USE_SHA_OPTION)) { + CommandLineOptionTest.verifySameJVMStartup( + new String[] { DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, + null, + shouldPassMessage, + shouldPassMessage, + ExitCode.OK, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag(DigestOptionsBase.USE_SHA_OPTION, false), + CommandLineOptionTest.prepareBooleanFlag(optionName, true)); + } } } @@ -78,24 +89,26 @@ public class GenericTestCaseForUnsupportedAArch64CPU extends CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' should be disabled by default", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); // Verify that option is disabled even if it was explicitly enabled // using CLI options. CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' should be off on unsupported " + "AArch64CPU even if set to true directly", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); - // Verify that option is disabled when +UseSHA was passed to JVM. - CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", - String.format("Option '%s' should be off on unsupported " - + "AArch64CPU even if %s flag set to JVM", - optionName, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)); + if (checkUseSHA) { + // Verify that option is disabled when +UseSHA was passed to JVM. + CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", + String.format("Option '%s' should be off on unsupported " + + "AArch64CPU even if %s flag set to JVM", + optionName, CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)); + } } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java index 3f94cdf2e6b..27548dd0e27 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; @@ -36,11 +36,20 @@ import jdk.test.lib.cli.predicate.OrPredicate; * support SHA-related instructions. */ public class GenericTestCaseForUnsupportedX86CPU - extends SHAOptionsBase.TestCase { + extends DigestOptionsBase.TestCase { + + final private boolean checkUseSHA; + public GenericTestCaseForUnsupportedX86CPU(String optionName) { + this(optionName, true); + } + + public GenericTestCaseForUnsupportedX86CPU(String optionName, boolean checkUseSHA) { super(optionName, new AndPredicate(new OrPredicate(Platform::isX64, Platform::isX86), - new NotPredicate(SHAOptionsBase.getPredicateForOption( + new NotPredicate(DigestOptionsBase.getPredicateForOption( optionName)))); + + this.checkUseSHA = checkUseSHA; } @Override @@ -50,22 +59,22 @@ public class GenericTestCaseForUnsupportedX86CPU // Verify that the tested option could be explicitly disabled without // a warning. CommandLineOptionTest.verifySameJVMStartup(null, new String[] { - SHAOptionsBase.getWarningForUnsupportedCPU(optionName) + DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, false)); // Verify that when the tested option is enabled, then // a warning will occur in VM output if UseSHA is disabled. - if (!optionName.equals(SHAOptionsBase.USE_SHA_OPTION)) { + if (checkUseSHA && !optionName.equals(DigestOptionsBase.USE_SHA_OPTION)) { CommandLineOptionTest.verifySameJVMStartup( - new String[] { SHAOptionsBase.getWarningForUnsupportedCPU(optionName) }, + new String[] { DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, null, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag(DigestOptionsBase.USE_SHA_OPTION, false), CommandLineOptionTest.prepareBooleanFlag(optionName, true)); } } @@ -76,24 +85,26 @@ public class GenericTestCaseForUnsupportedX86CPU CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' should be disabled by default", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS); // Verify that it is not possible to explicitly enable the option. CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", String.format("Option '%s' should be off on unsupported " + "X86CPU even if set to true directly", optionName), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); - // Verify that the tested option is disabled even if +UseSHA was passed - // to JVM. - CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", - String.format("Option '%s' should be off on unsupported " - + "X86CPU even if %s flag set to JVM", - optionName, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, - CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)); + if (checkUseSHA) { + // Verify that the tested option is disabled even if +UseSHA was passed + // to JVM. + CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false", + String.format("Option '%s' should be off on unsupported " + + "X86CPU even if %s flag set to JVM", + optionName, CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + CommandLineOptionTest.prepareBooleanFlag( + DigestOptionsBase.USE_SHA_OPTION, true)); + } } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java index e77b49672ba..da189e3b626 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import compiler.testlibrary.sha.predicate.IntrinsicPredicates; import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; @@ -41,14 +41,14 @@ import jdk.test.lib.cli.predicate.OrPredicate; * sha512. */ public class UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU - extends SHAOptionsBase.TestCase { + extends DigestOptionsBase.TestCase { public UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU( String optionName) { // execute test case on CPU that supports any sha* instructions, // but does not support sha* instruction required by the tested option. super(optionName, new AndPredicate( IntrinsicPredicates.ANY_SHA_INSTRUCTION_AVAILABLE, - new NotPredicate(SHAOptionsBase.getPredicateForOption(optionName)))); + new NotPredicate(DigestOptionsBase.getPredicateForOption(optionName)))); } @Override protected void verifyWarnings() throws Throwable { @@ -57,9 +57,9 @@ public class UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU optionName); // Verify that attempt to enable the tested option will cause a warning CommandLineOptionTest.verifySameJVMStartup(new String[] { - SHAOptionsBase.getWarningForUnsupportedCPU(optionName) + DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, null, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java index 5559ec5e5e5..8f3add508d6 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import compiler.testlibrary.sha.predicate.IntrinsicPredicates; import jdk.test.lib.Asserts; import jdk.test.lib.process.ExitCode; @@ -36,14 +36,14 @@ import jdk.test.lib.cli.predicate.OrPredicate; * UseSHA specific test case targeted to CPUs which support any sha* instruction. */ public class UseSHASpecificTestCaseForSupportedCPU - extends SHAOptionsBase.TestCase { + extends DigestOptionsBase.TestCase { public UseSHASpecificTestCaseForSupportedCPU(String optionName) { - super(SHAOptionsBase.USE_SHA_OPTION, + super(DigestOptionsBase.USE_SHA_OPTION, IntrinsicPredicates.ANY_SHA_INSTRUCTION_AVAILABLE); - Asserts.assertEQ(optionName, SHAOptionsBase.USE_SHA_OPTION, + Asserts.assertEQ(optionName, DigestOptionsBase.USE_SHA_OPTION, String.format("Test case should be used for '%s' option only.", - SHAOptionsBase.USE_SHA_OPTION)); + DigestOptionsBase.USE_SHA_OPTION)); } @Override @@ -52,21 +52,21 @@ public class UseSHASpecificTestCaseForSupportedCPU + " %s was passed and all UseSHA*Intrinsics options " + "were disabled", CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)); + DigestOptionsBase.USE_SHA_OPTION, true)); // Verify that there will be no warnings when +UseSHA was passed and // all UseSHA*Intrinsics options were disabled. CommandLineOptionTest.verifySameJVMStartup( null, new String[] { ".*UseSHA.*" }, shouldPassMessage, shouldPassMessage, ExitCode.OK, - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true), + DigestOptionsBase.USE_SHA_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, false), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, false), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION, false)); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION, false)); } @Override @@ -74,53 +74,53 @@ public class UseSHASpecificTestCaseForSupportedCPU // Verify that UseSHA is disabled when all UseSHA*Intrinsics are // disabled. CommandLineOptionTest.verifyOptionValueForSameVM( - SHAOptionsBase.USE_SHA_OPTION, "false", String.format( + DigestOptionsBase.USE_SHA_OPTION, "false", String.format( "'%s' option should be disabled when all UseSHA*Intrinsics are" - + " disabled", SHAOptionsBase.USE_SHA_OPTION), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + + " disabled", DigestOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, false), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, false), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION, false)); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION, false)); CommandLineOptionTest.verifyOptionValueForSameVM( // Verify that UseSHA is disabled when all UseSHA*Intrinsics are // disabled even if it was explicitly enabled. - SHAOptionsBase.USE_SHA_OPTION, "false", + DigestOptionsBase.USE_SHA_OPTION, "false", String.format("'%s' option should be disabled when all " + "UseSHA*Intrinsics are disabled even if %s flag set " - + "to JVM", SHAOptionsBase.USE_SHA_OPTION, + + "to JVM", DigestOptionsBase.USE_SHA_OPTION, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.USE_SHA_OPTION, true)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true), + DigestOptionsBase.USE_SHA_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, false), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, false), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION, false)); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION, false)); // Verify that explicitly disabled UseSHA option remains disabled even // if all UseSHA*Intrinsics options were enabled. CommandLineOptionTest.verifyOptionValueForSameVM( - SHAOptionsBase.USE_SHA_OPTION, "false", + DigestOptionsBase.USE_SHA_OPTION, "false", String.format("'%s' option should be disabled if %s flag " + "set even if all UseSHA*Intrinsics were enabled", - SHAOptionsBase.USE_SHA_OPTION, + DigestOptionsBase.USE_SHA_OPTION, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, false)), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.USE_SHA_OPTION, false)), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, false), + DigestOptionsBase.USE_SHA_OPTION, false), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, true), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, true), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION, true)); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION, true)); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java index 1a3c6166879..4dd8e921e69 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.cli.testcases; -import compiler.intrinsics.sha.cli.SHAOptionsBase; +import compiler.intrinsics.sha.cli.DigestOptionsBase; import compiler.testlibrary.sha.predicate.IntrinsicPredicates; import jdk.test.lib.Asserts; import jdk.test.lib.process.ExitCode; @@ -38,13 +38,13 @@ import jdk.test.lib.cli.predicate.OrPredicate; * sha* instructions. */ public class UseSHASpecificTestCaseForUnsupportedCPU - extends SHAOptionsBase.TestCase { + extends DigestOptionsBase.TestCase { public UseSHASpecificTestCaseForUnsupportedCPU(String optionName) { - super(SHAOptionsBase.USE_SHA_OPTION, new NotPredicate( + super(DigestOptionsBase.USE_SHA_OPTION, new NotPredicate( IntrinsicPredicates.ANY_SHA_INSTRUCTION_AVAILABLE)); - Asserts.assertEQ(optionName, SHAOptionsBase.USE_SHA_OPTION, - "Test case should be used for " + SHAOptionsBase.USE_SHA_OPTION + Asserts.assertEQ(optionName, DigestOptionsBase.USE_SHA_OPTION, + "Test case should be used for " + DigestOptionsBase.USE_SHA_OPTION + " option only."); } @@ -55,7 +55,7 @@ public class UseSHASpecificTestCaseForUnsupportedCPU + " '%s' option on unsupported CPU, but there should be" + "the message shown.", optionName); CommandLineOptionTest.verifySameJVMStartup(new String[] { - SHAOptionsBase.getWarningForUnsupportedCPU(optionName) + DigestOptionsBase.getWarningForUnsupportedCPU(optionName) }, null, shouldPassMessage, shouldPassMessage, ExitCode.OK, CommandLineOptionTest.prepareBooleanFlag(optionName, true)); } @@ -65,35 +65,35 @@ public class UseSHASpecificTestCaseForUnsupportedCPU // Verify that UseSHA option remains disabled even if all // UseSHA*Intrinsics were enabled. CommandLineOptionTest.verifyOptionValueForSameVM( - SHAOptionsBase.USE_SHA_OPTION, "false", String.format( + DigestOptionsBase.USE_SHA_OPTION, "false", String.format( "%s option should be disabled on unsupported CPU" + " even if all UseSHA*Intrinsics options were enabled.", - SHAOptionsBase.USE_SHA_OPTION), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, true), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, true), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION, true)); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION, true)); // Verify that UseSHA option remains disabled even if all // UseSHA*Intrinsics options were enabled and UseSHA was enabled as well. CommandLineOptionTest.verifyOptionValueForSameVM( - SHAOptionsBase.USE_SHA_OPTION, "false", String.format( + DigestOptionsBase.USE_SHA_OPTION, "false", String.format( "%s option should be disabled on unsupported CPU" + " even if all UseSHA*Intrinsics options were enabled" + " and %s was enabled as well", - SHAOptionsBase.USE_SHA_OPTION, - SHAOptionsBase.USE_SHA_OPTION), - SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, + DigestOptionsBase.USE_SHA_OPTION, + DigestOptionsBase.USE_SHA_OPTION), + DigestOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS, CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA_OPTION, true), + DigestOptionsBase.USE_SHA_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA1_INTRINSICS_OPTION, true), + DigestOptionsBase.USE_SHA1_INTRINSICS_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA256_INTRINSICS_OPTION, true), + DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION, true), CommandLineOptionTest.prepareBooleanFlag( - SHAOptionsBase.USE_SHA512_INTRINSICS_OPTION, true)); + DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION, true)); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/SHASanityTestBase.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/DigestSanityTestBase.java similarity index 85% rename from test/hotspot/jtreg/compiler/intrinsics/sha/sanity/SHASanityTestBase.java rename to test/hotspot/jtreg/compiler/intrinsics/sha/sanity/DigestSanityTestBase.java index c476d27b143..a2e31ef41bb 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/SHASanityTestBase.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/DigestSanityTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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,7 +23,7 @@ package compiler.intrinsics.sha.sanity; -import compiler.intrinsics.sha.TestSHA; +import compiler.intrinsics.sha.TestDigest; import compiler.testlibrary.intrinsics.Verifier; import sun.hotspot.WhiteBox; @@ -36,7 +36,9 @@ import java.util.function.BooleanSupplier; /** * Base class for sanity tests on SHA intrinsics support. */ -public class SHASanityTestBase { +public class DigestSanityTestBase { + protected static final String MD5_INTRINSIC_ID + = "_md5_implCompress"; protected static final String SHA1_INTRINSIC_ID = "_sha_implCompress"; protected static final String SHA256_INTRINSIC_ID @@ -65,7 +67,7 @@ public class SHASanityTestBase { * be used. * @param intrinsicID The ID of the intrinsic to be tested. */ - protected SHASanityTestBase(BooleanSupplier predicate, String intrinsicID) { + protected DigestSanityTestBase(BooleanSupplier predicate, String intrinsicID) { this.predicate = predicate; this.intrinsicID = intrinsicID; } @@ -82,10 +84,10 @@ public class SHASanityTestBase { dumpProperties(); - TestSHA.testSHA(SHASanityTestBase.PROVIDER, algorithm, - SHASanityTestBase.MSG_SIZE, SHASanityTestBase.OFFSET, - SHASanityTestBase.ITERATIONS, - SHASanityTestBase.WARMUP_ITERATIONS); + TestDigest.testDigest(DigestSanityTestBase.PROVIDER, algorithm, + DigestSanityTestBase.MSG_SIZE, DigestSanityTestBase.OFFSET, + DigestSanityTestBase.ITERATIONS, + DigestSanityTestBase.WARMUP_ITERATIONS); } /** @@ -102,7 +104,7 @@ public class SHASanityTestBase { String.valueOf(predicate.getAsBoolean())); String logFileName - = SHASanityTestBase.WHITE_BOX.getStringVMFlag("LogFile"); + = DigestSanityTestBase.WHITE_BOX.getStringVMFlag("LogFile"); FileOutputStream fileOutputStream = new FileOutputStream(logFileName + Verifier.PROPERTY_FILE_SUFFIX); diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java new file mode 100644 index 00000000000..4c712b1afdc --- /dev/null +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8035968 + * @summary Verify that MD5 intrinsic is actually used. + * @library /test/lib / + * @modules java.base/jdk.internal.misc + * java.management + * + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 + * -XX:Tier4InvocationThreshold=500 + * -XX:+LogCompilation -XX:LogFile=positive.log + * -XX:CompileOnly=sun/security/provider/DigestBase + * -XX:CompileOnly=sun/security/provider/MD5 + * -XX:+UseMD5Intrinsics + * -Dalgorithm=MD5 + * compiler.intrinsics.sha.sanity.TestMD5Intrinsics + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 + * -XX:Tier4InvocationThreshold=500 + * -XX:+LogCompilation -XX:LogFile=negative.log + * -XX:CompileOnly=sun/security/provider/DigestBase + * -XX:CompileOnly=sun/security/provider/MD5 + * -XX:-UseMD5Intrinsics + * -Dalgorithm=MD5 + * compiler.intrinsics.sha.sanity.TestMD5Intrinsics + * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE + * compiler.testlibrary.intrinsics.Verifier positive.log negative.log + */ + +package compiler.intrinsics.sha.sanity; + +import compiler.testlibrary.sha.predicate.IntrinsicPredicates; + +public class TestMD5Intrinsics { + public static void main(String args[]) throws Exception { + new DigestSanityTestBase(IntrinsicPredicates.isMD5IntrinsicAvailable(), + DigestSanityTestBase.MD5_INTRINSIC_ID).test(); + } +} diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java new file mode 100644 index 00000000000..bbce5531d71 --- /dev/null +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8035968 + * @summary Verify that MD5 multi block intrinsic is actually used. + * @library /test/lib / + * @modules java.base/jdk.internal.misc + * java.management + * + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 + * -XX:Tier4InvocationThreshold=500 + * -XX:+LogCompilation -XX:LogFile=positive.log + * -XX:CompileOnly=sun/security/provider/DigestBase + * -XX:CompileOnly=sun/security/provider/MD5 + * -XX:+UseMD5Intrinsics -XX:-UseSHA1Intrinsics + * -XX:-UseSHA256Intrinsics -XX:-UseSHA512Intrinsics + * -Dalgorithm=MD5 + * compiler.intrinsics.sha.sanity.TestMD5MultiBlockIntrinsics + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 + * -XX:Tier4InvocationThreshold=500 + * -XX:+LogCompilation -XX:LogFile=positive_def.log + * -XX:CompileOnly=sun/security/provider/DigestBase + * -XX:CompileOnly=sun/security/provider/MD5 + * -XX:+UseMD5Intrinsics -Dalgorithm=MD5 + * compiler.intrinsics.sha.sanity.TestMD5MultiBlockIntrinsics + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 + * -XX:Tier4InvocationThreshold=500 + * -XX:+LogCompilation -XX:LogFile=negative.log + * -XX:CompileOnly=sun/security/provider/DigestBase + * -XX:CompileOnly=sun/security/provider/MD5 + * -Dalgorithm=MD5 + * compiler.intrinsics.sha.sanity.TestMD5MultiBlockIntrinsics + * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE + * compiler.testlibrary.intrinsics.Verifier positive.log positive_def.log + * negative.log + */ + +package compiler.intrinsics.sha.sanity; +import compiler.testlibrary.sha.predicate.IntrinsicPredicates; + +public class TestMD5MultiBlockIntrinsics { + public static void main(String args[]) throws Exception { + new DigestSanityTestBase(IntrinsicPredicates.isMD5IntrinsicAvailable(), + DigestSanityTestBase.MB_INTRINSIC_ID).test(); + } +} diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java index ec55b3a4725..04963960d95 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java @@ -59,7 +59,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates; public class TestSHA1Intrinsics { public static void main(String args[]) throws Exception { - new SHASanityTestBase(IntrinsicPredicates.isSHA1IntrinsicAvailable(), - SHASanityTestBase.SHA1_INTRINSIC_ID).test(); + new DigestSanityTestBase(IntrinsicPredicates.isSHA1IntrinsicAvailable(), + DigestSanityTestBase.SHA1_INTRINSIC_ID).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java index e2aa952c8ee..7c239bbc641 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java @@ -37,8 +37,8 @@ * -XX:+LogCompilation -XX:LogFile=positive.log * -XX:CompileOnly=sun/security/provider/DigestBase * -XX:CompileOnly=sun/security/provider/SHA - * -XX:+UseSHA1Intrinsics -XX:-UseSHA256Intrinsics - * -XX:-UseSHA512Intrinsics + * -XX:+UseSHA1Intrinsics -XX:-UseMD5Intrinsics + * -XX:-UseSHA256Intrinsics -XX:-UseSHA512Intrinsics * -Dalgorithm=SHA-1 * compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -67,7 +67,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates; public class TestSHA1MultiBlockIntrinsics { public static void main(String args[]) throws Exception { - new SHASanityTestBase(IntrinsicPredicates.isSHA1IntrinsicAvailable(), - SHASanityTestBase.MB_INTRINSIC_ID).test(); + new DigestSanityTestBase(IntrinsicPredicates.isSHA1IntrinsicAvailable(), + DigestSanityTestBase.MB_INTRINSIC_ID).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java index 1852b52910b..cfca8fa1e13 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java @@ -78,7 +78,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates; public class TestSHA256Intrinsics { public static void main(String args[]) throws Exception { - new SHASanityTestBase(IntrinsicPredicates.isSHA256IntrinsicAvailable(), - SHASanityTestBase.SHA256_INTRINSIC_ID).test(); + new DigestSanityTestBase(IntrinsicPredicates.isSHA256IntrinsicAvailable(), + DigestSanityTestBase.SHA256_INTRINSIC_ID).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java index e7694f01f5d..cdaaf049adb 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java @@ -37,8 +37,8 @@ * -XX:+LogCompilation -XX:LogFile=positive_224.log * -XX:CompileOnly=sun/security/provider/DigestBase * -XX:CompileOnly=sun/security/provider/SHA2 - * -XX:+UseSHA256Intrinsics -XX:-UseSHA1Intrinsics - * -XX:-UseSHA512Intrinsics + * -XX:+UseSHA256Intrinsics -XX:-UseMD5Intrinsics + * -XX:-UseSHA1Intrinsics -XX:-UseSHA512Intrinsics * -Dalgorithm=SHA-224 * compiler.intrinsics.sha.sanity.TestSHA256MultiBlockIntrinsics * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -63,8 +63,8 @@ * -XX:+LogCompilation -XX:LogFile=positive_256.log * -XX:CompileOnly=sun/security/provider/DigestBase * -XX:CompileOnly=sun/security/provider/SHA2 - * -XX:+UseSHA256Intrinsics -XX:-UseSHA1Intrinsics - * -XX:-UseSHA512Intrinsics + * -XX:+UseSHA256Intrinsics -XX:-UseMD5Intrinsics + * -XX:-UseSHA1Intrinsics -XX:-UseSHA512Intrinsics * -Dalgorithm=SHA-256 * compiler.intrinsics.sha.sanity.TestSHA256MultiBlockIntrinsics * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -94,7 +94,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates; public class TestSHA256MultiBlockIntrinsics { public static void main(String args[]) throws Exception { - new SHASanityTestBase(IntrinsicPredicates.isSHA256IntrinsicAvailable(), - SHASanityTestBase.MB_INTRINSIC_ID).test(); + new DigestSanityTestBase(IntrinsicPredicates.isSHA256IntrinsicAvailable(), + DigestSanityTestBase.MB_INTRINSIC_ID).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java index 937c64aa785..42427c0c6ea 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java @@ -78,7 +78,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates; public class TestSHA512Intrinsics { public static void main(String args[]) throws Exception { - new SHASanityTestBase(IntrinsicPredicates.isSHA512IntrinsicAvailable(), - SHASanityTestBase.SHA512_INTRINSIC_ID).test(); + new DigestSanityTestBase(IntrinsicPredicates.isSHA512IntrinsicAvailable(), + DigestSanityTestBase.SHA512_INTRINSIC_ID).test(); } } diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java index 62e773fb1a9..7521337b222 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java @@ -37,8 +37,8 @@ * -XX:+LogCompilation -XX:LogFile=positive_384.log * -XX:CompileOnly=sun/security/provider/DigestBase * -XX:CompileOnly=sun/security/provider/SHA5 - * -XX:+UseSHA512Intrinsics -XX:-UseSHA1Intrinsics - * -XX:-UseSHA256Intrinsics + * -XX:+UseSHA512Intrinsics -XX:-UseMD5Intrinsics + * -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics * -Dalgorithm=SHA-384 * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -63,8 +63,8 @@ * -XX:+LogCompilation -XX:LogFile=positive_512.log * -XX:CompileOnly=sun/security/provider/DigestBase * -XX:CompileOnly=sun/security/provider/SHA5 - * -XX:+UseSHA512Intrinsics -XX:-UseSHA1Intrinsics - * -XX:-UseSHA256Intrinsics + * -XX:+UseSHA512Intrinsics -XX:-UseMD5Intrinsics + * -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics * -Dalgorithm=SHA-512 * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -95,7 +95,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates; public class TestSHA512MultiBlockIntrinsics { public static void main(String args[]) throws Exception { - new SHASanityTestBase(IntrinsicPredicates.isSHA512IntrinsicAvailable(), - SHASanityTestBase.MB_INTRINSIC_ID).test(); + new DigestSanityTestBase(IntrinsicPredicates.isSHA512IntrinsicAvailable(), + DigestSanityTestBase.MB_INTRINSIC_ID).test(); } } diff --git a/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java index edfeeb23b91..2b00c742ff0 100644 --- a/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java +++ b/test/hotspot/jtreg/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java @@ -59,6 +59,12 @@ public class IntrinsicPredicates { return Platform.isServer() && !Platform.isEmulatedClient() && (!isTiered || maxLevelIsReachable); }; + public static final BooleanSupplier MD5_INSTRUCTION_AVAILABLE + = // x86 variants + new OrPredicate(new CPUSpecificPredicate("amd64.*", null, null), + new OrPredicate(new CPUSpecificPredicate("i386.*", null, null), + new CPUSpecificPredicate("x86.*", null, null))); + public static final BooleanSupplier SHA1_INSTRUCTION_AVAILABLE = new OrPredicate(new CPUSpecificPredicate("aarch64.*", new String[] { "sha1" }, null), new OrPredicate(new CPUSpecificPredicate("s390.*", new String[] { "sha1" }, null), @@ -97,6 +103,11 @@ public class IntrinsicPredicates { IntrinsicPredicates.SHA256_INSTRUCTION_AVAILABLE, IntrinsicPredicates.SHA512_INSTRUCTION_AVAILABLE)); + public static BooleanSupplier isMD5IntrinsicAvailable() { + return new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2, + IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.MD5", "implCompress0")); + } + public static BooleanSupplier isSHA1IntrinsicAvailable() { return new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2, IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA", "implCompress0")); From 3ea5fdc9ac2825a30dbd21aaa64aa6ce800d97ce Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Wed, 5 Aug 2020 11:40:07 -0700 Subject: [PATCH 003/100] 8235792: LineNumberReader.getLineNumber() behavior is inconsistent with respect to EOF Reviewed-by: alanb, darcy, rriggs --- .../share/classes/java/io/BufferedReader.java | 10 +- .../classes/java/io/LineNumberReader.java | 91 +++++++++++++++---- test/jdk/java/io/LineNumberReader/Read.java | 59 +++++++++++- 3 files changed, 136 insertions(+), 24 deletions(-) diff --git a/src/java.base/share/classes/java/io/BufferedReader.java b/src/java.base/share/classes/java/io/BufferedReader.java index 6825dc530e9..25ceaf3f25c 100644 --- a/src/java.base/share/classes/java/io/BufferedReader.java +++ b/src/java.base/share/classes/java/io/BufferedReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, 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 @@ -302,6 +302,8 @@ public class BufferedReader extends Reader { * (EOF). * * @param ignoreLF If true, the next '\n' will be skipped + * @param term Output: Whether a line terminator was encountered + * while reading the line; may be {@code null}. * * @return A String containing the contents of the line, not including * any line-termination characters, or null if the end of the @@ -311,13 +313,14 @@ public class BufferedReader extends Reader { * * @throws IOException If an I/O error occurs */ - String readLine(boolean ignoreLF) throws IOException { + String readLine(boolean ignoreLF, boolean[] term) throws IOException { StringBuilder s = null; int startChar; synchronized (lock) { ensureOpen(); boolean omitLF = ignoreLF || skipLF; + if (term != null) term[0] = false; bufferLoop: for (;;) { @@ -344,6 +347,7 @@ public class BufferedReader extends Reader { for (i = nextChar; i < nChars; i++) { c = cb[i]; if ((c == '\n') || (c == '\r')) { + if (term != null) term[0] = true; eol = true; break charLoop; } @@ -389,7 +393,7 @@ public class BufferedReader extends Reader { * @see java.nio.file.Files#readAllLines */ public String readLine() throws IOException { - return readLine(false); + return readLine(false, null); } /** diff --git a/src/java.base/share/classes/java/io/LineNumberReader.java b/src/java.base/share/classes/java/io/LineNumberReader.java index bffda6e1c2c..49e6a2ea99a 100644 --- a/src/java.base/share/classes/java/io/LineNumberReader.java +++ b/src/java.base/share/classes/java/io/LineNumberReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, 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,6 @@ package java.io; - /** * A buffered character-input stream that keeps track of line numbers. This * class defines methods {@link #setLineNumber(int)} and {@link @@ -33,15 +32,17 @@ package java.io; * respectively. * *

By default, line numbering begins at 0. This number increments at every - * line terminator as the data is read, and can be changed - * with a call to {@code setLineNumber(int)}. Note however, that - * {@code setLineNumber(int)} does not actually change the current position in - * the stream; it only changes the value that will be returned by + * line terminator as the data is read, and at the end of the + * stream if the last character in the stream is not a line terminator. This + * number can be changed with a call to {@code setLineNumber(int)}. Note + * however, that {@code setLineNumber(int)} does not actually change the current + * position in the stream; it only changes the value that will be returned by * {@code getLineNumber()}. * *

A line is considered to be terminated by any one of a * line feed ('\n'), a carriage return ('\r'), or a carriage return followed - * immediately by a linefeed. + * immediately by a linefeed, or any of the previous terminators followed by + * end of stream, or end of stream not preceded by another terminator. * * @author Mark Reinhold * @since 1.1 @@ -49,6 +50,15 @@ package java.io; public class LineNumberReader extends BufferedReader { + /** Previous character types */ + private static final int NONE = 0; // no previous character + private static final int CHAR = 1; // non-line terminator + private static final int EOL = 2; // line terminator + private static final int EOF = 3; // end-of-file + + /** The previous character type */ + private int prevChar = NONE; + /** The current line number */ private int lineNumber = 0; @@ -111,8 +121,10 @@ public class LineNumberReader extends BufferedReader { /** * Read a single character. Line terminators are - * compressed into single newline ('\n') characters. Whenever a line - * terminator is read the current line number is incremented. + * compressed into single newline ('\n') characters. The current line + * number is incremented whenever a line terminator is read, or when the + * end of the stream is reached and the last character in the stream is + * not a line terminator. * * @return The character read, or -1 if the end of the stream has been * reached @@ -134,16 +146,27 @@ public class LineNumberReader extends BufferedReader { skipLF = true; case '\n': /* Fall through */ lineNumber++; + prevChar = EOL; return '\n'; + case -1: + if (prevChar == CHAR) + lineNumber++; + prevChar = EOF; + break; + default: + prevChar = CHAR; + break; } return c; } } /** - * Read characters into a portion of an array. Whenever a line terminator is read the current line number is - * incremented. + * Read characters into a portion of an array. + * Line terminators are compressed into single newline + * ('\n') characters. The current line number is incremented whenever a + * line terminator is read, or when the end of the stream is reached and + * the last character in the stream is not a line terminator. * * @param cbuf * Destination buffer @@ -154,8 +177,8 @@ public class LineNumberReader extends BufferedReader { * @param len * Maximum number of characters to read * - * @return The number of bytes read, or -1 if the end of the stream has - * already been reached + * @return The number of characters read, or -1 if the end of the stream + * has already been reached * * @throws IOException * If an I/O error occurs @@ -167,6 +190,13 @@ public class LineNumberReader extends BufferedReader { synchronized (lock) { int n = super.read(cbuf, off, len); + if (n == -1) { + if (prevChar == CHAR) + lineNumber++; + prevChar = EOF; + return -1; + } + for (int i = off; i < off + n; i++) { int c = cbuf[i]; if (skipLF) { @@ -183,13 +213,28 @@ public class LineNumberReader extends BufferedReader { } } + if (n > 0) { + switch ((int)cbuf[off + n - 1]) { + case '\r': + case '\n': /* Fall through */ + prevChar = EOL; + break; + default: + prevChar = CHAR; + break; + } + } + return n; } } /** - * Read a line of text. Whenever a line terminator is - * read the current line number is incremented. + * Read a line of text. Line terminators are compressed + * into single newline ('\n') characters. The current line number is + * incremented whenever a line terminator is read, or when the end of the + * stream is reached and the last character in the stream is not a line + * terminator. * * @return A String containing the contents of the line, not including * any line termination characters, or @@ -200,10 +245,17 @@ public class LineNumberReader extends BufferedReader { */ public String readLine() throws IOException { synchronized (lock) { - String l = super.readLine(skipLF); + boolean[] term = new boolean[1]; + String l = super.readLine(skipLF, term); skipLF = false; - if (l != null) + if (l != null) { lineNumber++; + prevChar = term[0] ? EOL : EOF; + } else { // l == null + if (prevChar == CHAR) + lineNumber++; + prevChar = EOF; + } return l; } } @@ -242,6 +294,9 @@ public class LineNumberReader extends BufferedReader { break; r -= nc; } + if (n - r > 0) { + prevChar = NONE; + } return n - r; } } diff --git a/test/jdk/java/io/LineNumberReader/Read.java b/test/jdk/java/io/LineNumberReader/Read.java index 0e1968b372f..7619884a562 100644 --- a/test/jdk/java/io/LineNumberReader/Read.java +++ b/test/jdk/java/io/LineNumberReader/Read.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -22,16 +22,24 @@ */ /* @test - @bug 4074875 4063511 + @bug 4074875 4063511 8235792 @summary Make sure LineNumberReader.read(char, int , int) will increase the linenumber correctly. */ -import java.io.*; +import java.io.IOException; +import java.io.LineNumberReader; +import java.io.StringReader; +import java.util.function.Consumer; public class Read { public static void main(String[] args) throws Exception { + testReadChars(); + testEofs(); + } + + private static void testReadChars() throws Exception { String s = "aaaa\nbbb\n"; char[] buf = new char[5]; int n = 0; @@ -49,4 +57,49 @@ public class Read { throw new Exception("Failed test: Expected line number: 2, got " + line); } + + private static void testEofs() throws Exception { + String string = "first \n second"; + + Consumer c = (LineNumberReader r) -> { + try { + while (r.read() != -1) + continue; + } catch (IOException e) { + throw new RuntimeException(e); + } + }; + testEof(c, string, 2); + + c = (LineNumberReader r) -> { + try { + char[] buf = new char[128]; + while (r.read(buf) != -1) + continue; + } catch (IOException e) { + throw new RuntimeException(e); + } + }; + testEof(c, string, 2); + + c = (LineNumberReader r) -> { + try { + while (r.readLine() != null) + continue; + } catch (IOException e) { + throw new RuntimeException(e); + } + }; + testEof(c, string, 2); + } + + private static void testEof(Consumer c, String s, int n) + throws Exception { + LineNumberReader r = new LineNumberReader(new StringReader(s)); + c.accept(r); + int line; + if ((line = r.getLineNumber()) != n) + throw new Exception("Failed test: Expected line number: " + n + + " , got " + line); + } } From 65577cf58a3b3221ca4a84e22ae0fc386dbc4c1e Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Wed, 5 Aug 2020 16:39:08 -0700 Subject: [PATCH 004/100] 8251132: make main classes public in vmTestbase/jit tests Reviewed-by: kvn --- test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java | 5 ++--- .../jit/FloatingPoint/gen_math/Filtering/Filtering.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops01/Loops01.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops02/Loops02.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops03/Loops03.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops04/Loops04.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops05/Loops05.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops06/Loops06.java | 5 ++--- .../jit/FloatingPoint/gen_math/Loops07/Loops07.java | 5 ++--- .../jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java | 5 ++--- .../vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java | 7 +++---- .../jtreg/vmTestbase/jit/deoptimization/test01/test01.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test02/test02.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test03/test03.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test04/test04.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test05/test05.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test06/test06.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test07/test07.java | 5 ++--- .../jtreg/vmTestbase/jit/deoptimization/test08/test08.java | 5 ++--- .../vmTestbase/jit/escape/LockElision/MatMul/MatMul.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/exception/exception.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java | 5 ++--- .../jtreg/vmTestbase/jit/inline/inline003/inline003.java | 7 +++---- .../jtreg/vmTestbase/jit/inline/inline004/inline004.java | 7 +++---- .../jtreg/vmTestbase/jit/inline/inline007/inline007.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/series/series.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java | 7 +++---- test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java | 4 ++-- test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java | 4 ++-- test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java | 4 ++-- test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java | 4 ++-- test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java | 4 ++-- test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java | 4 ++-- test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java | 5 ++--- test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java | 5 ++--- 138 files changed, 366 insertions(+), 498 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java b/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java index 235833e0575..1d886fa661b 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java +++ b/test/hotspot/jtreg/vmTestbase/jit/DivTest/DivTest.java @@ -32,15 +32,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.DivTest.DivTest - * @run driver ExecDriver --java jit.DivTest.DivTest + * @run main/othervm jit.DivTest.DivTest */ package jit.DivTest; import nsk.share.TestFailure; -class DivTest{ +public class DivTest{ static int n; static boolean test1 (int n1, int n2) { try { diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java index 5619b06673d..5f7882282bc 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Filtering/Filtering.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Filtering.Filtering - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Filtering.Filtering + * @run main/othervm jit.FloatingPoint.gen_math.Filtering.Filtering */ package jit.FloatingPoint.gen_math.Filtering; import nsk.share.TestFailure; -class Filtering +public class Filtering { static int N = 1000; static double xx[]; diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java index 1016d204be3..4a7db873035 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops01/Loops01.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops01.Loops01 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops01.Loops01 + * @run main/othervm jit.FloatingPoint.gen_math.Loops01.Loops01 */ package jit.FloatingPoint.gen_math.Loops01; import nsk.share.TestFailure; -class Loops01 +public class Loops01 { static final int N = 500; diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java index 71d591b50bc..cc58c06ef00 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops02/Loops02.java @@ -30,8 +30,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops02.Loops02 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops02.Loops02 + * @run main/othervm jit.FloatingPoint.gen_math.Loops02.Loops02 */ package jit.FloatingPoint.gen_math.Loops02; @@ -39,7 +38,7 @@ package jit.FloatingPoint.gen_math.Loops02; // Test working with loops and random functions. import nsk.share.TestFailure; -class Loops02 +public class Loops02 { static final int N = 300; diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java index a0773829d08..ebedfa6fafa 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops03/Loops03.java @@ -30,15 +30,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops03.Loops03 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops03.Loops03 + * @run main/othervm jit.FloatingPoint.gen_math.Loops03.Loops03 */ package jit.FloatingPoint.gen_math.Loops03; import nsk.share.TestFailure; -class Loops03 +public class Loops03 { static final int N = 100000; diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java index 9c5a2eb993c..6f953eb275e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops04/Loops04.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops04.Loops04 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops04.Loops04 + * @run main/othervm jit.FloatingPoint.gen_math.Loops04.Loops04 */ package jit.FloatingPoint.gen_math.Loops04; @@ -38,7 +37,7 @@ package jit.FloatingPoint.gen_math.Loops04; // Test working with nested loops. import nsk.share.TestFailure; -class Loops04 +public class Loops04 { public static void main (String args[]) diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java index 8bfeeeff93e..c014d7b79af 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops05/Loops05.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops05.Loops05 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops05.Loops05 + * @run main/othervm jit.FloatingPoint.gen_math.Loops05.Loops05 */ package jit.FloatingPoint.gen_math.Loops05; import nsk.share.TestFailure; -class Loops05 +public class Loops05 { static final int N = 100; diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java index d9ab3ecd056..8705059ab13 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops06/Loops06.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops06.Loops06 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops06.Loops06 + * @run main/othervm jit.FloatingPoint.gen_math.Loops06.Loops06 */ package jit.FloatingPoint.gen_math.Loops06; import nsk.share.TestFailure; -class Loops06 +public class Loops06 { static final int N = 20; diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java index 4934dde82bf..0da54ca5194 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Loops07/Loops07.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Loops07.Loops07 - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Loops07.Loops07 + * @run main/othervm jit.FloatingPoint.gen_math.Loops07.Loops07 */ package jit.FloatingPoint.gen_math.Loops07; @@ -41,7 +40,7 @@ package jit.FloatingPoint.gen_math.Loops07; import nsk.share.TestFailure; -class Loops07 +public class Loops07 { public static void main (String args[]) diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java index aa85b40e2e1..3818b12f58c 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Matrix_3d/Matrix_3d.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d + * @run main/othervm jit.FloatingPoint.gen_math.Matrix_3d.Matrix_3d */ package jit.FloatingPoint.gen_math.Matrix_3d; @@ -40,7 +39,7 @@ package jit.FloatingPoint.gen_math.Matrix_3d; import nsk.share.TestFailure; -class Matrix_3d +public class Matrix_3d { public static void main (String args[]) diff --git a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java index ee287ef797b..a72cfa9f482 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java +++ b/test/hotspot/jtreg/vmTestbase/jit/FloatingPoint/gen_math/Summ/Summ.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.FloatingPoint.gen_math.Summ.Summ - * @run driver ExecDriver --java jit.FloatingPoint.gen_math.Summ.Summ + * @run main/othervm jit.FloatingPoint.gen_math.Summ.Summ */ package jit.FloatingPoint.gen_math.Summ; @@ -39,7 +38,7 @@ package jit.FloatingPoint.gen_math.Summ; import nsk.share.TestFailure; -class Summ +public class Summ { public static void main (String args[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java b/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java index 161464dc64e..0fad087405b 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java +++ b/test/hotspot/jtreg/vmTestbase/jit/Robert/Robert.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.Robert.Robert - * @run driver ExecDriver --java jit.Robert.Robert + * @run main/othervm jit.Robert.Robert */ package jit.Robert; @@ -38,7 +37,7 @@ package jit.Robert; import java.io.*; import nsk.share.TestFailure; -class Robert +public class Robert { Robert() throws Exception diff --git a/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java b/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java index c1f92405ea8..f163a2dc35f 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java +++ b/test/hotspot/jtreg/vmTestbase/jit/Sleeper/Sleeper.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.Sleeper.Sleeper - * @run driver ExecDriver --java jit.Sleeper.Sleeper + * @run main/othervm jit.Sleeper.Sleeper */ package jit.Sleeper; import nsk.share.TestFailure; -class Sleeper { +public class Sleeper { public static void main(String args[] ) { System.out.println ("1"); try { Thread.sleep(1000); } catch (InterruptedException e) {} diff --git a/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java b/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java index 9e3af6a959f..12e3103ccdd 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java +++ b/test/hotspot/jtreg/vmTestbase/jit/bounds/bounds.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.bounds.bounds - * @run driver ExecDriver --java jit.bounds.bounds + * @run main/othervm jit.bounds.bounds */ package jit.bounds; @@ -40,7 +39,7 @@ package jit.bounds; import nsk.share.TestFailure; -class bounds { +public class bounds { public static void main(String[] argv) { int i; int a[] = new int[2]; diff --git a/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java index 661eaa159c5..41431ac88f4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java +++ b/test/hotspot/jtreg/vmTestbase/jit/collapse/collapse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.collapse.collapse - * @run driver ExecDriver --java jit.collapse.collapse + * @run main/othervm jit.collapse.collapse */ package jit.collapse; @@ -39,7 +38,7 @@ package jit.collapse; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class collapse { +public class collapse { public static final GoldChecker goldChecker = new GoldChecker( "collapse" ); public static void main( String[] argv ) diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java index 299a0a82a80..00b1de4c998 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test01/test01.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test01.test01 - * @run driver ExecDriver --java jit.deoptimization.test01.test01 + * @run main/othervm jit.deoptimization.test01.test01 */ package jit.deoptimization.test01; @@ -44,7 +43,7 @@ import nsk.share.TestFailure; * run with the -XX:TraceDeoptimization to observ the result. */ -class test01 { +public class test01 { public static void main (String[] args) { A obj = new A(); for (int index = 0; index < 100; index++) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java index 5bf18f034f0..c5829b840ee 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test02/test02.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test02.test02 - * @run driver ExecDriver --java jit.deoptimization.test02.test02 + * @run main/othervm jit.deoptimization.test02.test02 */ package jit.deoptimization.test02; @@ -44,7 +43,7 @@ import nsk.share.TestFailure; * run with the -XX:TraceDeoptimization to observ the result. */ -class test02 { +public class test02 { public static void main (String[] args) { A obj = new A(); for (int index = 0; index < 100; index++) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java index b9f870c65b2..066c7b84f42 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test03/test03.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test03.test03 - * @run driver ExecDriver --java jit.deoptimization.test03.test03 + * @run main/othervm jit.deoptimization.test03.test03 */ package jit.deoptimization.test03; @@ -44,7 +43,7 @@ import nsk.share.TestFailure; * run with the -XX:TraceDeoptimization to observ the result. */ -class test03 { +public class test03 { public static void main (String[] args) { A obj = new A(); for (int index = 0; index < 100; index++) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java index 8f61dc668b8..8e892e0f7b2 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test04/test04.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test04.test04 - * @run driver ExecDriver --java jit.deoptimization.test04.test04 + * @run main/othervm jit.deoptimization.test04.test04 */ package jit.deoptimization.test04; @@ -41,7 +40,7 @@ import nsk.share.TestFailure; * */ -class test04 { +public class test04 { public static void main (String[] args) { A obj = new A(); diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java index 02e7f7ef22c..468f4f11c63 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test05/test05.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test05.test05 - * @run driver ExecDriver --java jit.deoptimization.test05.test05 + * @run main/othervm jit.deoptimization.test05.test05 */ package jit.deoptimization.test05; @@ -41,7 +40,7 @@ import nsk.share.TestFailure; * */ -class test05 { +public class test05 { public static void main (String[] args) { A obj = new A(); diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java index c6ca77cadbc..8445df48d5c 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test06/test06.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test06.test06 - * @run driver ExecDriver --java jit.deoptimization.test06.test06 + * @run main/othervm jit.deoptimization.test06.test06 */ package jit.deoptimization.test06; @@ -45,7 +44,7 @@ import nsk.share.TestFailure; * run with the -XX:TraceDeoptimization to observ the result. */ -class test06 { +public class test06 { public static void main (String[] args) { A obj = new A(); for (int index = 0; index < 1; index++) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java index b2d2da0a4d1..9ad8027bdee 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test07/test07.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test07.test07 - * @run driver ExecDriver --java jit.deoptimization.test07.test07 + * @run main/othervm jit.deoptimization.test07.test07 */ package jit.deoptimization.test07; @@ -45,7 +44,7 @@ import nsk.share.TestFailure; * run with the -XX:TraceDeoptimization to observ the result. */ -class test07 { +public class test07 { public static void main (String[] args) { A obj = new A(); for (int index = 0; index < 1; index++) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java index 9595557a605..469be301354 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java +++ b/test/hotspot/jtreg/vmTestbase/jit/deoptimization/test08/test08.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.deoptimization.test08.test08 - * @run driver ExecDriver --java jit.deoptimization.test08.test08 + * @run main/othervm jit.deoptimization.test08.test08 */ package jit.deoptimization.test08; @@ -45,7 +44,7 @@ import nsk.share.TestFailure; * run with the -XX:TraceDeoptimization to observ the result. */ -class test08 { +public class test08 { public static void main (String[] args) { A obj = new A(); for (int index = 0; index < 1; index++) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java b/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java index aeed1ed0727..cf20b0df8a0 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java +++ b/test/hotspot/jtreg/vmTestbase/jit/escape/LockElision/MatMul/MatMul.java @@ -41,8 +41,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.escape.LockElision.MatMul.MatMul - * @run driver ExecDriver --java jit.escape.LockElision.MatMul.MatMul -dim 30 -threadCount 10 + * @run main/othervm jit.escape.LockElision.MatMul.MatMul -dim 30 -threadCount 10 */ package jit.escape.LockElision.MatMul; @@ -62,7 +61,7 @@ import vm.share.options.Options; import jdk.test.lib.Utils; -class MatMul { +public class MatMul { @Option(name = "dim", description = "dimension of matrices") int dim; diff --git a/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java b/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java index 32e72e030b4..42037d1eb8e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java +++ b/test/hotspot/jtreg/vmTestbase/jit/exception/exception.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.exception.exception - * @run driver ExecDriver --java jit.exception.exception + * @run main/othervm jit.exception.exception */ package jit.exception; @@ -49,7 +48,7 @@ package jit.exception; import nsk.share.TestFailure; -class exception { +public class exception { public static void main(String[] args) { int i, j; diff --git a/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java b/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java index d60cf0eaa7e..c54f4f09b1a 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java +++ b/test/hotspot/jtreg/vmTestbase/jit/init/init01/init01.java @@ -31,8 +31,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.init.init01.init01 - * @run driver ExecDriver --java jit.init.init01.init01 + * @run main/othervm jit.init.init01.init01 */ package jit.init.init01; @@ -52,7 +51,7 @@ class InitTest2 { static InitTest1 oop = new InitTest1(); } -class init01 { +public class init01 { public static void main (String s[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java b/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java index edbde0bf43c..e2a8148fa43 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java +++ b/test/hotspot/jtreg/vmTestbase/jit/init/init02/init02.java @@ -35,15 +35,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.init.init02.init02 - * @run driver ExecDriver --java jit.init.init02.init02 + * @run main/othervm jit.init.init02.init02 */ package jit.init.init02; import nsk.share.TestFailure; -class init02 { +public class init02 { public static boolean failed = false; public static void main(String args[]) { int i, x; diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java index af69d62d189..24792decd7c 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java +++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline003/inline003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.inline.inline003.inline003 - * @run driver ExecDriver --java jit.inline.inline003.inline003 + * @run main/othervm jit.inline.inline003.inline003 */ package jit.inline.inline003; @@ -48,7 +47,7 @@ class inline003_1 { final protected static int[] trash = { 10, 11}; } -class inline003 extends inline003_1 { +public class inline003 extends inline003_1 { public static final GoldChecker goldChecker = new GoldChecker( "inline003" ); final private static int ITERS=4; diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java index 5f279e7190e..689b8b768d2 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java +++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline004/inline004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.inline.inline004.inline004 - * @run driver ExecDriver --java jit.inline.inline004.inline004 + * @run main/othervm jit.inline.inline004.inline004 */ package jit.inline.inline004; @@ -51,7 +50,7 @@ class inline004_1 { } } -class inline004 extends inline004_1 { +public class inline004 extends inline004_1 { public static final GoldChecker goldChecker = new GoldChecker( "inline004" ); static int pFlag = 0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java index 3db807f949e..b570ce540dd 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java +++ b/test/hotspot/jtreg/vmTestbase/jit/inline/inline007/inline007.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -34,8 +34,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.inline.inline007.inline007 - * @run driver ExecDriver --java jit.inline.inline007.inline007 + * @run main/othervm jit.inline.inline007.inline007 */ package jit.inline.inline007; @@ -158,7 +157,7 @@ class inline007Sub extends inline007Sup { } } -class inline007 extends inline007_1 { +public class inline007 extends inline007_1 { public static final GoldChecker goldChecker = new GoldChecker( "inline007" ); static int[] myIters = new int[14]; diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java index f1786298635..9cd520c8b43 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java +++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/Pi/Pi.java @@ -30,8 +30,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.misctests.Pi.Pi - * @run driver ExecDriver --java jit.misctests.Pi.Pi + * @run main/othervm jit.misctests.Pi.Pi */ package jit.misctests.Pi; @@ -40,7 +39,7 @@ import java.util.Random; import nsk.share.TestFailure; import jdk.test.lib.Utils; -class Pi{ +public class Pi{ static double pi; static int imKreis=0, imQuadrat=0, i=0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java b/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java index 7f46842052c..68a656b1471 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java +++ b/test/hotspot/jtreg/vmTestbase/jit/misctests/t5/t5.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.misctests.t5.t5 - * @run driver ExecDriver --java jit.misctests.t5.t5 + * @run main/othervm jit.misctests.t5.t5 */ package jit.misctests.t5; import nsk.share.TestFailure; -class t5 +public class t5 { public static void main (String [] args) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java b/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java index 0471083e427..1d5845d8792 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java +++ b/test/hotspot/jtreg/vmTestbase/jit/overflow/overflow.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.overflow.overflow - * @run driver ExecDriver --java jit.overflow.overflow + * @run main/othervm jit.overflow.overflow */ package jit.overflow; @@ -46,7 +45,7 @@ import java.lang.*; import nsk.share.TestFailure; -class overflow { +public class overflow { public static void main(String[] args) { try { recurse(1); diff --git a/test/hotspot/jtreg/vmTestbase/jit/series/series.java b/test/hotspot/jtreg/vmTestbase/jit/series/series.java index 68e1aedded2..a7b063090a2 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/series/series.java +++ b/test/hotspot/jtreg/vmTestbase/jit/series/series.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.series.series - * @run driver ExecDriver --java jit.series.series + * @run main/othervm jit.series.series */ package jit.series; @@ -39,7 +38,7 @@ package jit.series; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class series { +public class series { public static final GoldChecker goldChecker = new GoldChecker( "series" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java index 947376ea15a..4bbd176806f 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t001/t001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t001.t001 - * @run driver ExecDriver --java jit.t.t001.t001 + * @run main/othervm jit.t.t001.t001 */ package jit.t.t001; @@ -39,7 +38,7 @@ package jit.t.t001; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t001 +public class t001 { public static final GoldChecker goldChecker = new GoldChecker( "t001" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java index ac147f89b3a..f64e0f6b811 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t002/t002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t002.t002 - * @run driver ExecDriver --java jit.t.t002.t002 + * @run main/othervm jit.t.t002.t002 */ package jit.t.t002; @@ -39,7 +38,7 @@ package jit.t.t002; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t002 +public class t002 { public static final GoldChecker goldChecker = new GoldChecker( "t002" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java index 643f8365577..161485862fb 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t003/t003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t003.t003 - * @run driver ExecDriver --java jit.t.t003.t003 + * @run main/othervm jit.t.t003.t003 */ package jit.t.t003; @@ -39,7 +38,7 @@ package jit.t.t003; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t003 +public class t003 { public static final GoldChecker goldChecker = new GoldChecker( "t003" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java index 13fb1507867..122c24832c3 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t004/t004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t004.t004 - * @run driver ExecDriver --java jit.t.t004.t004 + * @run main/othervm jit.t.t004.t004 */ package jit.t.t004; @@ -39,7 +38,7 @@ package jit.t.t004; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t004 +public class t004 { public static final GoldChecker goldChecker = new GoldChecker( "t004" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java index 9d3eeae0d66..23e12f16955 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t005/t005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t005.t005 - * @run driver ExecDriver --java jit.t.t005.t005 + * @run main/othervm jit.t.t005.t005 */ package jit.t.t005; @@ -39,7 +38,7 @@ package jit.t.t005; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t005 +public class t005 { public static final GoldChecker goldChecker = new GoldChecker( "t005" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java index 7e55b409ae6..cea3a24e922 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t006/t006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t006.t006 - * @run driver ExecDriver --java jit.t.t006.t006 + * @run main/othervm jit.t.t006.t006 */ package jit.t.t006; @@ -39,7 +38,7 @@ package jit.t.t006; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t006 +public class t006 { public static final GoldChecker goldChecker = new GoldChecker( "t006" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java b/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java index 73c251f4373..18cb99eacb4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t007/t007.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t007.t007 - * @run driver ExecDriver --java jit.t.t007.t007 + * @run main/othervm jit.t.t007.t007 */ package jit.t.t007; import nsk.share.TestFailure; -class t007 +public class t007 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java b/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java index 2ec131110a3..0e3d807dfda 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t008/t008.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t008.t008 - * @run driver ExecDriver --java jit.t.t008.t008 + * @run main/othervm jit.t.t008.t008 */ package jit.t.t008; import nsk.share.TestFailure; -class t008 +public class t008 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java b/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java index 0497e50f90f..c1d7a3bc8d7 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t009/t009.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t009.t009 - * @run driver ExecDriver --java jit.t.t009.t009 + * @run main/othervm jit.t.t009.t009 */ package jit.t.t009; import nsk.share.TestFailure; -class t009 +public class t009 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java index 537204c28cf..d2c38cb0910 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t011/t011.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t011.t011 - * @run driver ExecDriver --java jit.t.t011.t011 + * @run main/othervm jit.t.t011.t011 */ package jit.t.t011; @@ -39,7 +38,7 @@ package jit.t.t011; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t011 +public class t011 { public static final GoldChecker goldChecker = new GoldChecker( "t011" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java b/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java index 0f8d5261d7b..ef09580e5fe 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t012/t012.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t012.t012 - * @run driver ExecDriver --java jit.t.t012.t012 + * @run main/othervm jit.t.t012.t012 */ package jit.t.t012; import nsk.share.TestFailure; -class t012 +public class t012 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java index 597aa364ba5..b36ee5e8823 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t013/t013.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t013.t013 - * @run driver ExecDriver --java jit.t.t013.t013 + * @run main/othervm jit.t.t013.t013 */ package jit.t.t013; @@ -44,7 +43,7 @@ class Globals { static public int MaxDisks = 64; // this will do! } -class t013 { +public class t013 { public static final GoldChecker goldChecker = new GoldChecker( "t013" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java b/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java index 65f02d0bfe0..35c17ef2798 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t014/t014.java @@ -29,15 +29,14 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t014.t014 - * @run driver ExecDriver --java jit.t.t014.t014 + * @run main/othervm jit.t.t014.t014 */ package jit.t.t014; import nsk.share.TestFailure; -class t014 +public class t014 { void foo() { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java index e969f8ab549..3592b3d325e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t015/t015.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t015.t015 - * @run driver ExecDriver --java jit.t.t015.t015 + * @run main/othervm jit.t.t015.t015 */ package jit.t.t015; @@ -39,7 +38,7 @@ package jit.t.t015; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t015 +public class t015 { public static final GoldChecker goldChecker = new GoldChecker( "t015" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java index 00d9097b380..ceb7fcd131c 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t016/t016.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t016.t016 - * @run driver ExecDriver --java jit.t.t016.t016 + * @run main/othervm jit.t.t016.t016 */ package jit.t.t016; @@ -39,7 +38,7 @@ package jit.t.t016; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t016 +public class t016 { public static final GoldChecker goldChecker = new GoldChecker( "t016" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java index 18ec1b4e077..cd86dea3774 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t017/t017.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t017.t017 - * @run driver ExecDriver --java jit.t.t017.t017 + * @run main/othervm jit.t.t017.t017 */ package jit.t.t017; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_arraylength -class t017 +public class t017 { public static final GoldChecker goldChecker = new GoldChecker( "t017" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java index 70439d515ae..36ae1c28405 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t018/t018.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t018.t018 - * @run driver ExecDriver --java jit.t.t018.t018 + * @run main/othervm jit.t.t018.t018 */ package jit.t.t018; @@ -51,7 +50,7 @@ class jj extends Throwable } } -class t018 +public class t018 { public static final GoldChecker goldChecker = new GoldChecker( "t018" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java index 641482bcef6..41e5e4f1d6d 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t019/t019.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t019.t019 - * @run driver ExecDriver --java jit.t.t019.t019 + * @run main/othervm jit.t.t019.t019 */ package jit.t.t019; @@ -43,7 +42,7 @@ import nsk.share.GoldChecker; // opc_caload, opc_castore, // opc_saload, opc_sastore -class t019 +public class t019 { public static final GoldChecker goldChecker = new GoldChecker( "t019" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java index 2c4167a0c7c..7a272eed4d5 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t020/t020.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t020.t020 - * @run driver ExecDriver --java jit.t.t020.t020 + * @run main/othervm jit.t.t020.t020 */ package jit.t.t020; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_checkcast, opc_instanceof, opc_ifnull, opc_ifnonnull -class t020 +public class t020 { public static final GoldChecker goldChecker = new GoldChecker( "t020" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java index 9caed6caf4f..9e85e4b9168 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t021/t021.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t021.t021 - * @run driver ExecDriver --java jit.t.t021.t021 + * @run main/othervm jit.t.t021.t021 */ package jit.t.t021; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_fconst_0, opc_fconst_1, opc_fconst_2, opc_fload_, opc_fload, // opc_fadd, opc_fsub, opc_fmul, opc_fdiv -class t021 +public class t021 { public static final GoldChecker goldChecker = new GoldChecker( "t021" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java index a1188b2998e..72f1b1a3e71 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t022/t022.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t022.t022 - * @run driver ExecDriver --java jit.t.t022.t022 + * @run main/othervm jit.t.t022.t022 */ package jit.t.t022; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // The double-precision version of t021.java. -class t022 +public class t022 { public static final GoldChecker goldChecker = new GoldChecker( "t022" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java index 0d2ef87fb46..b6b1e9c91df 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t023/t023.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t023.t023 - * @run driver ExecDriver --java jit.t.t023.t023 + * @run main/othervm jit.t.t023.t023 */ package jit.t.t023; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_d2f, opc_d2i, opc_d2l -class t023 +public class t023 { public static final GoldChecker goldChecker = new GoldChecker( "t023" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java index 2ca8683620e..7490f1bcb66 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t024/t024.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t024.t024 - * @run driver ExecDriver --java jit.t.t024.t024 + * @run main/othervm jit.t.t024.t024 */ package jit.t.t024; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_f2d, opc_f2i, opc_f2l -class t024 +public class t024 { public static final GoldChecker goldChecker = new GoldChecker( "t024" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java index c84421f3d80..ec40c2f2e49 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t025/t025.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t025.t025 - * @run driver ExecDriver --java jit.t.t025.t025 + * @run main/othervm jit.t.t025.t025 */ package jit.t.t025; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_daload, opc_dastore, opc_faload, opc_fastore -class t025 +public class t025 { public static final GoldChecker goldChecker = new GoldChecker( "t025" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java b/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java index 0a531426491..0e61e267cc5 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t026/t026.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t026.t026 - * @run driver ExecDriver --java jit.t.t026.t026 + * @run main/othervm jit.t.t026.t026 */ package jit.t.t026; @@ -39,7 +38,7 @@ import nsk.share.TestFailure; // opc_areturn -class t026 +public class t026 { t026 foo() { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java index f9a3dd7a23d..7474412bca4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t027/t027.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t027.t027 - * @run driver ExecDriver --java jit.t.t027.t027 + * @run main/othervm jit.t.t027.t027 */ package jit.t.t027; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_dcmpg, opc_dcmpl -class t027 +public class t027 { public static final GoldChecker goldChecker = new GoldChecker( "t027" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java index c8d5316bbe7..0b2f28f7c16 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t028/t028.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t028.t028 - * @run driver ExecDriver --java jit.t.t028.t028 + * @run main/othervm jit.t.t028.t028 */ package jit.t.t028; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_dneg, opc_fneg -class t028 +public class t028 { public static final GoldChecker goldChecker = new GoldChecker( "t028" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java index 68f06352380..cf86aea3166 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t029/t029.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t029.t029 - * @run driver ExecDriver --java jit.t.t029.t029 + * @run main/othervm jit.t.t029.t029 */ package jit.t.t029; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_drem, opc_frem, opc_dreturn opc_freturn -class t029 +public class t029 { public static final GoldChecker goldChecker = new GoldChecker( "t029" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java index 9955e58d3cf..3121d6217be 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t030/t030.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t030.t030 - * @run driver ExecDriver --java jit.t.t030.t030 + * @run main/othervm jit.t.t030.t030 */ package jit.t.t030; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_dup2, opc_dup2_x1, opc_dup2_x2 -class t030 +public class t030 { public static final GoldChecker goldChecker = new GoldChecker( "t030" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java index 60890bae826..485172cca47 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t031/t031.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t031.t031 - * @run driver ExecDriver --java jit.t.t031.t031 + * @run main/othervm jit.t.t031.t031 */ package jit.t.t031; @@ -42,7 +41,7 @@ import nsk.share.GoldChecker; // opc_fcmpg, opc_fcmpl -class t031 +public class t031 { public static final GoldChecker goldChecker = new GoldChecker( "t031" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java index 796c2516fc7..55277399e2f 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t032/t032.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t032.t032 - * @run driver ExecDriver --java jit.t.t032.t032 + * @run main/othervm jit.t.t032.t032 */ package jit.t.t032; @@ -42,7 +41,7 @@ import nsk.share.GoldChecker; // opc_i2d, opc_i2f, opc_i2l // opc_l2d, opc_l2f, opc_l2i -class t032 +public class t032 { public static final GoldChecker goldChecker = new GoldChecker( "t032" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java index b27b5215d96..8e0c4be2522 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t033/t033.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t033.t033 - * @run driver ExecDriver --java jit.t.t033.t033 + * @run main/othervm jit.t.t033.t033 */ package jit.t.t033; @@ -42,7 +41,7 @@ import nsk.share.GoldChecker; // opc_iand, opc_ior, opc_ixor // opc_land, opc_lor, opc_lxor -class t033 +public class t033 { public static final GoldChecker goldChecker = new GoldChecker( "t033" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java index 1385fb2f52b..f92b971ec30 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t034/t034.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t034.t034 - * @run driver ExecDriver --java jit.t.t034.t034 + * @run main/othervm jit.t.t034.t034 */ package jit.t.t034; @@ -50,7 +49,7 @@ import nsk.share.GoldChecker; // opc_lrem // opc_lsub -class t034 +public class t034 { public static final GoldChecker goldChecker = new GoldChecker( "t034" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java index a28188cc20e..99bdb5a2f7e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t035/t035.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t035.t035 - * @run driver ExecDriver --java jit.t.t035.t035 + * @run main/othervm jit.t.t035.t035 */ package jit.t.t035; @@ -50,7 +49,7 @@ import nsk.share.GoldChecker; // opc_lrem // opc_lsub -class t035 +public class t035 { public static final GoldChecker goldChecker = new GoldChecker( "t035" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java index ab4c81ac9ac..41ce4d38cfa 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t036/t036.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t036.t036 - * @run driver ExecDriver --java jit.t.t036.t036 + * @run main/othervm jit.t.t036.t036 */ package jit.t.t036; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_int2byte, opc_int2char, opc_int2short -class t036 +public class t036 { public static final GoldChecker goldChecker = new GoldChecker( "t036" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java index 87ac4f7540b..ab9cec8a087 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t037/t037.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t037.t037 - * @run driver ExecDriver --java jit.t.t037.t037 + * @run main/othervm jit.t.t037.t037 */ package jit.t.t037; @@ -46,7 +45,7 @@ interface foo void doit(); } -class t037 implements foo +public class t037 implements foo { public static final GoldChecker goldChecker = new GoldChecker( "t037" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java index 8ba0fab425c..7e999415dd7 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t038/t038.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t038.t038 - * @run driver ExecDriver --java jit.t.t038.t038 + * @run main/othervm jit.t.t038.t038 */ package jit.t.t038; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_laload, opc_lastore, opc_lconst_0 -class t038 +public class t038 { public static final GoldChecker goldChecker = new GoldChecker( "t038" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java index ce4ca0b3aa4..a48e51cd1a4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t039/t039.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t039.t039 - * @run driver ExecDriver --java jit.t.t039.t039 + * @run main/othervm jit.t.t039.t039 */ package jit.t.t039; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // opc_lreturn, opc_monitorenter, opc_monitorexit -class t039 +public class t039 { public static final GoldChecker goldChecker = new GoldChecker( "t039" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java index b6390a013b7..3ee452c3404 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t040/t040.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t040.t040 - * @run driver ExecDriver --java jit.t.t040.t040 + * @run main/othervm jit.t.t040.t040 */ package jit.t.t040; @@ -42,7 +41,7 @@ import nsk.share.GoldChecker; // opc_multianewarray -class t040 +public class t040 { public static final GoldChecker goldChecker = new GoldChecker( "t040" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java b/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java index cb7791270dd..dcd810e71ea 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t041/t041.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t041.t041 - * @run driver ExecDriver --java jit.t.t041.t041 + * @run main/othervm jit.t.t041.t041 */ package jit.t.t041; @@ -39,7 +38,7 @@ import nsk.share.TestFailure; // opc_swap -class t041 +public class t041 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java index 9d8f0eb2513..f1db6947173 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t042/t042.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t042.t042 - * @run driver ExecDriver --java jit.t.t042.t042 + * @run main/othervm jit.t.t042.t042 */ package jit.t.t042; @@ -42,7 +41,7 @@ import nsk.share.GoldChecker; // The special little twiddle that occurs when you invoke a method // of an array. -class t042 +public class t042 { public static final GoldChecker goldChecker = new GoldChecker( "t042" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java index d5d9f347fc2..ce2abfb4ff9 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t043/t043.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t043.t043 - * @run driver ExecDriver --java jit.t.t043.t043 + * @run main/othervm jit.t.t043.t043 */ package jit.t.t043; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Register jams and spills -class t043 +public class t043 { public static final GoldChecker goldChecker = new GoldChecker( "t043" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java b/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java index dba9c007966..29c277d4829 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t044/t044.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t044.t044 - * @run driver ExecDriver --java jit.t.t044.t044 + * @run main/othervm jit.t.t044.t044 */ package jit.t.t044; @@ -39,7 +38,7 @@ import nsk.share.TestFailure; // Call interferes with one lazy load but not the other. -class t044 +public class t044 { static double x = 409.0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java b/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java index 2f37a96b413..1fe84be05b8 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t045/t045.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t045.t045 - * @run driver ExecDriver --java jit.t.t045.t045 + * @run main/othervm jit.t.t045.t045 */ package jit.t.t045; @@ -39,7 +38,7 @@ import nsk.share.TestFailure; // Putfield interferes with one lazy load but not the other. -class t045 +public class t045 { static double x = 409.0; static double y; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java index ff595b81fbd..34991b68b64 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t046/t046.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t046.t046 - * @run driver ExecDriver --java jit.t.t046.t046 + * @run main/othervm jit.t.t046.t046 */ package jit.t.t046; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Register jams and spills -class t046 +public class t046 { public static final GoldChecker goldChecker = new GoldChecker( "t046" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java index f44ba40a789..e447dd4992e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t047/t047.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t047.t047 - * @run driver ExecDriver --java jit.t.t047.t047 + * @run main/othervm jit.t.t047.t047 */ package jit.t.t047; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Register jams and spills -class t047 +public class t047 { public static final GoldChecker goldChecker = new GoldChecker( "t047" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java index 3abc9f42d91..24378f8f885 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t048/t048.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t048.t048 - * @run driver ExecDriver --java jit.t.t048.t048 + * @run main/othervm jit.t.t048.t048 */ package jit.t.t048; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Register jams and spills -class t048 +public class t048 { public static final GoldChecker goldChecker = new GoldChecker( "t048" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java index 1d19325cee5..bb0ac8e5cf4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t049/t049.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t049.t049 - * @run driver ExecDriver --java jit.t.t049.t049 + * @run main/othervm jit.t.t049.t049 */ package jit.t.t049; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Register jams and spills -class t049 +public class t049 { public static final GoldChecker goldChecker = new GoldChecker( "t049" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java b/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java index adc3eb4ace0..316187bfa59 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t050/t050.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t050.t050 - * @run driver ExecDriver --java jit.t.t050.t050 + * @run main/othervm jit.t.t050.t050 */ package jit.t.t050; @@ -39,7 +38,7 @@ import nsk.share.TestFailure; // Pending local load clobbered by local store. -class t050 +public class t050 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java index 8cd0d32abe6..075c99a22d4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t051/t051.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t051.t051 - * @run driver ExecDriver --java jit.t.t051.t051 + * @run main/othervm jit.t.t051.t051 */ package jit.t.t051; @@ -39,7 +38,7 @@ package jit.t.t051; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t051 +public class t051 { public static final GoldChecker goldChecker = new GoldChecker( "t051" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java index f3c534f5183..57b82d6bdf8 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t052/t052.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t052.t052 - * @run driver ExecDriver --java jit.t.t052.t052 + * @run main/othervm jit.t.t052.t052 */ package jit.t.t052; @@ -43,7 +42,7 @@ import nsk.share.GoldChecker; // its way in among the tests, it failed because of a failure correctly // to reverse the sense of an integer branch when swapping the operands. -class t052 { +public class t052 { public static final GoldChecker goldChecker = new GoldChecker( "t052" ); static double aa[][],dd[][],x[][],y[][], diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java index c36b239c2dd..fabf8e12529 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t053/t053.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t053.t053 - * @run driver ExecDriver --java jit.t.t053.t053 + * @run main/othervm jit.t.t053.t053 */ package jit.t.t053; @@ -43,7 +42,7 @@ import nsk.share.GoldChecker; // Tomcatv in java, with prints active // -class t053 { +public class t053 { public static final GoldChecker goldChecker = new GoldChecker( "t053" ); static double aa[][],dd[][],x[][],y[][], diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java index 439add7ce39..0c35006c451 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t054/t054.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t054.t054 - * @run driver ExecDriver --java jit.t.t054.t054 + * @run main/othervm jit.t.t054.t054 */ package jit.t.t054; @@ -43,7 +42,7 @@ import nsk.share.GoldChecker; // A more comprehensive test for the tomcatv bug, that being failure // correctly to reverse the sense of a jump. -class t054 +public class t054 { public static final GoldChecker goldChecker = new GoldChecker( "t054" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java index 3d6c64f7f0a..5c64917c432 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t055/t055.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t055.t055 - * @run driver ExecDriver --java jit.t.t055.t055 + * @run main/othervm jit.t.t055.t055 */ package jit.t.t055; @@ -39,7 +38,7 @@ package jit.t.t055; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t055 +public class t055 { public static final GoldChecker goldChecker = new GoldChecker( "t055" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java index 81605c82aed..ab6c99c44d0 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t056/t056.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t056.t056 - * @run driver ExecDriver --java jit.t.t056.t056 + * @run main/othervm jit.t.t056.t056 */ package jit.t.t056; @@ -39,7 +38,7 @@ package jit.t.t056; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t056 +public class t056 { // Routine nest in which exception is thrown and caught in // the fourth routine. diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java index 1509ee6d6b6..cbbb34cf56a 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t057/t057.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t057.t057 - * @run driver ExecDriver --java jit.t.t057.t057 + * @run main/othervm jit.t.t057.t057 */ package jit.t.t057; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Just like t056 except here the exception is not explicitly thrown. -class t057 +public class t057 { public static final GoldChecker goldChecker = new GoldChecker( "t057" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java index fa388d76c3f..0ecac5408ea 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t058/t058.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t058.t058 - * @run driver ExecDriver --java jit.t.t058.t058 + * @run main/othervm jit.t.t058.t058 */ package jit.t.t058; @@ -83,7 +82,7 @@ class k implements l } } -class t058 +public class t058 { public static final GoldChecker goldChecker = new GoldChecker( "t058" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java index 7a07bc0298c..6e057d604c6 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t059/t059.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t059.t059 - * @run driver ExecDriver --java jit.t.t059.t059 + * @run main/othervm jit.t.t059.t059 */ package jit.t.t059; @@ -39,7 +38,7 @@ package jit.t.t059; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t059 +public class t059 { public static final GoldChecker goldChecker = new GoldChecker( "t059" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java index affab1d22d6..8e27e457061 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t060/t060.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t060.t060 - * @run driver ExecDriver --java jit.t.t060.t060 + * @run main/othervm jit.t.t060.t060 */ package jit.t.t060; @@ -39,7 +38,7 @@ package jit.t.t060; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t060 +public class t060 { public static final GoldChecker goldChecker = new GoldChecker( "t060" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java index d7982cb22bb..c4c8c407a80 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t061/t061.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t061.t061 - * @run driver ExecDriver --java jit.t.t061.t061 + * @run main/othervm jit.t.t061.t061 */ package jit.t.t061; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Long and double array loads with variable and constant subscripts. -class t061 +public class t061 { public static final GoldChecker goldChecker = new GoldChecker( "t061" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java index f6515d4d62c..ba65213b278 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t062/t062.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t062.t062 - * @run driver ExecDriver --java jit.t.t062.t062 + * @run main/othervm jit.t.t062.t062 */ package jit.t.t062; @@ -47,7 +46,7 @@ interface l void voodoo(); } -class t062 implements l +public class t062 implements l { public static final GoldChecker goldChecker = new GoldChecker( "t062" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java index df0779adb0b..08fe0994cc4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t063/t063.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t063.t063 - * @run driver ExecDriver --java jit.t.t063.t063 + * @run main/othervm jit.t.t063.t063 */ package jit.t.t063; @@ -39,7 +38,7 @@ package jit.t.t063; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t063 +public class t063 { public static final GoldChecker goldChecker = new GoldChecker( "t063" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java index aee68aef1d1..cb5faa5db30 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t064/t064.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t064.t064 - * @run driver ExecDriver --java jit.t.t064.t064 + * @run main/othervm jit.t.t064.t064 */ package jit.t.t064; @@ -64,7 +63,7 @@ class l } } -class t064 +public class t064 { public static final GoldChecker goldChecker = new GoldChecker( "t064" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java index e120f8bcf79..588aa2d2956 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t065/t065.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t065.t065 - * @run driver ExecDriver --java jit.t.t065.t065 + * @run main/othervm jit.t.t065.t065 */ package jit.t.t065; @@ -64,7 +63,7 @@ class l } } -class t065 +public class t065 { public static final GoldChecker goldChecker = new GoldChecker( "t065" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java b/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java index 5b2dc9f9e8c..fd7b3725447 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t066/t066.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.t.t066.t066 - * @run driver ExecDriver --java jit.t.t066.t066 + * @run main/othervm jit.t.t066.t066 */ package jit.t.t066; @@ -41,7 +40,7 @@ import nsk.share.TestFailure; // offsets on the stores of the two halves of the double // constant. -class t066 +public class t066 { public static void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java index cd5890a9451..5f44d56f6ed 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t067/t067.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t067.t067 - * @run driver ExecDriver --java jit.t.t067.t067 + * @run main/othervm jit.t.t067.t067 */ package jit.t.t067; @@ -39,7 +38,7 @@ package jit.t.t067; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t067 +public class t067 { public static final GoldChecker goldChecker = new GoldChecker( "t067" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java index 320b7db2b08..359fcce291a 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t068/t068.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t068.t068 - * @run driver ExecDriver --java jit.t.t068.t068 + * @run main/othervm jit.t.t068.t068 */ package jit.t.t068; @@ -39,7 +38,7 @@ package jit.t.t068; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t068 +public class t068 { public static final GoldChecker goldChecker = new GoldChecker( "t068" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java index c0c183bf045..3b1f2263754 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t069/t069.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t069.t069 - * @run driver ExecDriver --java jit.t.t069.t069 + * @run main/othervm jit.t.t069.t069 */ package jit.t.t069; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Dup, dup_x2, and dup2_x2. -class t069 +public class t069 { public static final GoldChecker goldChecker = new GoldChecker( "t069" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java index ba67926c901..c8efe911b79 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t070/t070.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t070.t070 - * @run driver ExecDriver --java jit.t.t070.t070 + * @run main/othervm jit.t.t070.t070 */ package jit.t.t070; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Dup, dup_x2, and dup2_x2. -class t070 +public class t070 { public static final GoldChecker goldChecker = new GoldChecker( "t070" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java index 8e08230944b..813da07a39c 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t071/t071.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t071.t071 - * @run driver ExecDriver --java jit.t.t071.t071 + * @run main/othervm jit.t.t071.t071 */ package jit.t.t071; @@ -39,7 +38,7 @@ package jit.t.t071; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t071 +public class t071 { public static final GoldChecker goldChecker = new GoldChecker( "t071" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java index 601d4fd8969..76f7694817b 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t072/t072.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t072.t072 - * @run driver ExecDriver --java jit.t.t072.t072 + * @run main/othervm jit.t.t072.t072 */ package jit.t.t072; @@ -39,7 +38,7 @@ package jit.t.t072; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t072 +public class t072 { public static final GoldChecker goldChecker = new GoldChecker( "t072" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java index e215adbca04..8fef239324e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t073/t073.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t073.t073 - * @run driver ExecDriver --java jit.t.t073.t073 + * @run main/othervm jit.t.t073.t073 */ package jit.t.t073; @@ -39,7 +38,7 @@ package jit.t.t073; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t073{ +public class t073{ public static final GoldChecker goldChecker = new GoldChecker( "t073" ); static int i0 = 0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java index 8c07663e365..a65c703ae9e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t074/t074.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t074.t074 - * @run driver ExecDriver --java jit.t.t074.t074 + * @run main/othervm jit.t.t074.t074 */ package jit.t.t074; @@ -39,7 +38,7 @@ package jit.t.t074; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t074{ +public class t074{ public static final GoldChecker goldChecker = new GoldChecker( "t074" ); static int i0 = 0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java index 85a0b6c9540..9a4d93cda46 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t075/t075.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t075.t075 - * @run driver ExecDriver --java jit.t.t075.t075 + * @run main/othervm jit.t.t075.t075 */ package jit.t.t075; @@ -39,7 +38,7 @@ package jit.t.t075; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t075{ +public class t075{ public static final GoldChecker goldChecker = new GoldChecker( "t075" ); static int i0 = 0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java index 76bdd70fdcb..7ddd4317b4b 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t076/t076.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t076.t076 - * @run driver ExecDriver --java jit.t.t076.t076 + * @run main/othervm jit.t.t076.t076 */ package jit.t.t076; @@ -39,7 +38,7 @@ package jit.t.t076; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t076{ +public class t076{ public static final GoldChecker goldChecker = new GoldChecker( "t076" ); static long i0 = 0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java index 9f8a2f2b1b8..ad7c8dc88c4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t077/t077.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t077.t077 - * @run driver ExecDriver --java jit.t.t077.t077 + * @run main/othervm jit.t.t077.t077 */ package jit.t.t077; @@ -39,7 +38,7 @@ package jit.t.t077; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t077{ +public class t077{ public static final GoldChecker goldChecker = new GoldChecker( "t077" ); static float i0 = 0.0f; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java index 45048e4ab9e..5c15fcf106e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t078/t078.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t078.t078 - * @run driver ExecDriver --java jit.t.t078.t078 + * @run main/othervm jit.t.t078.t078 */ package jit.t.t078; @@ -39,7 +38,7 @@ package jit.t.t078; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t078{ +public class t078{ public static final GoldChecker goldChecker = new GoldChecker( "t078" ); static double i0 = 0.0; diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java index a5a2b078ecb..126420c001d 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t079/t079.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t079.t079 - * @run driver ExecDriver --java jit.t.t079.t079 + * @run main/othervm jit.t.t079.t079 */ package jit.t.t079; @@ -39,7 +38,7 @@ package jit.t.t079; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t079 +public class t079 { public static final GoldChecker goldChecker = new GoldChecker( "t079" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java index 694ef5a3802..b667ec05942 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t080/t080.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t080.t080 - * @run driver ExecDriver --java jit.t.t080.t080 + * @run main/othervm jit.t.t080.t080 */ package jit.t.t080; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Like t079.java except this one has lots of local variables. -class t080 +public class t080 { public static final GoldChecker goldChecker = new GoldChecker( "t080" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java index c087fd07f96..0767b075908 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t081/t081.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t081.t081 - * @run driver ExecDriver --java jit.t.t081.t081 + * @run main/othervm jit.t.t081.t081 */ package jit.t.t081; @@ -39,7 +38,7 @@ package jit.t.t081; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t081 +public class t081 { public static final GoldChecker goldChecker = new GoldChecker( "t081" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java index fc7886b97e0..66110f510ae 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t086/t086.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t086.t086 - * @run driver ExecDriver --java jit.t.t086.t086 + * @run main/othervm jit.t.t086.t086 */ package jit.t.t086; @@ -58,7 +57,7 @@ class foo } } -class t086 +public class t086 { public static final GoldChecker goldChecker = new GoldChecker( "t086" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java index c4bbc7aeaa0..2f2447ff170 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t091/t091.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t091.t091 - * @run driver ExecDriver --java jit.t.t091.t091 + * @run main/othervm jit.t.t091.t091 */ package jit.t.t091; @@ -49,7 +48,7 @@ import nsk.share.GoldChecker; // screwing up the flags in the state[] vector around the wide // instructions. -class t091 +public class t091 { public static final GoldChecker goldChecker = new GoldChecker( "t091" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java index 08f9a41717e..666e69c3b21 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t093/t093.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t093.t093 - * @run driver ExecDriver --java jit.t.t093.t093 + * @run main/othervm jit.t.t093.t093 */ package jit.t.t093; @@ -39,7 +38,7 @@ package jit.t.t093; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t093 +public class t093 { public static final GoldChecker goldChecker = new GoldChecker( "t093" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java index 8fead244030..03712bcacc1 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t094/t094.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t094.t094 - * @run driver ExecDriver --java jit.t.t094.t094 + * @run main/othervm jit.t.t094.t094 */ package jit.t.t094; @@ -39,7 +38,7 @@ package jit.t.t094; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t094 +public class t094 { public static final GoldChecker goldChecker = new GoldChecker( "t094" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java index 4f5a1dd8d50..9b44d7ef085 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t095/t095.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t095.t095 - * @run driver ExecDriver --java jit.t.t095.t095 + * @run main/othervm jit.t.t095.t095 */ package jit.t.t095; @@ -39,7 +38,7 @@ package jit.t.t095; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t095 +public class t095 { public static final GoldChecker goldChecker = new GoldChecker( "t095" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java index fc37d4f1a5c..38e08467911 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t096/t096.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t096.t096 - * @run driver ExecDriver --java jit.t.t096.t096 + * @run main/othervm jit.t.t096.t096 */ package jit.t.t096; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Empty synchronized methods. -class t096 +public class t096 { public static final GoldChecker goldChecker = new GoldChecker( "t096" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java index d89afe96062..3970930d779 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t098/t098.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t098.t098 - * @run driver ExecDriver --java jit.t.t098.t098 + * @run main/othervm jit.t.t098.t098 */ package jit.t.t098; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Check for too-wide intermediate results. -class t098 +public class t098 { public static final GoldChecker goldChecker = new GoldChecker( "t098" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java index 06044a38dc1..e09fa3948f2 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t099/t099.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t099.t099 - * @run driver ExecDriver --java jit.t.t099.t099 + * @run main/othervm jit.t.t099.t099 */ package jit.t.t099; @@ -39,7 +38,7 @@ package jit.t.t099; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t099 +public class t099 { public static final GoldChecker goldChecker = new GoldChecker( "t099" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java index 91a1fd35c9d..22976eb35bf 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t100/t100.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t100.t100 - * @run driver ExecDriver --java jit.t.t100.t100 + * @run main/othervm jit.t.t100.t100 */ package jit.t.t100; @@ -47,7 +46,7 @@ import java.lang.*; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t100 { +public class t100 { public static final GoldChecker goldChecker = new GoldChecker( "t100" ); public static void main(String[] args) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java index cc8e3f5951d..6c32fd2da9c 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t101/t101.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t101.t101 - * @run driver ExecDriver --java jit.t.t101.t101 + * @run main/othervm jit.t.t101.t101 */ package jit.t.t101; @@ -45,7 +44,7 @@ import nsk.share.GoldChecker; // // , which ain't anything Ma Intel understands. -class t101 +public class t101 { public static final GoldChecker goldChecker = new GoldChecker( "t101" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java index c73b15eb220..16af8218a5a 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t102/t102.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t102.t102 - * @run driver ExecDriver --java jit.t.t102.t102 + * @run main/othervm jit.t.t102.t102 */ package jit.t.t102; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Like t101.java except the short intege type is short instead of char. -class t102 +public class t102 { public static final GoldChecker goldChecker = new GoldChecker( "t102" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java index f54a30a76dc..3e96b7c7121 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t103/t103.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t103.t103 - * @run driver ExecDriver --java jit.t.t103.t103 + * @run main/othervm jit.t.t103.t103 */ package jit.t.t103; @@ -41,7 +40,7 @@ import nsk.share.GoldChecker; // Like t101.java except the short intege type is byte instead of char. -class t103 +public class t103 { public static final GoldChecker goldChecker = new GoldChecker( "t103" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java index 999d7a35c12..1b9c5173389 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t104/t104.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t104.t104 - * @run driver ExecDriver --java jit.t.t104.t104 + * @run main/othervm jit.t.t104.t104 */ package jit.t.t104; @@ -39,7 +38,7 @@ package jit.t.t104; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t104 +public class t104 { public static final GoldChecker goldChecker = new GoldChecker( "t104" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java index 631f99492c1..9b9f60cf2a9 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t105/t105.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t105.t105 - * @run driver ExecDriver --java jit.t.t105.t105 + * @run main/othervm jit.t.t105.t105 */ package jit.t.t105; @@ -39,7 +38,7 @@ package jit.t.t105; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t105 +public class t105 { public static final GoldChecker goldChecker = new GoldChecker( "t105" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java index 6169deccd81..a30727543f3 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t106/t106.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t106.t106 - * @run driver ExecDriver --java jit.t.t106.t106 + * @run main/othervm jit.t.t106.t106 */ package jit.t.t106; @@ -39,7 +38,7 @@ package jit.t.t106; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t106 { +public class t106 { public static final GoldChecker goldChecker = new GoldChecker( "t106" ); static public void main(String argv[]) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java index b9d8fd67f51..7b60290cbb2 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t107/t107.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,8 +30,7 @@ * @library /vmTestbase * /test/lib * @run driver jdk.test.lib.FileInstaller . . - * @build jit.t.t107.t107 - * @run driver ExecDriver --java jit.t.t107.t107 + * @run main/othervm jit.t.t107.t107 */ package jit.t.t107; @@ -39,7 +38,7 @@ package jit.t.t107; import nsk.share.TestFailure; import nsk.share.GoldChecker; -class t107 { +public class t107 { public static final GoldChecker goldChecker = new GoldChecker( "t107" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java index 428324fbd8f..f6897ae5517 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t108/t108.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,7 +30,7 @@ import nsk.share.GoldChecker; // Uncaught exception, one jit'd frame on the stack. -class t108 +public class t108 { public static final GoldChecker goldChecker = new GoldChecker( "t108" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java index 7c8683f594f..350dc6eba0e 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t109/t109.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,7 +30,7 @@ import nsk.share.GoldChecker; // Uncaught exception, one jit'd frame on the stack, implicit exception. -class t109 +public class t109 { public static final GoldChecker goldChecker = new GoldChecker( "t109" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java index b5ef1388914..c4980144b83 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t110/t110.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,7 +30,7 @@ import nsk.share.GoldChecker; // Uncaught exception, one jit'd frame on the stack, implicit exception. -class t110 +public class t110 { public static final GoldChecker goldChecker = new GoldChecker( "t110" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java index d0d82716480..9a78ead1a87 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t111/t111.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,7 +30,7 @@ import nsk.share.GoldChecker; // Uncaught exception, one jit'd frame on the stack. -class t111 +public class t111 { public static final GoldChecker goldChecker = new GoldChecker( "t111" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java index 76d422c87fa..32513c7ae40 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t112/t112.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -30,7 +30,7 @@ import nsk.share.GoldChecker; // Uncaught exception, one jit'd frame on the stack. -class t112 +public class t112 { public static final GoldChecker goldChecker = new GoldChecker( "t112" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java index f29ddd99f5b..8d484d81d46 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java +++ b/test/hotspot/jtreg/vmTestbase/jit/t/t113/t113.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -44,7 +44,7 @@ class kid2 extends parent int j; } -class t113 +public class t113 { public static final GoldChecker goldChecker = new GoldChecker( "t113" ); diff --git a/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java b/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java index b9ef01021cf..caf0b7722f4 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java +++ b/test/hotspot/jtreg/vmTestbase/jit/wide/wide01/wide01.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.wide.wide01.wide01 - * @run driver ExecDriver --java jit.wide.wide01.wide01 + * @run main/othervm jit.wide.wide01.wide01 */ package jit.wide.wide01; @@ -45,7 +44,7 @@ import nsk.share.TestFailure; greater-than-double precision. */ -strictfp class wide01 +strictfp public class wide01 { public static void main(String[] arg) { float f1 = Float.MAX_VALUE; diff --git a/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java b/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java index 996875d96da..c7e56463e62 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java +++ b/test/hotspot/jtreg/vmTestbase/jit/wide/wide02/wide02.java @@ -29,8 +29,7 @@ * * @library /vmTestbase * /test/lib - * @build jit.wide.wide02.wide02 - * @run driver ExecDriver --java jit.wide.wide02.wide02 + * @run main/othervm jit.wide.wide02.wide02 */ package jit.wide.wide02; @@ -44,7 +43,7 @@ import nsk.share.TestFailure; or if the result of the expression (d0+d53) is maintained in greater-than-double precision. */ -class wide02 +public class wide02 { static double twoto(int n) { double res = 1.0; From b37b1a391a467d1670fc8c4b236a6c4c5518bef6 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Wed, 5 Aug 2020 16:39:38 -0700 Subject: [PATCH 005/100] 8251126: nsk.share.GoldChecker should read golden file from ${test.src} Reviewed-by: dholmes --- .../vmTestbase/nsk/share/GoldChecker.java | 47 +++++++------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/GoldChecker.java b/test/hotspot/jtreg/vmTestbase/nsk/share/GoldChecker.java index 60821011e2f..6fae81ca7f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/GoldChecker.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/GoldChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, 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 @@ -20,16 +20,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package nsk.share; -import java.io.*; +import jdk.test.lib.Utils; -public class GoldChecker extends AbstractGoldChecker -{ +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; + +public class GoldChecker extends AbstractGoldChecker { private final String goldOutput; - public GoldChecker(String main_class_name) { - goldOutput = readGoldStr(main_class_name + ".gold"); + public GoldChecker(String mainClassName) { + goldOutput = readGoldStr(Path.of(Utils.TEST_SRC, mainClassName + ".gold")); } @Override @@ -37,35 +42,17 @@ public class GoldChecker extends AbstractGoldChecker return goldOutput; } - private String readGoldStr(String gold_file_name) { - RandomAccessFile f; - - try { - f = new RandomAccessFile(gold_file_name, "r"); - } catch (FileNotFoundException e) { - throw new TestBug("Unable to open golden file '" + gold_file_name + "' for reading"); + private String readGoldStr(Path goldenFile) { + if (Files.notExists(goldenFile)) { + throw new TestBug("Unable to open golden file '" + goldenFile + "' for reading"); } - byte[] data; - try { - int len = (int)f.length(); - data = new byte[len]; - f.read(data); + data = Files.readAllBytes(goldenFile); } catch (IOException e) { - throw new TestBug("Error reading from golden file'" + gold_file_name + "'"); - } - - try { - f.close(); - } catch (IOException e) { - } - - try { - return new String(data, "US-ASCII"); - } catch (UnsupportedEncodingException e) { - throw new TestFailure( e ); + throw new TestBug("Error reading from golden file '" + goldenFile + "'", e); } + return new String(data, StandardCharsets.US_ASCII); } } From dc86b2e22bd1ab61f3c22105130a3fb9c0fdf8de Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Wed, 5 Aug 2020 19:05:05 -0700 Subject: [PATCH 006/100] Added tag jdk-16+9 for changeset c075a286cc7d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4e4f1670db5..80e6992d687 100644 --- a/.hgtags +++ b/.hgtags @@ -654,3 +654,4 @@ a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31 c3a4a7ea7c304cabdacdc31741eb94c51351668d jdk-16+7 b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34 0a73d6f3aab48ff6d7e61e47f0bc2d87a054f217 jdk-16+8 +c075a286cc7df767cce28e8057d6ec5051786490 jdk-16+9 From 2d3372c8b5cad126a93f8290ebc18e116748c71f Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Wed, 5 Aug 2020 23:02:22 -0700 Subject: [PATCH 007/100] 8250660: Clarify that WildcardType and AnnotatedWildcardType bounds methods return one Reviewed-by: mchung, dholmes --- .../java/lang/reflect/AnnotatedWildcardType.java | 8 ++++++++ .../share/classes/java/lang/reflect/WildcardType.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java index 8a211eab6bf..b837143712f 100644 --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java @@ -40,6 +40,10 @@ public interface AnnotatedWildcardType extends AnnotatedType { * If no lower bound is explicitly declared, the lower bound is the * type of null. In this case, a zero length array is returned. * + * @apiNote While to date a wildcard may have at most one lower + * bound, callers of this method should be written to accommodate + * multiple bounds. + * * @return the potentially annotated lower bounds of this wildcard type or * an empty array if no lower bound is explicitly declared. * @see WildcardType#getLowerBounds() @@ -51,6 +55,10 @@ public interface AnnotatedWildcardType extends AnnotatedType { * If no upper bound is explicitly declared, the upper bound is * unannotated {@code Object} * + * @apiNote While to date a wildcard may have at most one upper + * bound, callers of this method should be written to accommodate + * multiple bounds. + * * @return the potentially annotated upper bounds of this wildcard type * @see WildcardType#getUpperBounds() */ diff --git a/src/java.base/share/classes/java/lang/reflect/WildcardType.java b/src/java.base/share/classes/java/lang/reflect/WildcardType.java index 0ef18413ea4..124deb41f4c 100644 --- a/src/java.base/share/classes/java/lang/reflect/WildcardType.java +++ b/src/java.base/share/classes/java/lang/reflect/WildcardType.java @@ -46,6 +46,10 @@ public interface WildcardType extends Type { *

  • Otherwise, B is resolved. * * + * @apiNote While to date a wildcard may have at most one upper + * bound, callers of this method should be written to accommodate + * multiple bounds. + * * @return an array of Types representing the upper bound(s) of this * type variable * @throws TypeNotPresentException if any of the @@ -70,6 +74,10 @@ public interface WildcardType extends Type { *
  • Otherwise, B is resolved. * * + * @apiNote While to date a wildcard may have at most one lower + * bound, callers of this method should be written to accommodate + * multiple bounds. + * * @return an array of Types representing the lower bound(s) of this * type variable * @throws TypeNotPresentException if any of the @@ -79,6 +87,4 @@ public interface WildcardType extends Type { * for any reason */ Type[] getLowerBounds(); - // one or many? Up to language spec; currently only one, but this API - // allows for generalization. } From b0e4e9a2e455d3bad45c2d3362fe83ba004b3f96 Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Thu, 6 Aug 2020 08:30:37 -0400 Subject: [PATCH 008/100] 8251192: Shenandoah: Shenandoah build failed after JDK-8235573 Reviewed-by: stuefe, ysuenaga, adityam --- src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp index c354f510c93..e7b6310b5f2 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp @@ -25,6 +25,7 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP +#include "jfr/jfrEvents.hpp" #include "gc/shenandoah/shenandoahNumberSeq.hpp" #include "gc/shared/workerDataArray.hpp" #include "memory/allocation.hpp" From db4d59cc0c96a6658f8eba3d3bc76f74475ce302 Mon Sep 17 00:00:00 2001 From: Chihiro Ito Date: Thu, 6 Aug 2020 23:47:55 +0900 Subject: [PATCH 009/100] 8250912: Recording#copy() doesn't copy the flush interval Reviewed-by: jbachorik --- src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java index 7f1f25d61d5..9965f106a7c 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java @@ -505,6 +505,7 @@ public final class PlatformRecorder { copy.setInternalDuration(r.getDuration()); copy.setStartTime(r.getStartTime()); copy.setStopTime(r.getStopTime()); + copy.setFlushInterval(r.getFlushInterval()); if (r.getState() == RecordingState.NEW) { return newRec; From 99c7b2b85b0d3bd138d4dcad083a6ecf1de30b3d Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Thu, 6 Aug 2020 09:58:57 -0700 Subject: [PATCH 010/100] 8249273: Documentation of BigInteger(String) constructor does not mention leading plus Reviewed-by: bpb --- .../share/classes/java/math/BigInteger.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java index e9fc2d42593..1a73abcf1b7 100644 --- a/src/java.base/share/classes/java/math/BigInteger.java +++ b/src/java.base/share/classes/java/math/BigInteger.java @@ -464,9 +464,10 @@ public class BigInteger extends Number implements Comparable { * specified radix into a BigInteger. The String representation * consists of an optional minus or plus sign followed by a * sequence of one or more digits in the specified radix. The - * character-to-digit mapping is provided by {@code - * Character.digit}. The String may not contain any extraneous - * characters (whitespace, for example). + * character-to-digit mapping is provided by {@link + * Character#digit(char, char) Character.digit}. The String may + * not contain any extraneous characters (whitespace, for + * example). * * @param val String representation of BigInteger. * @param radix radix to be used in interpreting {@code val}. @@ -474,7 +475,6 @@ public class BigInteger extends Number implements Comparable { * of a BigInteger in the specified radix, or {@code radix} is * outside the range from {@link Character#MIN_RADIX} to * {@link Character#MAX_RADIX}, inclusive. - * @see Character#digit */ public BigInteger(String val, int radix) { int cursor = 0, numDigits; @@ -658,17 +658,17 @@ public class BigInteger extends Number implements Comparable { } /** - * Translates the decimal String representation of a BigInteger into a - * BigInteger. The String representation consists of an optional minus - * sign followed by a sequence of one or more decimal digits. The - * character-to-digit mapping is provided by {@code Character.digit}. - * The String may not contain any extraneous characters (whitespace, for - * example). + * Translates the decimal String representation of a BigInteger + * into a BigInteger. The String representation consists of an + * optional minus or plus sign followed by a sequence of one or + * more decimal digits. The character-to-digit mapping is + * provided by {@link Character#digit(char, char) + * Character.digit}. The String may not contain any extraneous + * characters (whitespace, for example). * * @param val decimal String representation of BigInteger. * @throws NumberFormatException {@code val} is not a valid representation * of a BigInteger. - * @see Character#digit */ public BigInteger(String val) { this(val, 10); From deaadfad5247026206a0c8c3068656bff7f68128 Mon Sep 17 00:00:00 2001 From: Lois Foltan Date: Thu, 6 Aug 2020 18:13:56 +0000 Subject: [PATCH 011/100] 8247938: Change various JVM enums like LinkInfo::AccessCheck and Klass::DefaultsLookupMode to enum class Use C++11 scoped enumeration declarations for several different Klass and LinkInfo enumerations. Reviewed-by: coleenp, hseigel, kbarrett --- src/hotspot/share/ci/ciEnv.cpp | 2 +- src/hotspot/share/ci/ciMethod.cpp | 4 +-- src/hotspot/share/classfile/javaClasses.cpp | 2 +- src/hotspot/share/classfile/verifier.cpp | 4 +-- src/hotspot/share/code/dependencies.cpp | 6 ++-- .../share/interpreter/linkResolver.cpp | 20 +++++++------ .../share/interpreter/linkResolver.hpp | 13 ++++----- src/hotspot/share/jvmci/jvmciJavaClasses.cpp | 4 +-- src/hotspot/share/jvmci/jvmciRuntime.cpp | 2 +- src/hotspot/share/oops/arrayKlass.cpp | 2 +- src/hotspot/share/oops/arrayKlass.hpp | 2 +- src/hotspot/share/oops/instanceKlass.cpp | 29 ++++++++++--------- src/hotspot/share/oops/instanceKlass.hpp | 2 +- src/hotspot/share/oops/klass.hpp | 12 ++++---- src/hotspot/share/oops/klassVtable.cpp | 14 +++++---- src/hotspot/share/prims/methodHandles.cpp | 6 ++-- src/hotspot/share/prims/nativeLookup.cpp | 2 +- 17 files changed, 66 insertions(+), 60 deletions(-) diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp index 6bee64931c3..15bea52565a 100644 --- a/src/hotspot/share/ci/ciEnv.cpp +++ b/src/hotspot/share/ci/ciEnv.cpp @@ -761,7 +761,7 @@ Method* ciEnv::lookup_method(ciInstanceKlass* accessor, InstanceKlass* accessor_klass = accessor->get_instanceKlass(); Klass* holder_klass = holder->get_Klass(); Method* dest_method; - LinkInfo link_info(holder_klass, name, sig, accessor_klass, LinkInfo::needs_access_check, tag); + LinkInfo link_info(holder_klass, name, sig, accessor_klass, LinkInfo::AccessCheck::required, tag); switch (bc) { case Bytecodes::_invokestatic: dest_method = diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp index d771be8dac2..7b2a0fad32b 100644 --- a/src/hotspot/share/ci/ciMethod.cpp +++ b/src/hotspot/share/ci/ciMethod.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, 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 @@ -809,7 +809,7 @@ ciMethod* ciMethod::resolve_invoke(ciKlass* caller, ciKlass* exact_receiver, boo Symbol* h_signature = signature()->get_symbol(); LinkInfo link_info(resolved, h_name, h_signature, caller_klass, - check_access ? LinkInfo::needs_access_check : LinkInfo::skip_access_check); + check_access ? LinkInfo::AccessCheck::required : LinkInfo::AccessCheck::skip); Method* m = NULL; // Only do exact lookup if receiver klass has been linked. Otherwise, // the vtable has not been setup, and the LinkResolver will fail. diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 393e325b3d3..2e0d93e1859 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -3237,7 +3237,7 @@ oop java_lang_reflect_RecordComponent::create(InstanceKlass* holder, RecordCompo char* sig = NEW_RESOURCE_ARRAY(char, sig_len); jio_snprintf(sig, sig_len, "%c%c%s", JVM_SIGNATURE_FUNC, JVM_SIGNATURE_ENDFUNC, type->as_C_string()); TempNewSymbol full_sig = SymbolTable::new_symbol(sig); - accessor_method = holder->find_instance_method(name, full_sig, Klass::find_private); + accessor_method = holder->find_instance_method(name, full_sig, Klass::PrivateLookupMode::find); } if (accessor_method != NULL) { diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp index 7f0346608a6..15d46af56b2 100644 --- a/src/hotspot/share/classfile/verifier.cpp +++ b/src/hotspot/share/classfile/verifier.cpp @@ -2116,7 +2116,7 @@ bool ClassVerifier::is_protected_access(InstanceKlass* this_class, InstanceKlass* target_instance = InstanceKlass::cast(target_class); fieldDescriptor fd; if (is_method) { - Method* m = target_instance->uncached_lookup_method(field_name, field_sig, Klass::find_overpass); + Method* m = target_instance->uncached_lookup_method(field_name, field_sig, Klass::OverpassLookupMode::find); if (m != NULL && m->is_protected()) { if (!this_class->is_same_class_package(m->method_holder())) { return true; @@ -2709,7 +2709,7 @@ void ClassVerifier::verify_invoke_init( Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method( vmSymbols::object_initializer_name(), cp->signature_ref_at(bcs->get_index_u2()), - Klass::find_overpass); + Klass::OverpassLookupMode::find); // Do nothing if method is not found. Let resolution detect the error. if (m != NULL) { InstanceKlass* mh = m->method_holder(); diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp index 04cfbc90058..ff1956d5c5d 100644 --- a/src/hotspot/share/code/dependencies.cpp +++ b/src/hotspot/share/code/dependencies.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020, 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 @@ -1197,7 +1197,7 @@ class ClassHierarchyWalker { } else { // Search class hierarchy first, skipping private implementations // as they never override any inherited methods - Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature, Klass::skip_private); + Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature, Klass::PrivateLookupMode::skip); if (!Dependencies::is_concrete_method(m, k)) { // Check for re-abstraction of method if (!k->is_interface() && m != NULL && m->is_abstract()) { @@ -1207,7 +1207,7 @@ class ClassHierarchyWalker { ClassHierarchyWalker wf(_participants, _num_participants); Klass* w = wf.find_witness_subtype(k); if (w != NULL) { - Method* wm = InstanceKlass::cast(w)->find_instance_method(_name, _signature, Klass::skip_private); + Method* wm = InstanceKlass::cast(w)->find_instance_method(_name, _signature, Klass::PrivateLookupMode::skip); if (!Dependencies::is_concrete_method(wm, w)) { // Found a concrete subtype 'w' which does not override abstract method 'm'. // Bail out because 'm' could be called with 'w' as receiver (leading to an diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp index d8e01e80d2e..c2e01eecf2f 100644 --- a/src/hotspot/share/interpreter/linkResolver.cpp +++ b/src/hotspot/share/interpreter/linkResolver.cpp @@ -328,7 +328,7 @@ Method* LinkResolver::lookup_method_in_klasses(const LinkInfo& link_info, Symbol* signature = link_info.signature(); // Ignore overpasses so statics can be found during resolution - Method* result = klass->uncached_lookup_method(name, signature, Klass::skip_overpass); + Method* result = klass->uncached_lookup_method(name, signature, Klass::OverpassLookupMode::skip); if (klass->is_array_klass()) { // Only consider klass and super klass for arrays @@ -377,11 +377,11 @@ Method* LinkResolver::lookup_instance_method_in_klasses(Klass* klass, Symbol* name, Symbol* signature, Klass::PrivateLookupMode private_mode, TRAPS) { - Method* result = klass->uncached_lookup_method(name, signature, Klass::find_overpass, private_mode); + Method* result = klass->uncached_lookup_method(name, signature, Klass::OverpassLookupMode::find, private_mode); while (result != NULL && result->is_static() && result->method_holder()->super() != NULL) { Klass* super_klass = result->method_holder()->super(); - result = super_klass->uncached_lookup_method(name, signature, Klass::find_overpass, private_mode); + result = super_klass->uncached_lookup_method(name, signature, Klass::OverpassLookupMode::find, private_mode); } if (klass->is_array_klass()) { @@ -410,8 +410,10 @@ int LinkResolver::vtable_index_of_interface_method(Klass* klass, // First check in default method array if (!resolved_method->is_abstract() && ik->default_methods() != NULL) { int index = InstanceKlass::find_method_index(ik->default_methods(), - name, signature, Klass::find_overpass, - Klass::find_static, Klass::find_private); + name, signature, + Klass::OverpassLookupMode::find, + Klass::StaticLookupMode::find, + Klass::PrivateLookupMode::find); if (index >= 0 ) { vtable_index = ik->default_vtable_indices()->at(index); } @@ -430,7 +432,7 @@ Method* LinkResolver::lookup_method_in_interfaces(const LinkInfo& cp_info) { // Specify 'true' in order to skip default methods when searching the // interfaces. Function lookup_method_in_klasses() already looked for // the method in the default methods table. - return ik->lookup_method_in_all_interfaces(cp_info.name(), cp_info.signature(), Klass::skip_defaults); + return ik->lookup_method_in_all_interfaces(cp_info.name(), cp_info.signature(), Klass::DefaultsLookupMode::skip); } Method* LinkResolver::lookup_polymorphic_method(const LinkInfo& link_info, @@ -1087,7 +1089,7 @@ void LinkResolver::resolve_static_call(CallInfo& result, // Use updated LinkInfo to reresolve with resolved method holder LinkInfo new_info(resolved_klass, link_info.name(), link_info.signature(), link_info.current_klass(), - link_info.check_access() ? LinkInfo::needs_access_check : LinkInfo::skip_access_check); + link_info.check_access() ? LinkInfo::AccessCheck::required : LinkInfo::AccessCheck::skip); resolved_method = linktime_resolve_static_method(new_info, CHECK); } @@ -1236,7 +1238,7 @@ void LinkResolver::runtime_resolve_special_method(CallInfo& result, Method* instance_method = lookup_instance_method_in_klasses(super_klass, resolved_method->name(), resolved_method->signature(), - Klass::find_private, CHECK); + Klass::PrivateLookupMode::find, CHECK); sel_method = methodHandle(THREAD, instance_method); // check if found @@ -1478,7 +1480,7 @@ void LinkResolver::runtime_resolve_interface_method(CallInfo& result, Method* method = lookup_instance_method_in_klasses(recv_klass, resolved_method->name(), resolved_method->signature(), - Klass::skip_private, CHECK); + Klass::PrivateLookupMode::skip, CHECK); selected_method = methodHandle(THREAD, method); if (selected_method.is_null() && !check_null_and_abstract) { diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp index a139a8e7a23..96e65f1fac2 100644 --- a/src/hotspot/share/interpreter/linkResolver.hpp +++ b/src/hotspot/share/interpreter/linkResolver.hpp @@ -144,28 +144,25 @@ class LinkInfo : public StackObj { constantTag _tag; public: - enum AccessCheck { - needs_access_check, - skip_access_check - }; + enum class AccessCheck { required, skip }; LinkInfo(const constantPoolHandle& pool, int index, const methodHandle& current_method, TRAPS); LinkInfo(const constantPoolHandle& pool, int index, TRAPS); // Condensed information from other call sites within the vm. LinkInfo(Klass* resolved_klass, Symbol* name, Symbol* signature, Klass* current_klass, - AccessCheck check_access = needs_access_check, + AccessCheck check_access = AccessCheck::required, constantTag tag = JVM_CONSTANT_Invalid) : _name(name), _signature(signature), _resolved_klass(resolved_klass), _current_klass(current_klass), _current_method(methodHandle()), - _check_access(check_access == needs_access_check), _tag(tag) {} + _check_access(check_access == AccessCheck::required), _tag(tag) {} LinkInfo(Klass* resolved_klass, Symbol* name, Symbol* signature, const methodHandle& current_method, - AccessCheck check_access = needs_access_check, + AccessCheck check_access = AccessCheck::required, constantTag tag = JVM_CONSTANT_Invalid) : _name(name), _signature(signature), _resolved_klass(resolved_klass), _current_klass(current_method->method_holder()), _current_method(current_method), - _check_access(check_access == needs_access_check), _tag(tag) {} + _check_access(check_access == AccessCheck::required), _tag(tag) {} // Case where we just find the method and don't check access against the current class LinkInfo(Klass* resolved_klass, Symbol*name, Symbol* signature) : diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp index 770265f3c1e..4ca4d7cbde0 100644 --- a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp +++ b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -89,7 +89,7 @@ void HotSpotJVMCI::compute_offset(int &dest_offset, Klass* klass, const char* na #ifndef PRODUCT static void check_resolve_method(const char* call_type, Klass* resolved_klass, Symbol* method_name, Symbol* method_signature, TRAPS) { Method* method; - LinkInfo link_info(resolved_klass, method_name, method_signature, NULL, LinkInfo::skip_access_check); + LinkInfo link_info(resolved_klass, method_name, method_signature, NULL, LinkInfo::AccessCheck::skip); if (strcmp(call_type, "call_static") == 0) { method = LinkResolver::resolve_static_call_or_null(link_info); } else if (strcmp(call_type, "call_virtual") == 0) { diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp index 84392e4c430..f4bda1ebd7a 100644 --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp @@ -1322,7 +1322,7 @@ Method* JVMCIRuntime::lookup_method(InstanceKlass* accessor, assert(check_klass_accessibility(accessor, holder), "holder not accessible"); Method* dest_method; - LinkInfo link_info(holder, name, sig, accessor, LinkInfo::needs_access_check, tag); + LinkInfo link_info(holder, name, sig, accessor, LinkInfo::AccessCheck::required, tag); switch (bc) { case Bytecodes::_invokestatic: dest_method = diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp index 0c116801874..1fdcd175198 100644 --- a/src/hotspot/share/oops/arrayKlass.cpp +++ b/src/hotspot/share/oops/arrayKlass.cpp @@ -79,7 +79,7 @@ Method* ArrayKlass::uncached_lookup_method(const Symbol* name, // Always ignore overpass methods in superclasses, although technically the // super klass of an array, (j.l.Object) should not have // any overpass methods present. - return super()->uncached_lookup_method(name, signature, Klass::skip_overpass, private_mode); + return super()->uncached_lookup_method(name, signature, OverpassLookupMode::skip, private_mode); } ArrayKlass::ArrayKlass(Symbol* name, KlassID id) : diff --git a/src/hotspot/share/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp index 5839a630d54..913d2174b0f 100644 --- a/src/hotspot/share/oops/arrayKlass.hpp +++ b/src/hotspot/share/oops/arrayKlass.hpp @@ -85,7 +85,7 @@ class ArrayKlass: public Klass { Method* uncached_lookup_method(const Symbol* name, const Symbol* signature, OverpassLookupMode overpass_mode, - PrivateLookupMode private_mode = find_private) const; + PrivateLookupMode private_mode = PrivateLookupMode::find) const; static ArrayKlass* cast(Klass* k) { return const_cast(cast(const_cast(k))); diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index a0f8f3eb7c8..feadda0017d 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -1769,7 +1769,10 @@ inline int InstanceKlass::quick_search(const Array* methods, const Symb // find_method looks up the name/signature in the local methods array Method* InstanceKlass::find_method(const Symbol* name, const Symbol* signature) const { - return find_method_impl(name, signature, find_overpass, find_static, find_private); + return find_method_impl(name, signature, + OverpassLookupMode::find, + StaticLookupMode::find, + PrivateLookupMode::find); } Method* InstanceKlass::find_method_impl(const Symbol* name, @@ -1794,8 +1797,8 @@ Method* InstanceKlass::find_instance_method(const Array* methods, Method* const meth = InstanceKlass::find_method_impl(methods, name, signature, - find_overpass, - skip_static, + OverpassLookupMode::find, + StaticLookupMode::skip, private_mode); assert(((meth == NULL) || !meth->is_static()), "find_instance_method should have skipped statics"); @@ -1853,9 +1856,9 @@ Method* InstanceKlass::find_method(const Array* methods, return InstanceKlass::find_method_impl(methods, name, signature, - find_overpass, - find_static, - find_private); + OverpassLookupMode::find, + StaticLookupMode::find, + PrivateLookupMode::find); } Method* InstanceKlass::find_method_impl(const Array* methods, @@ -1898,9 +1901,9 @@ int InstanceKlass::find_method_index(const Array* methods, OverpassLookupMode overpass_mode, StaticLookupMode static_mode, PrivateLookupMode private_mode) { - const bool skipping_overpass = (overpass_mode == skip_overpass); - const bool skipping_static = (static_mode == skip_static); - const bool skipping_private = (private_mode == skip_private); + const bool skipping_overpass = (overpass_mode == OverpassLookupMode::skip); + const bool skipping_static = (static_mode == StaticLookupMode::skip); + const bool skipping_private = (private_mode == PrivateLookupMode::skip); const int hit = quick_search(methods, name); if (hit != -1) { const Method* const m = methods->at(hit); @@ -1976,13 +1979,13 @@ Method* InstanceKlass::uncached_lookup_method(const Symbol* name, Method* const method = InstanceKlass::cast(klass)->find_method_impl(name, signature, overpass_local_mode, - find_static, + StaticLookupMode::find, private_mode); if (method != NULL) { return method; } klass = klass->super(); - overpass_local_mode = skip_overpass; // Always ignore overpass methods in superclasses + overpass_local_mode = OverpassLookupMode::skip; // Always ignore overpass methods in superclasses } return NULL; } @@ -2012,7 +2015,7 @@ Method* InstanceKlass::lookup_method_in_ordered_interfaces(Symbol* name, } // Look up interfaces if (m == NULL) { - m = lookup_method_in_all_interfaces(name, signature, find_defaults); + m = lookup_method_in_all_interfaces(name, signature, DefaultsLookupMode::find); } return m; } @@ -2030,7 +2033,7 @@ Method* InstanceKlass::lookup_method_in_all_interfaces(Symbol* name, ik = all_ifs->at(i); Method* m = ik->lookup_method(name, signature); if (m != NULL && m->is_public() && !m->is_static() && - ((defaults_mode != skip_defaults) || !m->is_default_method())) { + ((defaults_mode != DefaultsLookupMode::skip) || !m->is_default_method())) { return m; } } diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp index b1894200fc1..a4ce90ab882 100644 --- a/src/hotspot/share/oops/instanceKlass.hpp +++ b/src/hotspot/share/oops/instanceKlass.hpp @@ -662,7 +662,7 @@ public: Method* uncached_lookup_method(const Symbol* name, const Symbol* signature, OverpassLookupMode overpass_mode, - PrivateLookupMode private_mode = find_private) const; + PrivateLookupMode private_mode = PrivateLookupMode::find) const; // lookup a method in all the interfaces that this class implements // (returns NULL if not found) diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp index 103c82ea6d2..b7f1579d648 100644 --- a/src/hotspot/share/oops/klass.hpp +++ b/src/hotspot/share/oops/klass.hpp @@ -196,10 +196,10 @@ protected: public: int id() { return _id; } - enum DefaultsLookupMode { find_defaults, skip_defaults }; - enum OverpassLookupMode { find_overpass, skip_overpass }; - enum StaticLookupMode { find_static, skip_static }; - enum PrivateLookupMode { find_private, skip_private }; + enum class DefaultsLookupMode { find, skip }; + enum class OverpassLookupMode { find, skip }; + enum class StaticLookupMode { find, skip }; + enum class PrivateLookupMode { find, skip }; virtual bool is_klass() const { return true; } @@ -482,10 +482,10 @@ protected: virtual Klass* find_field(Symbol* name, Symbol* signature, fieldDescriptor* fd) const; virtual Method* uncached_lookup_method(const Symbol* name, const Symbol* signature, OverpassLookupMode overpass_mode, - PrivateLookupMode = find_private) const; + PrivateLookupMode = PrivateLookupMode::find) const; public: Method* lookup_method(const Symbol* name, const Symbol* signature) const { - return uncached_lookup_method(name, signature, find_overpass); + return uncached_lookup_method(name, signature, OverpassLookupMode::find); } // array class with specific rank diff --git a/src/hotspot/share/oops/klassVtable.cpp b/src/hotspot/share/oops/klassVtable.cpp index b1cda7452fa..e2dcaf413b3 100644 --- a/src/hotspot/share/oops/klassVtable.cpp +++ b/src/hotspot/share/oops/klassVtable.cpp @@ -692,7 +692,7 @@ bool klassVtable::needs_new_vtable_entry(const methodHandle& target_method, // this check for all access permissions. const InstanceKlass *sk = InstanceKlass::cast(super); if (sk->has_miranda_methods()) { - if (sk->lookup_method_in_all_interfaces(name, signature, Klass::find_defaults) != NULL) { + if (sk->lookup_method_in_all_interfaces(name, signature, Klass::DefaultsLookupMode::find) != NULL) { return false; // found a matching miranda; we do not need a new entry } } @@ -797,7 +797,9 @@ bool klassVtable::is_miranda(Method* m, Array* class_methods, // First look in local methods to see if already covered if (InstanceKlass::find_local_method(class_methods, name, signature, - Klass::find_overpass, Klass::skip_static, Klass::skip_private) != NULL) + Klass::OverpassLookupMode::find, + Klass::StaticLookupMode::skip, + Klass::PrivateLookupMode::skip) != NULL) { return false; } @@ -817,7 +819,9 @@ bool klassVtable::is_miranda(Method* m, Array* class_methods, for (const Klass* cursuper = super; cursuper != NULL; cursuper = cursuper->super()) { Method* found_mth = InstanceKlass::cast(cursuper)->find_local_method(name, signature, - Klass::find_overpass, Klass::skip_static, Klass::skip_private); + Klass::OverpassLookupMode::find, + Klass::StaticLookupMode::skip, + Klass::PrivateLookupMode::skip); // Ignore non-public methods in java.lang.Object if klass is an interface. if (found_mth != NULL && (!is_interface || !SystemDictionary::is_nonpublic_Object_method(found_mth))) { @@ -861,7 +865,7 @@ void klassVtable::add_new_mirandas_to_lists( if (is_miranda(im, class_methods, default_methods, super, is_interface)) { // is it a miranda at all? const InstanceKlass *sk = InstanceKlass::cast(super); // check if it is a duplicate of a super's miranda - if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::find_defaults) == NULL) { + if (sk->lookup_method_in_all_interfaces(im->name(), im->signature(), Klass::DefaultsLookupMode::find) == NULL) { new_mirandas->append(im); } if (all_mirandas != NULL) { @@ -1213,7 +1217,7 @@ void klassItable::initialize_itable_for_interface(int method_table_offset, Insta // Invokespecial does not perform selection based on the receiver, so it does not use // the cached itable. target = LinkResolver::lookup_instance_method_in_klasses(_klass, m->name(), m->signature(), - Klass::skip_private, CHECK); + Klass::PrivateLookupMode::skip, CHECK); } if (target == NULL || !target->is_public() || target->is_abstract() || target->is_overpass()) { assert(target == NULL || !target->is_overpass() || target->is_public(), diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp index ba373616273..a5241f124ab 100644 --- a/src/hotspot/share/prims/methodHandles.cpp +++ b/src/hotspot/share/prims/methodHandles.cpp @@ -745,8 +745,8 @@ Handle MethodHandles::resolve_MemberName(Handle mname, Klass* caller, if (type == NULL) return empty; // no such signature exists in the VM LinkInfo::AccessCheck access_check = caller != NULL ? - LinkInfo::needs_access_check : - LinkInfo::skip_access_check; + LinkInfo::AccessCheck::required : + LinkInfo::AccessCheck::skip; // Time to do the lookup. switch (flags & ALL_KINDS) { @@ -819,7 +819,7 @@ Handle MethodHandles::resolve_MemberName(Handle mname, Klass* caller, fieldDescriptor result; // find_field initializes fd if found { assert(!HAS_PENDING_EXCEPTION, ""); - LinkInfo link_info(defc, name, type, caller, LinkInfo::skip_access_check); + LinkInfo link_info(defc, name, type, caller, LinkInfo::AccessCheck::skip); LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD); if (HAS_PENDING_EXCEPTION) { if (speculative_resolve) { diff --git a/src/hotspot/share/prims/nativeLookup.cpp b/src/hotspot/share/prims/nativeLookup.cpp index dad4ceb87ca..9e3e96f2953 100644 --- a/src/hotspot/share/prims/nativeLookup.cpp +++ b/src/hotspot/share/prims/nativeLookup.cpp @@ -438,7 +438,7 @@ address NativeLookup::base_library_lookup(const char* class_name, const char* me // Find method and invoke standard lookup methodHandle method (THREAD, - klass->uncached_lookup_method(m_name, s_name, Klass::find_overpass)); + klass->uncached_lookup_method(m_name, s_name, Klass::OverpassLookupMode::find)); address result = lookup(method, in_base_library, CATCH); assert(in_base_library, "must be in basic library"); guarantee(result != NULL, "must be non NULL"); From 9886b7e9e9f3ef7c2e08586dee030a4fb5a8a908 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Thu, 6 Aug 2020 13:14:15 -0700 Subject: [PATCH 012/100] 8248879: SA core file support on OSX has some bugs trying to locate the jvm libraries Reviewed-by: sspitsyn, amenkov --- .../macosx/native/libsaproc/ps_core.c | 157 ++++++++++-------- 1 file changed, 91 insertions(+), 66 deletions(-) diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c index 229abedadad..d06b53351b5 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "libproc_impl.h" #include "ps_core_common.h" @@ -335,86 +336,110 @@ err: return false; } -/**local function **/ -bool exists(const char *fname) { +static bool exists(const char *fname) { return access(fname, F_OK) == 0; } -// we check: 1. lib -// 2. lib/server -// 3. jre/lib -// 4. jre/lib/server -// from: 1. exe path -// 2. JAVA_HOME -// 3. DYLD_LIBRARY_PATH +// reverse strstr() +static char* rstrstr(const char *str, const char *sub) { + char *result = NULL; + for (char *p = strstr(str, sub); p != NULL; p = strstr(p + 1, sub)) { + result = p; + } + return result; +} + +// Check if exists in the directory of . +// Note and already have '/' prepended. +static bool get_real_path_jdk_subdir(char* rpath, char* filename, char* jdk_dir, char* jdk_subdir) { + char filepath[BUF_SIZE]; + strncpy(filepath, jdk_dir, BUF_SIZE); + filepath[BUF_SIZE - 1] = '\0'; // just in case jdk_dir didn't fit + strncat(filepath, jdk_subdir, BUF_SIZE - 1 - strlen(filepath)); + strncat(filepath, filename, BUF_SIZE - 1 - strlen(filepath)); + if (exists(filepath)) { + strcpy(rpath, filepath); + return true; + } + return false; +} + +// Look for in various subdirs of . +static bool get_real_path_jdk_dir(char* rpath, char* filename, char* jdk_dir) { + if (get_real_path_jdk_subdir(rpath, filename, jdk_dir, "/lib")) { + return true; + } + if (get_real_path_jdk_subdir(rpath, filename, jdk_dir, "/lib/server")) { + return true; + } + if (get_real_path_jdk_subdir(rpath, filename, jdk_dir, "/jre/lib")) { + return true; + } + if (get_real_path_jdk_subdir(rpath, filename, jdk_dir, "/jre/lib/server")) { + return true; + } + return false; +} + +// Get the file specified by rpath. We check various directories for it. static bool get_real_path(struct ps_prochandle* ph, char *rpath) { - /** check if they exist in JAVA ***/ char* execname = ph->core->exec_path; - char filepath[4096]; - char* filename = strrchr(rpath, '/'); // like /libjvm.dylib + char jdk_dir[BUF_SIZE]; + char* posbin; + char* filename = strrchr(rpath, '/'); // like /libjvm.dylib if (filename == NULL) { return false; } - char* posbin = strstr(execname, "/bin/java"); + // First look for the library in 3 places where the JDK might be located. For each of + // these 3 potential JDK locations we look in lib, lib/server, jre/lib, and jre/lib/server. + + posbin = rstrstr(execname, "/bin/java"); if (posbin != NULL) { - memcpy(filepath, execname, posbin - execname); // not include trailing '/' - filepath[posbin - execname] = '\0'; - } else { - char* java_home = getenv("JAVA_HOME"); - if (java_home != NULL) { - strcpy(filepath, java_home); - } else { - char* dyldpath = getenv("DYLD_LIBRARY_PATH"); - char* save_ptr; - char* dypath = strtok_r(dyldpath, ":", &save_ptr); - while (dypath != NULL) { - strcpy(filepath, dypath); - strcat(filepath, filename); - if (exists(filepath)) { - strcpy(rpath, filepath); - return true; - } - dypath = strtok_r(NULL, ":", &save_ptr); - } - // not found - return false; + strncpy(jdk_dir, execname, posbin - execname); + jdk_dir[posbin - execname] = '\0'; + if (get_real_path_jdk_dir(rpath, filename, jdk_dir)) { + return true; } } - // for exec and java_home, jdkpath now is filepath - size_t filepath_base_size = strlen(filepath); - // first try /lib/ and /lib/server - strcat(filepath, "/lib"); - strcat(filepath, filename); - if (exists(filepath)) { - strcpy(rpath, filepath); - return true; - } - char* pos = strstr(filepath, filename); // like /libjvm.dylib - *pos = '\0'; - strcat(filepath, "/server"); - strcat(filepath, filename); - if (exists(filepath)) { - strcpy(rpath, filepath); - return true; + char* java_home = getenv("JAVA_HOME"); + if (java_home != NULL) { + if (get_real_path_jdk_dir(rpath, filename, java_home)) { + return true; + } } - // then try /jre/lib/ and /jre/lib/server - filepath[filepath_base_size] = '\0'; - strcat(filepath, "/jre/lib"); - strcat(filepath, filename); - if (exists(filepath)) { - strcpy(rpath, filepath); - return true; + // Look for bin directory in path. This is useful when attaching to a core file + // that was launched with a JDK tool other than "java". + posbin = rstrstr(execname, "/bin/"); // look for the last occurence of "/bin/" + if (posbin != NULL) { + strncpy(jdk_dir, execname, posbin - execname); + jdk_dir[posbin - execname] = '\0'; + if (get_real_path_jdk_dir(rpath, filename, jdk_dir)) { + return true; + } } - pos = strstr(filepath, filename); - *pos = '\0'; - strcat(filepath, "/server"); - strcat(filepath, filename); - if (exists(filepath)) { - strcpy(rpath, filepath); - return true; + + // If we didn't find the library in any of the 3 above potential JDK locations, then look in + // DYLD_LIBRARY_PATH. This is where user libraries might be. We don't treat these + // paths as JDK paths, so we don't append the various JDK subdirs like lib/server. + // However, that doesn't preclude JDK libraries from actually being in one of the paths. + char* dyldpath = getenv("DYLD_LIBRARY_PATH"); + if (dyldpath != NULL) { + char* save_ptr; + char filepath[BUF_SIZE]; + char* dypath = strtok_r(dyldpath, ":", &save_ptr); + while (dypath != NULL) { + strncpy(filepath, dypath, BUF_SIZE); + filepath[BUF_SIZE - 1] = '\0'; // just in case dypath didn't fit + strncat(filepath, filename, BUF_SIZE - 1 - strlen(filepath)); + if (exists(filepath)) { + strcpy(rpath, filepath); + return true; + } + dypath = strtok_r(NULL, ":", &save_ptr); + } } return false; @@ -563,13 +588,13 @@ struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) { ph->core->exec_fd = -1; ph->core->interp_fd = -1; - print_debug("exec: %s core: %s", exec_file, core_file); + print_debug("exec: %s core: %s\n", exec_file, core_file); strncpy(ph->core->exec_path, exec_file, sizeof(ph->core->exec_path)); // open the core file if ((ph->core->core_fd = open(core_file, O_RDONLY)) < 0) { - print_error("can't open core file\n"); + print_error("can't open core file: %s\n", strerror(errno)); goto err; } From c02b75705fa2ffe9825f65d6dd671a0e7ea473ef Mon Sep 17 00:00:00 2001 From: Leonid Mesnik Date: Thu, 6 Aug 2020 13:29:15 -0700 Subject: [PATCH 013/100] 8161684: [testconf] Add VerifyOops' testing into compiler tiers Reviewed-by: kvn --- test/jtreg-ext/requires/VMProps.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 59fd751416a..948f0b92da1 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -380,6 +380,11 @@ public class VMProps implements Callable> { return "false"; } + if (WB.getBooleanVMFlag("VerifyOops")) { + // Should be enabled when JDK-8209961 is fixed + return "false"; + } + switch (GC.selected()) { case Serial: case Parallel: From 111ba18ac6334103909757b71dcf83e8f93f6020 Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Thu, 6 Aug 2020 15:59:47 -0700 Subject: [PATCH 014/100] 8249550: jdb should use loopback address when not using remote agent Reviewed-by: cjplummer, sspitsyn --- .../share/classes/com/sun/tools/jdi/SocketTransportService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java index c62128bc442..e57ae4ff032 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketTransportService.java @@ -314,7 +314,7 @@ public class SocketTransportService extends TransportService { * Listen on the default address */ public ListenKey startListening() throws IOException { - return startListening(null, 0); + return startListening(null); } /** From c202bd705e829c158cd337b63f154ec5fe0ea92e Mon Sep 17 00:00:00 2001 From: David Holmes Date: Thu, 6 Aug 2020 21:03:18 -0400 Subject: [PATCH 015/100] 8250606: Remove unnecessary assertions in ObjectSynchronizer FastHashcode and inflate Reviewed-by: dcubed, coleenp --- src/hotspot/share/runtime/synchronizer.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp index 688d49b5521..9a92fca6130 100644 --- a/src/hotspot/share/runtime/synchronizer.cpp +++ b/src/hotspot/share/runtime/synchronizer.cpp @@ -1017,15 +1017,6 @@ intptr_t ObjectSynchronizer::FastHashCode(Thread* self, oop obj) { } } - // hashCode() is a heap mutator ... - // Relaxing assertion for bug 6320749. - assert(Universe::verify_in_progress() || DumpSharedSpaces || - !SafepointSynchronize::is_at_safepoint(), "invariant"); - assert(Universe::verify_in_progress() || DumpSharedSpaces || - self->is_Java_thread() , "invariant"); - assert(Universe::verify_in_progress() || DumpSharedSpaces || - ((JavaThread *)self)->thread_state() != _thread_blocked, "invariant"); - while (true) { ObjectMonitor* monitor = NULL; markWord temp, test; @@ -1807,11 +1798,6 @@ void ObjectSynchronizer::inflate_helper(oop obj) { ObjectMonitor* ObjectSynchronizer::inflate(Thread* self, oop object, const InflateCause cause) { - // Inflate mutates the heap ... - // Relaxing assertion for bug 6320749. - assert(Universe::verify_in_progress() || - !SafepointSynchronize::is_at_safepoint(), "invariant"); - EventJavaMonitorInflate event; for (;;) { From db46b297faa308ce476363fa798931ac1d7be144 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Thu, 6 Aug 2020 18:21:21 -0700 Subject: [PATCH 016/100] 8251121: six SA tests leave core files behind on macOS Reviewed-by: dholmes, dcubed --- .../jtreg/serviceability/sa/ClhsdbCDSCore.java | 1 - test/lib/jdk/test/lib/util/CoreUtils.java | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java index 107d0cd2e06..2d0013250b6 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java @@ -174,7 +174,6 @@ public class ClhsdbCDSCore { } private static void cleanup() { - if (coreFileName != null) remove(coreFileName); remove(SHARED_ARCHIVE_NAME); } diff --git a/test/lib/jdk/test/lib/util/CoreUtils.java b/test/lib/jdk/test/lib/util/CoreUtils.java index a48465f1e37..c189aad2dae 100644 --- a/test/lib/jdk/test/lib/util/CoreUtils.java +++ b/test/lib/jdk/test/lib/util/CoreUtils.java @@ -107,8 +107,20 @@ public class CoreUtils { // Find the core file String coreFileLocation = parseCoreFileLocationFromOutput(crashOutputString); if (coreFileLocation != null) { - Asserts.assertGT(new File(coreFileLocation).length(), 0L, "Unexpected core size"); System.out.println("Found core file: " + coreFileLocation); + Asserts.assertGT(new File(coreFileLocation).length(), 0L, "Unexpected core size"); + + // Make sure the core file is moved into the cwd if not already there. + Path corePath = Paths.get(coreFileLocation); + if (corePath.getParent() != null) { + Path coreFileName = corePath.getFileName(); + System.out.println("Moving core file to cwd: " + coreFileName); + long startTime = System.currentTimeMillis(); + Files.move(corePath, coreFileName); + System.out.println("Core file move took " + (System.currentTimeMillis() - startTime) + "ms"); + coreFileLocation = coreFileName.toString(); + } + return coreFileLocation; // success! } From d02e7d55e82c2aa02c9221938ed20bb5d10519ef Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Thu, 6 Aug 2020 18:23:21 -0700 Subject: [PATCH 017/100] 8251272: Typo in java.util.Formatter: "Numberic" should be "Numeric" Reviewed-by: bchristi, naoto, jlaskey --- src/java.base/share/classes/java/util/Formatter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java index 327f910e4b1..184bd0bc124 100644 --- a/src/java.base/share/classes/java/util/Formatter.java +++ b/src/java.base/share/classes/java/util/Formatter.java @@ -277,7 +277,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * * * - *

    For category General, Character, Numberic, + *

    For category General, Character, Numeric, * Integral and Date/Time conversion, unless otherwise specified, * if the argument arg is {@code null}, then the result is "{@code null}". * @@ -703,7 +703,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * methods such as {@link String#format(String,Object...) String.format} and * {@link java.io.PrintStream#printf(String,Object...) PrintStream.printf}. * - *

    For category General, Character, Numberic, + *

    For category General, Character, Numeric, * Integral and Date/Time conversion, unless otherwise specified, * if the argument arg is {@code null}, then the result is "{@code null}". * From ef86f06c424316f6b9fc3ac27ce0dc3284a57c62 Mon Sep 17 00:00:00 2001 From: Leo Jiang Date: Fri, 7 Aug 2020 01:48:31 +0000 Subject: [PATCH 018/100] 8250665: Wrong translation for the month name of May in ar_JO,LB,SY Reviewed-by: naoto --- .../sun/text/resources/ext/FormatData_ar_JO.java | 6 +++--- .../sun/text/resources/ext/FormatData_ar_LB.java | 6 +++--- .../sun/text/resources/ext/FormatData_ar_SY.java | 8 ++++---- test/jdk/sun/text/resources/LocaleData | 14 +++++++------- test/jdk/sun/text/resources/LocaleDataTest.java | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java index 81211d18cfa..2517cd8feee 100644 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -56,7 +56,7 @@ public class FormatData_ar_JO extends ParallelListResourceBundle { "\u0634\u0628\u0627\u0637", // february "\u0622\u0630\u0627\u0631", // march "\u0646\u064a\u0633\u0627\u0646", // april - "\u0646\u0648\u0627\u0631", // may + "\u0623\u064a\u0627\u0631", // may "\u062d\u0632\u064a\u0631\u0627\u0646", // june "\u062a\u0645\u0648\u0632", // july "\u0622\u0628", // august @@ -73,7 +73,7 @@ public class FormatData_ar_JO extends ParallelListResourceBundle { "\u0634\u0628\u0627\u0637", // abb february "\u0622\u0630\u0627\u0631", // abb march "\u0646\u064a\u0633\u0627\u0646", // abb april - "\u0646\u0648\u0627\u0631", // abb may + "\u0623\u064a\u0627\u0631", // abb may "\u062d\u0632\u064a\u0631\u0627\u0646", // abb june "\u062a\u0645\u0648\u0632", // abb july "\u0622\u0628", // abb august diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java index 48e2dbcddd4..b66c937c796 100644 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -56,7 +56,7 @@ public class FormatData_ar_LB extends ParallelListResourceBundle { "\u0634\u0628\u0627\u0637", // february "\u0622\u0630\u0627\u0631", // march "\u0646\u064a\u0633\u0627\u0646", // april - "\u0646\u0648\u0627\u0631", // may + "\u0623\u064a\u0627\u0631", // may "\u062d\u0632\u064a\u0631\u0627\u0646", // june "\u062a\u0645\u0648\u0632", // july "\u0622\u0628", // august @@ -73,7 +73,7 @@ public class FormatData_ar_LB extends ParallelListResourceBundle { "\u0634\u0628\u0627\u0637", // abb february "\u0622\u0630\u0627\u0631", // abb march "\u0646\u064a\u0633\u0627\u0646", // abb april - "\u0646\u0648\u0627\u0631", // abb may + "\u0623\u064a\u0627\u0631", // abb may "\u062d\u0632\u064a\u0631\u0627\u0646", // abb june "\u062a\u0645\u0648\u0632", // abb july "\u0622\u0628", // abb august diff --git a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java index 5f8bbca8a24..6b903349e0b 100644 --- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -56,8 +56,8 @@ public class FormatData_ar_SY extends ParallelListResourceBundle { "\u0634\u0628\u0627\u0637", // february "\u0622\u0630\u0627\u0631", // march "\u0646\u064a\u0633\u0627\u0646", // april - "\u0646\u0648\u0627\u0631\u0627\u0646", // may - "\u062d\u0632\u064a\u0631", // june + "\u0623\u064a\u0627\u0631", // may + "\u062d\u0632\u064a\u0631\u0627\u0646", // june "\u062a\u0645\u0648\u0632", // july "\u0622\u0628", // august "\u0623\u064a\u0644\u0648\u0644", // september @@ -73,7 +73,7 @@ public class FormatData_ar_SY extends ParallelListResourceBundle { "\u0634\u0628\u0627\u0637", // abb february "\u0622\u0630\u0627\u0631", // abb march "\u0646\u064a\u0633\u0627\u0646", // abb april - "\u0646\u0648\u0627\u0631", // abb may + "\u0623\u064a\u0627\u0631", // abb may "\u062d\u0632\u064a\u0631\u0627\u0646", // abb june "\u062a\u0645\u0648\u0632", // abb july "\u0622\u0628", // abb august diff --git a/test/jdk/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData index 3aefd36382c..54989fc24f1 100644 --- a/test/jdk/sun/text/resources/LocaleData +++ b/test/jdk/sun/text/resources/LocaleData @@ -1187,7 +1187,7 @@ FormatData/ar_JO/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\ FormatData/ar_JO/MonthNames/1=\u0634\u0628\u0627\u0637 FormatData/ar_JO/MonthNames/2=\u0622\u0630\u0627\u0631 FormatData/ar_JO/MonthNames/3=\u0646\u064a\u0633\u0627\u0646 -FormatData/ar_JO/MonthNames/4=\u0646\u0648\u0627\u0631 +FormatData/ar_JO/MonthNames/4=\u0623\u064a\u0627\u0631 FormatData/ar_JO/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646 FormatData/ar_JO/MonthNames/6=\u062a\u0645\u0648\u0632 FormatData/ar_JO/MonthNames/7=\u0622\u0628 @@ -1200,7 +1200,7 @@ FormatData/ar_JO/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u064 FormatData/ar_JO/MonthAbbreviations/1=\u0634\u0628\u0627\u0637 FormatData/ar_JO/MonthAbbreviations/2=\u0622\u0630\u0627\u0631 FormatData/ar_JO/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646 -FormatData/ar_JO/MonthAbbreviations/4=\u0646\u0648\u0627\u0631 +FormatData/ar_JO/MonthAbbreviations/4=\u0623\u064a\u0627\u0631 FormatData/ar_JO/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646 FormatData/ar_JO/MonthAbbreviations/6=\u062a\u0645\u0648\u0632 FormatData/ar_JO/MonthAbbreviations/7=\u0622\u0628 @@ -1363,7 +1363,7 @@ FormatData/ar_LB/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\ FormatData/ar_LB/MonthNames/1=\u0634\u0628\u0627\u0637 FormatData/ar_LB/MonthNames/2=\u0622\u0630\u0627\u0631 FormatData/ar_LB/MonthNames/3=\u0646\u064a\u0633\u0627\u0646 -FormatData/ar_LB/MonthNames/4=\u0646\u0648\u0627\u0631 +FormatData/ar_LB/MonthNames/4=\u0623\u064a\u0627\u0631 FormatData/ar_LB/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646 FormatData/ar_LB/MonthNames/6=\u062a\u0645\u0648\u0632 FormatData/ar_LB/MonthNames/7=\u0622\u0628 @@ -1376,7 +1376,7 @@ FormatData/ar_LB/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u064 FormatData/ar_LB/MonthAbbreviations/1=\u0634\u0628\u0627\u0637 FormatData/ar_LB/MonthAbbreviations/2=\u0622\u0630\u0627\u0631 FormatData/ar_LB/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646 -FormatData/ar_LB/MonthAbbreviations/4=\u0646\u0648\u0627\u0631 +FormatData/ar_LB/MonthAbbreviations/4=\u0623\u064a\u0627\u0631 FormatData/ar_LB/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646 FormatData/ar_LB/MonthAbbreviations/6=\u062a\u0645\u0648\u0632 FormatData/ar_LB/MonthAbbreviations/7=\u0622\u0628 @@ -1980,8 +1980,8 @@ FormatData/ar_SY/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\ FormatData/ar_SY/MonthNames/1=\u0634\u0628\u0627\u0637 FormatData/ar_SY/MonthNames/2=\u0622\u0630\u0627\u0631 FormatData/ar_SY/MonthNames/3=\u0646\u064a\u0633\u0627\u0646 -FormatData/ar_SY/MonthNames/4=\u0646\u0648\u0627\u0631\u0627\u0646 -FormatData/ar_SY/MonthNames/5=\u062d\u0632\u064a\u0631 +FormatData/ar_SY/MonthNames/4=\u0623\u064a\u0627\u0631 +FormatData/ar_SY/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646 FormatData/ar_SY/MonthNames/6=\u062a\u0645\u0648\u0632 FormatData/ar_SY/MonthNames/7=\u0622\u0628 FormatData/ar_SY/MonthNames/8=\u0623\u064a\u0644\u0648\u0644 @@ -1993,7 +1993,7 @@ FormatData/ar_SY/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u064 FormatData/ar_SY/MonthAbbreviations/1=\u0634\u0628\u0627\u0637 FormatData/ar_SY/MonthAbbreviations/2=\u0622\u0630\u0627\u0631 FormatData/ar_SY/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646 -FormatData/ar_SY/MonthAbbreviations/4=\u0646\u0648\u0627\u0631 +FormatData/ar_SY/MonthAbbreviations/4=\u0623\u064a\u0627\u0631 FormatData/ar_SY/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646 FormatData/ar_SY/MonthAbbreviations/6=\u062a\u0645\u0648\u0632 FormatData/ar_SY/MonthAbbreviations/7=\u0622\u0628 diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java index d23aa3ef60d..8cb88df3097 100644 --- a/test/jdk/sun/text/resources/LocaleDataTest.java +++ b/test/jdk/sun/text/resources/LocaleDataTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 @@ -39,7 +39,7 @@ * 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916 * 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918 * 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746 - * 8209775 8221432 8227127 8230284 8231273 8233579 8234288 + * 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 * @summary Verify locale data * @modules java.base/sun.util.resources * @modules jdk.localedata From 12879e91b43798750f9c7656dacc5085dd20cc96 Mon Sep 17 00:00:00 2001 From: Gabriel Reid Date: Fri, 7 Aug 2020 04:21:57 +0200 Subject: [PATCH 019/100] 8250928: JFR: Improve hash algorithm for stack traces Reviewed-by: egahlin --- src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp index 92ebf3265c2..aae8054125e 100644 --- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp +++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp @@ -240,6 +240,7 @@ bool JfrStackTrace::record_safe(JavaThread* thread, int skip) { vfs.next(); } + _hash = 1; while (!vfs.at_end()) { if (count >= _max_frames) { _reached_root = false; @@ -255,8 +256,9 @@ bool JfrStackTrace::record_safe(JavaThread* thread, int skip) { else { bci = vfs.bci(); } - // Can we determine if it's inlined? - _hash = (_hash << 2) + (unsigned int)(((size_t)mid >> 2) + (bci << 4) + type); + _hash = (_hash * 31) + mid; + _hash = (_hash * 31) + bci; + _hash = (_hash * 31) + type; _frames[count] = JfrStackFrame(mid, bci, type, method->method_holder()); vfs.next(); count++; From 555f0e6e2ad24dfdd34558d3d43d922516b63525 Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Thu, 6 Aug 2020 20:56:46 -0700 Subject: [PATCH 020/100] Added tag jdk-16+10 for changeset b01985b4f88f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 80e6992d687..ce18503274c 100644 --- a/.hgtags +++ b/.hgtags @@ -655,3 +655,4 @@ c3a4a7ea7c304cabdacdc31741eb94c51351668d jdk-16+7 b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34 0a73d6f3aab48ff6d7e61e47f0bc2d87a054f217 jdk-16+8 c075a286cc7df767cce28e8057d6ec5051786490 jdk-16+9 +b01985b4f88f554f97901e53e1ba314681dd9c19 jdk-16+10 From c148c2c1764ff1272986fd6fdfcdb64c576abc16 Mon Sep 17 00:00:00 2001 From: Dong Bo Date: Fri, 7 Aug 2020 12:35:30 +0800 Subject: [PATCH 021/100] 8165404: AArch64: Implement SHA512 accelerator/intrinsic Reviewed-by: aph --- src/hotspot/cpu/aarch64/aarch64-asmtest.py | 37 +- src/hotspot/cpu/aarch64/assembler_aarch64.cpp | 2401 +++++++++-------- src/hotspot/cpu/aarch64/assembler_aarch64.hpp | 24 + .../cpu/aarch64/stubGenerator_aarch64.cpp | 170 ++ .../cpu/aarch64/vm_version_aarch64.cpp | 12 +- 5 files changed, 1446 insertions(+), 1198 deletions(-) diff --git a/src/hotspot/cpu/aarch64/aarch64-asmtest.py b/src/hotspot/cpu/aarch64/aarch64-asmtest.py index ddfc715b5d7..651b816c420 100644 --- a/src/hotspot/cpu/aarch64/aarch64-asmtest.py +++ b/src/hotspot/cpu/aarch64/aarch64-asmtest.py @@ -865,6 +865,37 @@ class LdStSIMDOp(Instruction): def aname(self): return self._name +class SHA512SIMDOp(Instruction): + + def generate(self): + if (self._name == 'sha512su0'): + self.reg = [FloatRegister().generate(), FloatRegister().generate()] + else: + self.reg = [FloatRegister().generate(), FloatRegister().generate(), + FloatRegister().generate()] + return self + + def cstr(self): + if (self._name == 'sha512su0'): + return (super(SHA512SIMDOp, self).cstr() + + ('%s, __ T2D, %s);' % (self.reg[0], self.reg[1]))) + else: + return (super(SHA512SIMDOp, self).cstr() + + ('%s, __ T2D, %s, %s);' % (self.reg[0], self.reg[1], self.reg[2]))) + + def astr(self): + if (self._name == 'sha512su0'): + return (super(SHA512SIMDOp, self).astr() + + ('\t%s.2D, %s.2D' % (self.reg[0].astr("v"), self.reg[1].astr("v")))) + elif (self._name == 'sha512su1'): + return (super(SHA512SIMDOp, self).astr() + + ('\t%s.2D, %s.2D, %s.2D' % (self.reg[0].astr("v"), + self.reg[1].astr("v"), self.reg[2].astr("v")))) + else: + return (super(SHA512SIMDOp, self).astr() + + ('\t%s, %s, %s.2D' % (self.reg[0].astr("q"), + self.reg[1].astr("q"), self.reg[2].astr("v")))) + class LSEOp(Instruction): def __init__(self, args): self._name, self.asmname, self.size, self.suffix = args @@ -1100,6 +1131,8 @@ generate(LdStSIMDOp, [["ld1", 1, "8B", Address.base_only], ["ld4r", 4, "2S", Address.post_reg], ]) +generate(SHA512SIMDOp, ["sha512h", "sha512h2", "sha512su0", "sha512su1"]) + generate(SpecialCases, [["ccmn", "__ ccmn(zr, zr, 3u, Assembler::LE);", "ccmn\txzr, xzr, #3, LE"], ["ccmnw", "__ ccmnw(zr, zr, 5u, Assembler::EQ);", "ccmn\twzr, wzr, #5, EQ"], ["ccmp", "__ ccmp(zr, 1, 4u, Assembler::NE);", "ccmp\txzr, 1, #4, NE"], @@ -1147,8 +1180,8 @@ outfile.close() import subprocess import sys -# compile for 8.1 because of lse atomics -subprocess.check_call([AARCH64_AS, "-march=armv8.1-a", "aarch64ops.s", "-o", "aarch64ops.o"]) +# compile for 8.1 and sha2 because of lse atomics and sha512 crypto extension. +subprocess.check_call([AARCH64_AS, "-march=armv8.1-a+sha2", "aarch64ops.s", "-o", "aarch64ops.o"]) print print "/*", diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp index 3c0fb466190..977dd289056 100644 --- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp @@ -96,662 +96,668 @@ void entry(CodeBuffer *cb) { __ bind(back); // ArithOp - __ add(r15, r12, r16, Assembler::LSR, 30); // add x15, x12, x16, LSR #30 - __ sub(r1, r15, r3, Assembler::LSR, 32); // sub x1, x15, x3, LSR #32 - __ adds(r13, r25, r5, Assembler::LSL, 13); // adds x13, x25, x5, LSL #13 - __ subs(r22, r28, r6, Assembler::ASR, 17); // subs x22, x28, x6, ASR #17 - __ addw(r0, r9, r22, Assembler::ASR, 6); // add w0, w9, w22, ASR #6 - __ subw(r19, r3, r25, Assembler::LSL, 21); // sub w19, w3, w25, LSL #21 - __ addsw(r4, r19, r11, Assembler::LSL, 20); // adds w4, w19, w11, LSL #20 - __ subsw(r24, r7, r19, Assembler::ASR, 0); // subs w24, w7, w19, ASR #0 - __ andr(r30, r7, r11, Assembler::LSL, 48); // and x30, x7, x11, LSL #48 - __ orr(r24, r8, r15, Assembler::LSL, 12); // orr x24, x8, x15, LSL #12 - __ eor(r17, r9, r23, Assembler::LSL, 1); // eor x17, x9, x23, LSL #1 - __ ands(r14, r11, r4, Assembler::LSR, 55); // ands x14, x11, x4, LSR #55 - __ andw(r19, r7, r12, Assembler::LSR, 17); // and w19, w7, w12, LSR #17 - __ orrw(r19, r27, r11, Assembler::ASR, 28); // orr w19, w27, w11, ASR #28 - __ eorw(r30, r3, r22, Assembler::LSR, 31); // eor w30, w3, w22, LSR #31 - __ andsw(r19, r26, r28, Assembler::ASR, 0); // ands w19, w26, w28, ASR #0 - __ bic(r29, r6, r26, Assembler::LSL, 51); // bic x29, x6, x26, LSL #51 - __ orn(r26, r27, r17, Assembler::LSL, 35); // orn x26, x27, x17, LSL #35 - __ eon(r21, r4, r14, Assembler::LSL, 5); // eon x21, x4, x14, LSL #5 - __ bics(r2, r15, r0, Assembler::ASR, 5); // bics x2, x15, x0, ASR #5 - __ bicw(r2, r7, r2, Assembler::LSL, 29); // bic w2, w7, w2, LSL #29 - __ ornw(r24, r12, r21, Assembler::LSR, 5); // orn w24, w12, w21, LSR #5 - __ eonw(r30, r15, r19, Assembler::LSL, 2); // eon w30, w15, w19, LSL #2 - __ bicsw(r30, r23, r17, Assembler::ASR, 28); // bics w30, w23, w17, ASR #28 + __ add(r4, r3, r0, Assembler::LSR, 9); // add x4, x3, x0, LSR #9 + __ sub(r8, r29, r4, Assembler::LSL, 17); // sub x8, x29, x4, LSL #17 + __ adds(r7, r27, r23, Assembler::LSL, 17); // adds x7, x27, x23, LSL #17 + __ subs(r6, r15, r9, Assembler::LSR, 41); // subs x6, x15, x9, LSR #41 + __ addw(r12, r3, r16, Assembler::ASR, 23); // add w12, w3, w16, ASR #23 + __ subw(r8, r24, r29, Assembler::LSR, 31); // sub w8, w24, w29, LSR #31 + __ addsw(r7, r28, r15, Assembler::LSL, 7); // adds w7, w28, w15, LSL #7 + __ subsw(r26, r15, r28, Assembler::LSR, 13); // subs w26, w15, w28, LSR #13 + __ andr(r1, r8, r2, Assembler::ASR, 28); // and x1, x8, x2, ASR #28 + __ orr(r19, r27, r12, Assembler::LSR, 10); // orr x19, x27, x12, LSR #10 + __ eor(r4, r11, r10, Assembler::LSR, 59); // eor x4, x11, x10, LSR #59 + __ ands(r5, r17, r2, Assembler::LSL, 28); // ands x5, x17, x2, LSL #28 + __ andw(r28, r15, r12, Assembler::LSR, 13); // and w28, w15, w12, LSR #13 + __ orrw(r14, r21, r25, Assembler::LSR, 16); // orr w14, w21, w25, LSR #16 + __ eorw(r13, r16, r0, Assembler::LSR, 4); // eor w13, w16, w0, LSR #4 + __ andsw(r30, r26, r16, Assembler::LSR, 19); // ands w30, w26, w16, LSR #19 + __ bic(r12, r23, r25, Assembler::LSR, 21); // bic x12, x23, x25, LSR #21 + __ orn(r11, r5, r1, Assembler::LSR, 8); // orn x11, x5, x1, LSR #8 + __ eon(r6, r17, r5, Assembler::ASR, 54); // eon x6, x17, x5, ASR #54 + __ bics(r30, r19, r15, Assembler::ASR, 50); // bics x30, x19, x15, ASR #50 + __ bicw(r15, r6, r27, Assembler::LSR, 6); // bic w15, w6, w27, LSR #6 + __ ornw(r22, r3, r6, Assembler::ASR, 4); // orn w22, w3, w6, ASR #4 + __ eonw(r2, r4, r23, Assembler::ASR, 5); // eon w2, w4, w23, ASR #5 + __ bicsw(r2, r5, r30, Assembler::ASR, 19); // bics w2, w5, w30, ASR #19 // AddSubImmOp - __ addw(r4, r20, 660u); // add w4, w20, #660 - __ addsw(r2, r10, 710u); // adds w2, w10, #710 - __ subw(r19, r26, 244u); // sub w19, w26, #244 - __ subsw(r28, r13, 73u); // subs w28, w13, #73 - __ add(r2, r30, 862u); // add x2, x30, #862 - __ adds(r27, r16, 574u); // adds x27, x16, #574 - __ sub(r22, r9, 589u); // sub x22, x9, #589 - __ subs(r4, r1, 698u); // subs x4, x1, #698 + __ addw(r12, r16, 900u); // add w12, w16, #900 + __ addsw(r11, r8, 680u); // adds w11, w8, #680 + __ subw(r8, r7, 44u); // sub w8, w7, #44 + __ subsw(r8, r15, 994u); // subs w8, w15, #994 + __ add(r0, r26, 9u); // add x0, x26, #9 + __ adds(r27, r18, 929u); // adds x27, x18, #929 + __ sub(r18, r8, 300u); // sub x18, x8, #300 + __ subs(r20, r13, 583u); // subs x20, x13, #583 // LogicalImmOp - __ andw(r28, r19, 4294709247ull); // and w28, w19, #0xfffc0fff - __ orrw(r27, r5, 536870910ull); // orr w27, w5, #0x1ffffffe - __ eorw(r30, r20, 4294840319ull); // eor w30, w20, #0xfffe0fff - __ andsw(r22, r26, 4294959615ull); // ands w22, w26, #0xffffe1ff - __ andr(r5, r7, 4194300ull); // and x5, x7, #0x3ffffc - __ orr(r13, r7, 18014398509481728ull); // orr x13, x7, #0x3fffffffffff00 - __ eor(r7, r9, 18442240474082197503ull); // eor x7, x9, #0xfff0000000003fff - __ ands(r3, r0, 18374686479671656447ull); // ands x3, x0, #0xff00000000007fff + __ andw(r29, r19, 8388600ull); // and w29, w19, #0x7ffff8 + __ orrw(r14, r3, 4294965263ull); // orr w14, w3, #0xfffff80f + __ eorw(r14, r29, 1048576ull); // eor w14, w29, #0x100000 + __ andsw(r24, r17, 134217216ull); // ands w24, w17, #0x7fffe00 + __ andr(r17, r3, 13835058603964235903ull); // and x17, x3, #0xc000007fc000007f + __ orr(r7, r14, 18158513714670600195ull); // orr x7, x14, #0xfc000003fc000003 + __ eor(r5, r26, 17870287719452639231ull); // eor x5, x26, #0xf80003ffffffffff + __ ands(r26, r21, 9205357640488583168ull); // ands x26, x21, #0x7fc000007fc00000 // AbsOp - __ b(__ pc()); // b . - __ b(back); // b back - __ b(forth); // b forth - __ bl(__ pc()); // bl . - __ bl(back); // bl back - __ bl(forth); // bl forth + __ b(__ pc()); // b . + __ b(back); // b back + __ b(forth); // b forth + __ bl(__ pc()); // bl . + __ bl(back); // bl back + __ bl(forth); // bl forth // RegAndAbsOp - __ cbzw(r16, __ pc()); // cbz w16, . - __ cbzw(r16, back); // cbz w16, back - __ cbzw(r16, forth); // cbz w16, forth - __ cbnzw(r19, __ pc()); // cbnz w19, . - __ cbnzw(r19, back); // cbnz w19, back - __ cbnzw(r19, forth); // cbnz w19, forth - __ cbz(r5, __ pc()); // cbz x5, . - __ cbz(r5, back); // cbz x5, back - __ cbz(r5, forth); // cbz x5, forth - __ cbnz(r4, __ pc()); // cbnz x4, . - __ cbnz(r4, back); // cbnz x4, back - __ cbnz(r4, forth); // cbnz x4, forth - __ adr(r27, __ pc()); // adr x27, . - __ adr(r27, back); // adr x27, back - __ adr(r27, forth); // adr x27, forth - __ _adrp(r16, __ pc()); // adrp x16, . + __ cbzw(r0, __ pc()); // cbz w0, . + __ cbzw(r0, back); // cbz w0, back + __ cbzw(r0, forth); // cbz w0, forth + __ cbnzw(r11, __ pc()); // cbnz w11, . + __ cbnzw(r11, back); // cbnz w11, back + __ cbnzw(r11, forth); // cbnz w11, forth + __ cbz(r21, __ pc()); // cbz x21, . + __ cbz(r21, back); // cbz x21, back + __ cbz(r21, forth); // cbz x21, forth + __ cbnz(r8, __ pc()); // cbnz x8, . + __ cbnz(r8, back); // cbnz x8, back + __ cbnz(r8, forth); // cbnz x8, forth + __ adr(r11, __ pc()); // adr x11, . + __ adr(r11, back); // adr x11, back + __ adr(r11, forth); // adr x11, forth + __ _adrp(r0, __ pc()); // adrp x0, . // RegImmAbsOp - __ tbz(r28, 8, __ pc()); // tbz x28, #8, . - __ tbz(r28, 8, back); // tbz x28, #8, back - __ tbz(r28, 8, forth); // tbz x28, #8, forth - __ tbnz(r1, 1, __ pc()); // tbnz x1, #1, . - __ tbnz(r1, 1, back); // tbnz x1, #1, back - __ tbnz(r1, 1, forth); // tbnz x1, #1, forth + __ tbz(r5, 2, __ pc()); // tbz x5, #2, . + __ tbz(r5, 2, back); // tbz x5, #2, back + __ tbz(r5, 2, forth); // tbz x5, #2, forth + __ tbnz(r22, 4, __ pc()); // tbnz x22, #4, . + __ tbnz(r22, 4, back); // tbnz x22, #4, back + __ tbnz(r22, 4, forth); // tbnz x22, #4, forth // MoveWideImmOp - __ movnw(r20, 8639, 16); // movn w20, #8639, lsl 16 - __ movzw(r7, 25835, 0); // movz w7, #25835, lsl 0 - __ movkw(r17, 7261, 0); // movk w17, #7261, lsl 0 - __ movn(r14, 2097, 32); // movn x14, #2097, lsl 32 - __ movz(r9, 16082, 0); // movz x9, #16082, lsl 0 - __ movk(r19, 13962, 16); // movk x19, #13962, lsl 16 + __ movnw(r22, 11702, 16); // movn w22, #11702, lsl 16 + __ movzw(r20, 27561, 16); // movz w20, #27561, lsl 16 + __ movkw(r30, 30436, 0); // movk w30, #30436, lsl 0 + __ movn(r27, 29470, 32); // movn x27, #29470, lsl 32 + __ movz(r1, 7779, 48); // movz x1, #7779, lsl 48 + __ movk(r9, 3765, 16); // movk x9, #3765, lsl 16 // BitfieldOp - __ sbfm(r9, r22, 6, 22); // sbfm x9, x22, #6, #22 - __ bfmw(r19, r0, 11, 0); // bfm w19, w0, #11, #0 - __ ubfmw(r10, r19, 11, 19); // ubfm w10, w19, #11, #19 - __ sbfm(r4, r15, 5, 17); // sbfm x4, x15, #5, #17 - __ bfm(r3, r5, 19, 28); // bfm x3, x5, #19, #28 - __ ubfm(r12, r28, 17, 2); // ubfm x12, x28, #17, #2 + __ sbfm(r28, r28, 21, 28); // sbfm x28, x28, #21, #28 + __ bfmw(r15, r4, 8, 2); // bfm w15, w4, #8, #2 + __ ubfmw(r21, r9, 23, 16); // ubfm w21, w9, #23, #16 + __ sbfm(r14, r27, 26, 21); // sbfm x14, x27, #26, #21 + __ bfm(r19, r6, 28, 29); // bfm x19, x6, #28, #29 + __ ubfm(r11, r22, 16, 2); // ubfm x11, x22, #16, #2 // ExtractOp - __ extrw(r15, r0, r22, 3); // extr w15, w0, w22, #3 - __ extr(r6, r14, r14, 55); // extr x6, x14, x14, #55 + __ extrw(r7, r22, r1, 28); // extr w7, w22, w1, #28 + __ extr(r21, r27, r14, 54); // extr x21, x27, x14, #54 // CondBranchOp - __ br(Assembler::EQ, __ pc()); // b.EQ . - __ br(Assembler::EQ, back); // b.EQ back - __ br(Assembler::EQ, forth); // b.EQ forth - __ br(Assembler::NE, __ pc()); // b.NE . - __ br(Assembler::NE, back); // b.NE back - __ br(Assembler::NE, forth); // b.NE forth - __ br(Assembler::HS, __ pc()); // b.HS . - __ br(Assembler::HS, back); // b.HS back - __ br(Assembler::HS, forth); // b.HS forth - __ br(Assembler::CS, __ pc()); // b.CS . - __ br(Assembler::CS, back); // b.CS back - __ br(Assembler::CS, forth); // b.CS forth - __ br(Assembler::LO, __ pc()); // b.LO . - __ br(Assembler::LO, back); // b.LO back - __ br(Assembler::LO, forth); // b.LO forth - __ br(Assembler::CC, __ pc()); // b.CC . - __ br(Assembler::CC, back); // b.CC back - __ br(Assembler::CC, forth); // b.CC forth - __ br(Assembler::MI, __ pc()); // b.MI . - __ br(Assembler::MI, back); // b.MI back - __ br(Assembler::MI, forth); // b.MI forth - __ br(Assembler::PL, __ pc()); // b.PL . - __ br(Assembler::PL, back); // b.PL back - __ br(Assembler::PL, forth); // b.PL forth - __ br(Assembler::VS, __ pc()); // b.VS . - __ br(Assembler::VS, back); // b.VS back - __ br(Assembler::VS, forth); // b.VS forth - __ br(Assembler::VC, __ pc()); // b.VC . - __ br(Assembler::VC, back); // b.VC back - __ br(Assembler::VC, forth); // b.VC forth - __ br(Assembler::HI, __ pc()); // b.HI . - __ br(Assembler::HI, back); // b.HI back - __ br(Assembler::HI, forth); // b.HI forth - __ br(Assembler::LS, __ pc()); // b.LS . - __ br(Assembler::LS, back); // b.LS back - __ br(Assembler::LS, forth); // b.LS forth - __ br(Assembler::GE, __ pc()); // b.GE . - __ br(Assembler::GE, back); // b.GE back - __ br(Assembler::GE, forth); // b.GE forth - __ br(Assembler::LT, __ pc()); // b.LT . - __ br(Assembler::LT, back); // b.LT back - __ br(Assembler::LT, forth); // b.LT forth - __ br(Assembler::GT, __ pc()); // b.GT . - __ br(Assembler::GT, back); // b.GT back - __ br(Assembler::GT, forth); // b.GT forth - __ br(Assembler::LE, __ pc()); // b.LE . - __ br(Assembler::LE, back); // b.LE back - __ br(Assembler::LE, forth); // b.LE forth - __ br(Assembler::AL, __ pc()); // b.AL . - __ br(Assembler::AL, back); // b.AL back - __ br(Assembler::AL, forth); // b.AL forth - __ br(Assembler::NV, __ pc()); // b.NV . - __ br(Assembler::NV, back); // b.NV back - __ br(Assembler::NV, forth); // b.NV forth + __ br(Assembler::EQ, __ pc()); // b.EQ . + __ br(Assembler::EQ, back); // b.EQ back + __ br(Assembler::EQ, forth); // b.EQ forth + __ br(Assembler::NE, __ pc()); // b.NE . + __ br(Assembler::NE, back); // b.NE back + __ br(Assembler::NE, forth); // b.NE forth + __ br(Assembler::HS, __ pc()); // b.HS . + __ br(Assembler::HS, back); // b.HS back + __ br(Assembler::HS, forth); // b.HS forth + __ br(Assembler::CS, __ pc()); // b.CS . + __ br(Assembler::CS, back); // b.CS back + __ br(Assembler::CS, forth); // b.CS forth + __ br(Assembler::LO, __ pc()); // b.LO . + __ br(Assembler::LO, back); // b.LO back + __ br(Assembler::LO, forth); // b.LO forth + __ br(Assembler::CC, __ pc()); // b.CC . + __ br(Assembler::CC, back); // b.CC back + __ br(Assembler::CC, forth); // b.CC forth + __ br(Assembler::MI, __ pc()); // b.MI . + __ br(Assembler::MI, back); // b.MI back + __ br(Assembler::MI, forth); // b.MI forth + __ br(Assembler::PL, __ pc()); // b.PL . + __ br(Assembler::PL, back); // b.PL back + __ br(Assembler::PL, forth); // b.PL forth + __ br(Assembler::VS, __ pc()); // b.VS . + __ br(Assembler::VS, back); // b.VS back + __ br(Assembler::VS, forth); // b.VS forth + __ br(Assembler::VC, __ pc()); // b.VC . + __ br(Assembler::VC, back); // b.VC back + __ br(Assembler::VC, forth); // b.VC forth + __ br(Assembler::HI, __ pc()); // b.HI . + __ br(Assembler::HI, back); // b.HI back + __ br(Assembler::HI, forth); // b.HI forth + __ br(Assembler::LS, __ pc()); // b.LS . + __ br(Assembler::LS, back); // b.LS back + __ br(Assembler::LS, forth); // b.LS forth + __ br(Assembler::GE, __ pc()); // b.GE . + __ br(Assembler::GE, back); // b.GE back + __ br(Assembler::GE, forth); // b.GE forth + __ br(Assembler::LT, __ pc()); // b.LT . + __ br(Assembler::LT, back); // b.LT back + __ br(Assembler::LT, forth); // b.LT forth + __ br(Assembler::GT, __ pc()); // b.GT . + __ br(Assembler::GT, back); // b.GT back + __ br(Assembler::GT, forth); // b.GT forth + __ br(Assembler::LE, __ pc()); // b.LE . + __ br(Assembler::LE, back); // b.LE back + __ br(Assembler::LE, forth); // b.LE forth + __ br(Assembler::AL, __ pc()); // b.AL . + __ br(Assembler::AL, back); // b.AL back + __ br(Assembler::AL, forth); // b.AL forth + __ br(Assembler::NV, __ pc()); // b.NV . + __ br(Assembler::NV, back); // b.NV back + __ br(Assembler::NV, forth); // b.NV forth // ImmOp - __ svc(22064); // svc #22064 - __ hvc(533); // hvc #533 - __ smc(9942); // smc #9942 - __ brk(4714); // brk #4714 - __ hlt(4302); // hlt #4302 + __ svc(32085); // svc #32085 + __ hvc(4810); // hvc #4810 + __ smc(21956); // smc #21956 + __ brk(21112); // brk #21112 + __ hlt(15915); // hlt #15915 // Op - __ nop(); // nop - __ eret(); // eret - __ drps(); // drps - __ isb(); // isb + __ nop(); // nop + __ eret(); // eret + __ drps(); // drps + __ isb(); // isb // SystemOp - __ dsb(Assembler::OSH); // dsb OSH - __ dmb(Assembler::NSHLD); // dmb NSHLD + __ dsb(Assembler::ISHST); // dsb ISHST + __ dmb(Assembler::ISHST); // dmb ISHST // OneRegOp - __ br(r20); // br x20 - __ blr(r2); // blr x2 + __ br(r17); // br x17 + __ blr(r0); // blr x0 // LoadStoreExclusiveOp - __ stxr(r18, r23, r0); // stxr w18, x23, [x0] - __ stlxr(r30, r5, r22); // stlxr w30, x5, [x22] - __ ldxr(r5, r8); // ldxr x5, [x8] - __ ldaxr(r20, r16); // ldaxr x20, [x16] - __ stlr(r6, r11); // stlr x6, [x11] - __ ldar(r6, r27); // ldar x6, [x27] + __ stxr(r3, r7, r12); // stxr w3, x7, [x12] + __ stlxr(r16, r13, r18); // stlxr w16, x13, [x18] + __ ldxr(r11, r30); // ldxr x11, [x30] + __ ldaxr(r21, r3); // ldaxr x21, [x3] + __ stlr(r22, r26); // stlr x22, [x26] + __ ldar(r2, r27); // ldar x2, [x27] // LoadStoreExclusiveOp - __ stxrw(r10, r17, r5); // stxr w10, w17, [x5] - __ stlxrw(r22, r9, r12); // stlxr w22, w9, [x12] - __ ldxrw(r27, r8); // ldxr w27, [x8] - __ ldaxrw(r23, r2); // ldaxr w23, [x2] - __ stlrw(r26, r29); // stlr w26, [x29] - __ ldarw(r13, r10); // ldar w13, [x10] + __ stxrw(r20, r15, r2); // stxr w20, w15, [x2] + __ stlxrw(r11, r8, r13); // stlxr w11, w8, [x13] + __ ldxrw(r16, r26); // ldxr w16, [x26] + __ ldaxrw(r27, r11); // ldaxr w27, [x11] + __ stlrw(r30, r4); // stlr w30, [x4] + __ ldarw(r2, r11); // ldar w2, [x11] // LoadStoreExclusiveOp - __ stxrh(r25, r28, r27); // stxrh w25, w28, [x27] - __ stlxrh(r29, r22, r12); // stlxrh w29, w22, [x12] - __ ldxrh(r22, r28); // ldxrh w22, [x28] - __ ldaxrh(r3, r30); // ldaxrh w3, [x30] - __ stlrh(r24, r15); // stlrh w24, [x15] - __ ldarh(r27, r26); // ldarh w27, [x26] + __ stxrh(r22, r27, r18); // stxrh w22, w27, [x18] + __ stlxrh(r25, r10, r23); // stlxrh w25, w10, [x23] + __ ldxrh(r13, r30); // ldxrh w13, [x30] + __ ldaxrh(r13, r2); // ldaxrh w13, [x2] + __ stlrh(r2, r24); // stlrh w2, [x24] + __ ldarh(r25, r23); // ldarh w25, [x23] // LoadStoreExclusiveOp - __ stxrb(r11, r10, r19); // stxrb w11, w10, [x19] - __ stlxrb(r23, r27, r22); // stlxrb w23, w27, [x22] - __ ldxrb(r24, r16); // ldxrb w24, [x16] - __ ldaxrb(r24, r1); // ldaxrb w24, [x1] - __ stlrb(r5, r29); // stlrb w5, [x29] - __ ldarb(r24, r16); // ldarb w24, [x16] + __ stxrb(r13, r0, r29); // stxrb w13, w0, [x29] + __ stlxrb(r8, r20, r6); // stlxrb w8, w20, [x6] + __ ldxrb(r15, r5); // ldxrb w15, [x5] + __ ldaxrb(r0, r10); // ldaxrb w0, [x10] + __ stlrb(r12, r26); // stlrb w12, [x26] + __ ldarb(r11, r2); // ldarb w11, [x2] // LoadStoreExclusiveOp - __ ldxp(r25, r24, r17); // ldxp x25, x24, [x17] - __ ldaxp(r22, r12, r19); // ldaxp x22, x12, [x19] - __ stxp(r0, r26, r21, r25); // stxp w0, x26, x21, [x25] - __ stlxp(r1, r6, r11, r5); // stlxp w1, x6, x11, [x5] + __ ldxp(r23, r17, r9); // ldxp x23, x17, [x9] + __ ldaxp(r1, r7, r13); // ldaxp x1, x7, [x13] + __ stxp(r7, r0, r11, r29); // stxp w7, x0, x11, [x29] + __ stlxp(r25, r22, r5, r11); // stlxp w25, x22, x5, [x11] // LoadStoreExclusiveOp - __ ldxpw(r13, r14, r4); // ldxp w13, w14, [x4] - __ ldaxpw(r17, r2, r6); // ldaxp w17, w2, [x6] - __ stxpw(r15, r3, r9, r18); // stxp w15, w3, w9, [x18] - __ stlxpw(r18, r17, r4, r9); // stlxp w18, w17, w4, [x9] + __ ldxpw(r7, r6, r27); // ldxp w7, w6, [x27] + __ ldaxpw(r7, r2, r24); // ldaxp w7, w2, [x24] + __ stxpw(r6, r5, r30, r19); // stxp w6, w5, w30, [x19] + __ stlxpw(r2, r29, r7, r18); // stlxp w2, w29, w7, [x18] // base_plus_unscaled_offset // LoadStoreOp - __ str(r23, Address(r21, -49)); // str x23, [x21, -49] - __ strw(r21, Address(r2, 63)); // str w21, [x2, 63] - __ strb(r27, Address(r28, 11)); // strb w27, [x28, 11] - __ strh(r29, Address(r15, -13)); // strh w29, [x15, -13] - __ ldr(r14, Address(r30, -45)); // ldr x14, [x30, -45] - __ ldrw(r29, Address(r28, 53)); // ldr w29, [x28, 53] - __ ldrb(r20, Address(r26, 7)); // ldrb w20, [x26, 7] - __ ldrh(r25, Address(r2, -50)); // ldrh w25, [x2, -50] - __ ldrsb(r3, Address(r10, -15)); // ldrsb x3, [x10, -15] - __ ldrsh(r14, Address(r15, 19)); // ldrsh x14, [x15, 19] - __ ldrshw(r29, Address(r11, -5)); // ldrsh w29, [x11, -5] - __ ldrsw(r15, Address(r5, -71)); // ldrsw x15, [x5, -71] - __ ldrd(v19, Address(r12, 3)); // ldr d19, [x12, 3] - __ ldrs(v12, Address(r27, 42)); // ldr s12, [x27, 42] - __ strd(v22, Address(r28, 125)); // str d22, [x28, 125] - __ strs(v24, Address(r15, -20)); // str s24, [x15, -20] + __ str(r29, Address(r20, -183)); // str x29, [x20, -183] + __ strw(r6, Address(r13, -39)); // str w6, [x13, -39] + __ strb(r9, Address(r5, -11)); // strb w9, [x5, -11] + __ strh(r22, Address(r8, 21)); // strh w22, [x8, 21] + __ ldr(r1, Address(r29, -81)); // ldr x1, [x29, -81] + __ ldrw(r20, Address(r29, -27)); // ldr w20, [x29, -27] + __ ldrb(r15, Address(r12, -8)); // ldrb w15, [x12, -8] + __ ldrh(r9, Address(r7, -62)); // ldrh w9, [x7, -62] + __ ldrsb(r23, Address(r13, -9)); // ldrsb x23, [x13, -9] + __ ldrsh(r18, Address(r13, 30)); // ldrsh x18, [x13, 30] + __ ldrshw(r17, Address(r30, 26)); // ldrsh w17, [x30, 26] + __ ldrsw(r21, Address(r14, -125)); // ldrsw x21, [x14, -125] + __ ldrd(v21, Address(r13, 59)); // ldr d21, [x13, 59] + __ ldrs(v21, Address(r8, 63)); // ldr s21, [x8, 63] + __ strd(v22, Address(r24, 53)); // str d22, [x24, 53] + __ strs(v26, Address(r0, 21)); // str s26, [x0, 21] // pre // LoadStoreOp - __ str(r8, Address(__ pre(r28, -24))); // str x8, [x28, -24]! - __ strw(r6, Address(__ pre(r15, 37))); // str w6, [x15, 37]! - __ strb(r7, Address(__ pre(r1, 7))); // strb w7, [x1, 7]! - __ strh(r0, Address(__ pre(r17, 30))); // strh w0, [x17, 30]! - __ ldr(r25, Address(__ pre(r29, 84))); // ldr x25, [x29, 84]! - __ ldrw(r26, Address(__ pre(r20, -52))); // ldr w26, [x20, -52]! - __ ldrb(r26, Address(__ pre(r29, -25))); // ldrb w26, [x29, -25]! - __ ldrh(r4, Address(__ pre(r25, 26))); // ldrh w4, [x25, 26]! - __ ldrsb(r28, Address(__ pre(r8, -21))); // ldrsb x28, [x8, -21]! - __ ldrsh(r17, Address(__ pre(r14, -6))); // ldrsh x17, [x14, -6]! - __ ldrshw(r28, Address(__ pre(r23, 10))); // ldrsh w28, [x23, 10]! - __ ldrsw(r30, Address(__ pre(r27, -64))); // ldrsw x30, [x27, -64]! - __ ldrd(v20, Address(__ pre(r30, -242))); // ldr d20, [x30, -242]! - __ ldrs(v17, Address(__ pre(r27, 20))); // ldr s17, [x27, 20]! - __ strd(v7, Address(__ pre(r3, 17))); // str d7, [x3, 17]! - __ strs(v13, Address(__ pre(r11, -16))); // str s13, [x11, -16]! + __ str(r23, Address(__ pre(r22, -215))); // str x23, [x22, -215]! + __ strw(r30, Address(__ pre(r29, -3))); // str w30, [x29, -3]! + __ strb(r2, Address(__ pre(r7, -18))); // strb w2, [x7, -18]! + __ strh(r23, Address(__ pre(r12, 19))); // strh w23, [x12, 19]! + __ ldr(r18, Address(__ pre(r4, -210))); // ldr x18, [x4, -210]! + __ ldrw(r19, Address(__ pre(r30, -71))); // ldr w19, [x30, -71]! + __ ldrb(r17, Address(__ pre(r20, -11))); // ldrb w17, [x20, -11]! + __ ldrh(r9, Address(__ pre(r14, -64))); // ldrh w9, [x14, -64]! + __ ldrsb(r6, Address(__ pre(r3, 11))); // ldrsb x6, [x3, 11]! + __ ldrsh(r11, Address(__ pre(r22, -6))); // ldrsh x11, [x22, -6]! + __ ldrshw(r6, Address(__ pre(r11, -27))); // ldrsh w6, [x11, -27]! + __ ldrsw(r25, Address(__ pre(r18, 54))); // ldrsw x25, [x18, 54]! + __ ldrd(v21, Address(__ pre(r23, -8))); // ldr d21, [x23, -8]! + __ ldrs(v30, Address(__ pre(r10, -39))); // ldr s30, [x10, -39]! + __ strd(v2, Address(__ pre(r1, -129))); // str d2, [x1, -129]! + __ strs(v26, Address(__ pre(r0, 1))); // str s26, [x0, 1]! // post // LoadStoreOp - __ str(r6, Address(__ post(r9, -61))); // str x6, [x9], -61 - __ strw(r16, Address(__ post(r5, -29))); // str w16, [x5], -29 - __ strb(r29, Address(__ post(r29, 15))); // strb w29, [x29], 15 - __ strh(r4, Address(__ post(r20, 18))); // strh w4, [x20], 18 - __ ldr(r19, Address(__ post(r18, 46))); // ldr x19, [x18], 46 - __ ldrw(r22, Address(__ post(r2, 23))); // ldr w22, [x2], 23 - __ ldrb(r7, Address(__ post(r3, -30))); // ldrb w7, [x3], -30 - __ ldrh(r11, Address(__ post(r12, -29))); // ldrh w11, [x12], -29 - __ ldrsb(r8, Address(__ post(r6, -29))); // ldrsb x8, [x6], -29 - __ ldrsh(r24, Address(__ post(r23, 4))); // ldrsh x24, [x23], 4 - __ ldrshw(r17, Address(__ post(r16, 0))); // ldrsh w17, [x16], 0 - __ ldrsw(r0, Address(__ post(r20, -8))); // ldrsw x0, [x20], -8 - __ ldrd(v20, Address(__ post(r2, -126))); // ldr d20, [x2], -126 - __ ldrs(v19, Address(__ post(r30, -104))); // ldr s19, [x30], -104 - __ strd(v4, Address(__ post(r17, 118))); // str d4, [x17], 118 - __ strs(v21, Address(__ post(r19, -112))); // str s21, [x19], -112 + __ str(r9, Address(__ post(r26, -99))); // str x9, [x26], -99 + __ strw(r9, Address(__ post(r14, 62))); // str w9, [x14], 62 + __ strb(r30, Address(__ post(r26, -30))); // strb w30, [x26], -30 + __ strh(r28, Address(__ post(r16, 11))); // strh w28, [x16], 11 + __ ldr(r29, Address(__ post(r26, 77))); // ldr x29, [x26], 77 + __ ldrw(r0, Address(__ post(r23, 53))); // ldr w0, [x23], 53 + __ ldrb(r7, Address(__ post(r21, -18))); // ldrb w7, [x21], -18 + __ ldrh(r24, Address(__ post(r13, 24))); // ldrh w24, [x13], 24 + __ ldrsb(r1, Address(__ post(r8, -17))); // ldrsb x1, [x8], -17 + __ ldrsh(r17, Address(__ post(r27, -34))); // ldrsh x17, [x27], -34 + __ ldrshw(r21, Address(__ post(r1, -26))); // ldrsh w21, [x1], -26 + __ ldrsw(r6, Address(__ post(r21, 0))); // ldrsw x6, [x21], 0 + __ ldrd(v5, Address(__ post(r3, 58))); // ldr d5, [x3], 58 + __ ldrs(v7, Address(__ post(r19, -80))); // ldr s7, [x19], -80 + __ strd(v1, Address(__ post(r16, 27))); // str d1, [x16], 27 + __ strs(v7, Address(__ post(r25, 62))); // str s7, [x25], 62 // base_plus_reg // LoadStoreOp - __ str(r26, Address(r2, r19, Address::lsl(3))); // str x26, [x2, x19, lsl #3] - __ strw(r9, Address(r0, r15, Address::sxtw(2))); // str w9, [x0, w15, sxtw #2] - __ strb(r26, Address(r12, r1, Address::lsl(0))); // strb w26, [x12, x1, lsl #0] - __ strh(r21, Address(r11, r10, Address::lsl(1))); // strh w21, [x11, x10, lsl #1] - __ ldr(r16, Address(r23, r16, Address::sxtx(0))); // ldr x16, [x23, x16, sxtx #0] - __ ldrw(r10, Address(r11, r17, Address::sxtw(2))); // ldr w10, [x11, w17, sxtw #2] - __ ldrb(r13, Address(r23, r11, Address::lsl(0))); // ldrb w13, [x23, x11, lsl #0] - __ ldrh(r27, Address(r4, r21, Address::lsl(0))); // ldrh w27, [x4, x21, lsl #0] - __ ldrsb(r26, Address(r8, r15, Address::sxtw(0))); // ldrsb x26, [x8, w15, sxtw #0] - __ ldrsh(r21, Address(r10, r2, Address::sxtw(0))); // ldrsh x21, [x10, w2, sxtw #0] - __ ldrshw(r8, Address(r30, r14, Address::lsl(0))); // ldrsh w8, [x30, x14, lsl #0] - __ ldrsw(r29, Address(r14, r20, Address::sxtx(2))); // ldrsw x29, [x14, x20, sxtx #2] - __ ldrd(v30, Address(r27, r22, Address::sxtx(0))); // ldr d30, [x27, x22, sxtx #0] - __ ldrs(v13, Address(r9, r22, Address::lsl(0))); // ldr s13, [x9, x22, lsl #0] - __ strd(v8, Address(r25, r17, Address::sxtw(3))); // str d8, [x25, w17, sxtw #3] - __ strs(v1, Address(r24, r5, Address::uxtw(2))); // str s1, [x24, w5, uxtw #2] + __ str(r13, Address(r3, r30, Address::uxtw(3))); // str x13, [x3, w30, uxtw #3] + __ strw(r17, Address(r3, r1, Address::sxtx(0))); // str w17, [x3, x1, sxtx #0] + __ strb(r23, Address(r19, r27, Address::lsl(0))); // strb w23, [x19, x27, lsl #0] + __ strh(r5, Address(r20, r10, Address::uxtw(1))); // strh w5, [x20, w10, uxtw #1] + __ ldr(r29, Address(r2, r16, Address::sxtw(3))); // ldr x29, [x2, w16, sxtw #3] + __ ldrw(r16, Address(r17, r21, Address::sxtx(2))); // ldr w16, [x17, x21, sxtx #2] + __ ldrb(r10, Address(r16, r16, Address::uxtw(0))); // ldrb w10, [x16, w16, uxtw #0] + __ ldrh(r23, Address(r27, r26, Address::sxtw(1))); // ldrh w23, [x27, w26, sxtw #1] + __ ldrsb(r13, Address(r0, r7, Address::lsl(0))); // ldrsb x13, [x0, x7, lsl #0] + __ ldrsh(r15, Address(r5, r18, Address::uxtw(0))); // ldrsh x15, [x5, w18, uxtw #0] + __ ldrshw(r18, Address(r20, r18, Address::lsl(1))); // ldrsh w18, [x20, x18, lsl #1] + __ ldrsw(r30, Address(r14, r17, Address::uxtw(0))); // ldrsw x30, [x14, w17, uxtw #0] + __ ldrd(v19, Address(r6, r26, Address::uxtw(3))); // ldr d19, [x6, w26, uxtw #3] + __ ldrs(v30, Address(r23, r2, Address::sxtw(0))); // ldr s30, [x23, w2, sxtw #0] + __ strd(v27, Address(r22, r7, Address::uxtw(0))); // str d27, [x22, w7, uxtw #0] + __ strs(v9, Address(r24, r26, Address::sxtx(2))); // str s9, [x24, x26, sxtx #2] // base_plus_scaled_offset // LoadStoreOp - __ str(r10, Address(r21, 14496)); // str x10, [x21, 14496] - __ strw(r18, Address(r29, 7228)); // str w18, [x29, 7228] - __ strb(r23, Address(r3, 2018)); // strb w23, [x3, 2018] - __ strh(r28, Address(r11, 3428)); // strh w28, [x11, 3428] - __ ldr(r24, Address(r26, 14376)); // ldr x24, [x26, 14376] - __ ldrw(r21, Address(r2, 6972)); // ldr w21, [x2, 6972] - __ ldrb(r4, Address(r5, 1848)); // ldrb w4, [x5, 1848] - __ ldrh(r14, Address(r14, 3112)); // ldrh w14, [x14, 3112] - __ ldrsb(r4, Address(r27, 1959)); // ldrsb x4, [x27, 1959] - __ ldrsh(r4, Address(r27, 3226)); // ldrsh x4, [x27, 3226] - __ ldrshw(r10, Address(r28, 3286)); // ldrsh w10, [x28, 3286] - __ ldrsw(r10, Address(r17, 7912)); // ldrsw x10, [x17, 7912] - __ ldrd(v13, Address(r28, 13400)); // ldr d13, [x28, 13400] - __ ldrs(v24, Address(r3, 7596)); // ldr s24, [x3, 7596] - __ strd(v2, Address(r12, 15360)); // str d2, [x12, 15360] - __ strs(v17, Address(r1, 6492)); // str s17, [x1, 6492] + __ str(r14, Address(r28, 16104)); // str x14, [x28, 16104] + __ strw(r16, Address(r13, 7864)); // str w16, [x13, 7864] + __ strb(r20, Address(r27, 1562)); // strb w20, [x27, 1562] + __ strh(r16, Address(r7, 3268)); // strh w16, [x7, 3268] + __ ldr(r5, Address(r21, 15512)); // ldr x5, [x21, 15512] + __ ldrw(r0, Address(r8, 7656)); // ldr w0, [x8, 7656] + __ ldrb(r1, Address(r7, 2020)); // ldrb w1, [x7, 2020] + __ ldrh(r1, Address(r14, 3294)); // ldrh w1, [x14, 3294] + __ ldrsb(r6, Address(r25, 1766)); // ldrsb x6, [x25, 1766] + __ ldrsh(r9, Address(r16, 3248)); // ldrsh x9, [x16, 3248] + __ ldrshw(r27, Address(r4, 3608)); // ldrsh w27, [x4, 3608] + __ ldrsw(r2, Address(r16, 7308)); // ldrsw x2, [x16, 7308] + __ ldrd(v5, Address(r26, 16192)); // ldr d5, [x26, 16192] + __ ldrs(v19, Address(r13, 7932)); // ldr s19, [x13, 7932] + __ strd(v22, Address(r7, 13376)); // str d22, [x7, 13376] + __ strs(v8, Address(r9, 7816)); // str s8, [x9, 7816] // pcrel // LoadStoreOp - __ ldr(r16, __ pc()); // ldr x16, . - __ ldrw(r13, __ pc()); // ldr w13, . + __ ldr(r26, back); // ldr x26, back + __ ldrw(r12, back); // ldr w12, back // LoadStoreOp - __ prfm(Address(r18, -127)); // prfm PLDL1KEEP, [x18, -127] + __ prfm(Address(r10, 47)); // prfm PLDL1KEEP, [x10, 47] // LoadStoreOp - __ prfm(back); // prfm PLDL1KEEP, back + __ prfm(forth); // prfm PLDL1KEEP, forth // LoadStoreOp - __ prfm(Address(r20, r2, Address::lsl(3))); // prfm PLDL1KEEP, [x20, x2, lsl #3] + __ prfm(Address(r21, r20, Address::lsl(3))); // prfm PLDL1KEEP, [x21, x20, lsl #3] // LoadStoreOp - __ prfm(Address(r9, 13808)); // prfm PLDL1KEEP, [x9, 13808] + __ prfm(Address(r13, 15776)); // prfm PLDL1KEEP, [x13, 15776] // AddSubCarryOp - __ adcw(r8, r23, r2); // adc w8, w23, w2 - __ adcsw(r24, r3, r19); // adcs w24, w3, w19 - __ sbcw(r22, r24, r29); // sbc w22, w24, w29 - __ sbcsw(r12, r27, r3); // sbcs w12, w27, w3 - __ adc(r11, r23, r1); // adc x11, x23, x1 - __ adcs(r29, r5, r23); // adcs x29, x5, x23 - __ sbc(r9, r25, r12); // sbc x9, x25, x12 - __ sbcs(r12, r0, r22); // sbcs x12, x0, x22 + __ adcw(r26, r8, r3); // adc w26, w8, w3 + __ adcsw(r9, r30, r7); // adcs w9, w30, w7 + __ sbcw(r24, r15, r11); // sbc w24, w15, w11 + __ sbcsw(r4, r21, r11); // sbcs w4, w21, w11 + __ adc(r15, r17, r30); // adc x15, x17, x30 + __ adcs(r6, r15, r16); // adcs x6, x15, x16 + __ sbc(r1, r2, r10); // sbc x1, x2, x10 + __ sbcs(r9, r4, r11); // sbcs x9, x4, x11 // AddSubExtendedOp - __ addw(r26, r12, r3, ext::uxtw, 1); // add w26, w12, w3, uxtw #1 - __ addsw(r20, r16, r18, ext::sxtb, 2); // adds w20, w16, w18, sxtb #2 - __ sub(r30, r30, r7, ext::uxtw, 2); // sub x30, x30, x7, uxtw #2 - __ subsw(r11, r21, r2, ext::uxth, 3); // subs w11, w21, w2, uxth #3 - __ add(r2, r26, r1, ext::uxtw, 2); // add x2, x26, x1, uxtw #2 - __ adds(r18, r29, r20, ext::sxth, 1); // adds x18, x29, x20, sxth #1 - __ sub(r14, r16, r4, ext::uxtw, 4); // sub x14, x16, x4, uxtw #4 - __ subs(r0, r17, r23, ext::sxtb, 3); // subs x0, x17, x23, sxtb #3 + __ addw(r23, r29, r17, ext::uxtx, 1); // add w23, w29, w17, uxtx #1 + __ addsw(r15, r11, r11, ext::sxtx, 3); // adds w15, w11, w11, sxtx #3 + __ sub(r2, r30, r7, ext::uxtw, 4); // sub x2, x30, x7, uxtw #4 + __ subsw(r30, r19, r26, ext::sxtb, 1); // subs w30, w19, w26, sxtb #1 + __ add(r2, r0, r12, ext::uxtx, 3); // add x2, x0, x12, uxtx #3 + __ adds(r14, r1, r16, ext::sxtb, 4); // adds x14, x1, x16, sxtb #4 + __ sub(r15, r22, r23, ext::sxtb, 3); // sub x15, x22, x23, sxtb #3 + __ subs(r0, r4, r28, ext::uxtw, 1); // subs x0, x4, x28, uxtw #1 // ConditionalCompareOp - __ ccmnw(r20, r22, 3u, Assembler::PL); // ccmn w20, w22, #3, PL - __ ccmpw(r25, r2, 1u, Assembler::EQ); // ccmp w25, w2, #1, EQ - __ ccmn(r18, r24, 7u, Assembler::GT); // ccmn x18, x24, #7, GT - __ ccmp(r8, r13, 6u, Assembler::PL); // ccmp x8, x13, #6, PL + __ ccmnw(r5, r18, 11u, Assembler::CS); // ccmn w5, w18, #11, CS + __ ccmpw(r18, r21, 8u, Assembler::HS); // ccmp w18, w21, #8, HS + __ ccmn(r15, r17, 15u, Assembler::CC); // ccmn x15, x17, #15, CC + __ ccmp(r13, r23, 6u, Assembler::NE); // ccmp x13, x23, #6, NE // ConditionalCompareImmedOp - __ ccmnw(r9, 2, 4, Assembler::VS); // ccmn w9, #2, #4, VS - __ ccmpw(r2, 27, 7, Assembler::EQ); // ccmp w2, #27, #7, EQ - __ ccmn(r16, 1, 2, Assembler::CC); // ccmn x16, #1, #2, CC - __ ccmp(r17, 31, 3, Assembler::LT); // ccmp x17, #31, #3, LT + __ ccmnw(r28, 9, 15, Assembler::CC); // ccmn w28, #9, #15, CC + __ ccmpw(r14, 12, 9, Assembler::LS); // ccmp w14, #12, #9, LS + __ ccmn(r22, 6, 2, Assembler::LO); // ccmn x22, #6, #2, LO + __ ccmp(r21, 12, 0, Assembler::MI); // ccmp x21, #12, #0, MI // ConditionalSelectOp - __ cselw(r23, r27, r23, Assembler::LS); // csel w23, w27, w23, LS - __ csincw(r10, r0, r6, Assembler::VS); // csinc w10, w0, w6, VS - __ csinvw(r11, r0, r9, Assembler::CC); // csinv w11, w0, w9, CC - __ csnegw(r17, r27, r18, Assembler::LO); // csneg w17, w27, w18, LO - __ csel(r12, r16, r11, Assembler::VC); // csel x12, x16, x11, VC - __ csinc(r6, r28, r6, Assembler::HI); // csinc x6, x28, x6, HI - __ csinv(r13, r27, r26, Assembler::VC); // csinv x13, x27, x26, VC - __ csneg(r29, r22, r18, Assembler::PL); // csneg x29, x22, x18, PL + __ cselw(r14, r21, r28, Assembler::GT); // csel w14, w21, w28, GT + __ csincw(r25, r14, r17, Assembler::GT); // csinc w25, w14, w17, GT + __ csinvw(r17, r6, r25, Assembler::HS); // csinv w17, w6, w25, HS + __ csnegw(r21, r2, r14, Assembler::HS); // csneg w21, w2, w14, HS + __ csel(r3, r11, r17, Assembler::HS); // csel x3, x11, x17, HS + __ csinc(r27, r30, r27, Assembler::HS); // csinc x27, x30, x27, HS + __ csinv(r0, r15, r5, Assembler::HI); // csinv x0, x15, x5, HI + __ csneg(r2, r11, r8, Assembler::CS); // csneg x2, x11, x8, CS // TwoRegOp - __ rbitw(r12, r19); // rbit w12, w19 - __ rev16w(r23, r18); // rev16 w23, w18 - __ revw(r9, r28); // rev w9, w28 - __ clzw(r2, r19); // clz w2, w19 - __ clsw(r25, r29); // cls w25, w29 - __ rbit(r4, r23); // rbit x4, x23 - __ rev16(r29, r18); // rev16 x29, x18 - __ rev32(r7, r8); // rev32 x7, x8 - __ rev(r13, r17); // rev x13, x17 - __ clz(r17, r0); // clz x17, x0 - __ cls(r18, r26); // cls x18, x26 + __ rbitw(r2, r19); // rbit w2, w19 + __ rev16w(r22, r12); // rev16 w22, w12 + __ revw(r5, r22); // rev w5, w22 + __ clzw(r3, r27); // clz w3, w27 + __ clsw(r18, r4); // cls w18, w4 + __ rbit(r22, r27); // rbit x22, x27 + __ rev16(r12, r10); // rev16 x12, x10 + __ rev32(r5, r4); // rev32 x5, x4 + __ rev(r22, r10); // rev x22, x10 + __ clz(r13, r7); // clz x13, x7 + __ cls(r6, r10); // cls x6, x10 // ThreeRegOp - __ udivw(r11, r12, r16); // udiv w11, w12, w16 - __ sdivw(r4, r9, r7); // sdiv w4, w9, w7 - __ lslvw(r12, r7, r16); // lslv w12, w7, w16 - __ lsrvw(r19, r16, r23); // lsrv w19, w16, w23 - __ asrvw(r7, r4, r6); // asrv w7, w4, w6 - __ rorvw(r21, r20, r23); // rorv w21, w20, w23 - __ udiv(r16, r12, r28); // udiv x16, x12, x28 - __ sdiv(r4, r12, r13); // sdiv x4, x12, x13 - __ lslv(r9, r13, r7); // lslv x9, x13, x7 - __ lsrv(r28, r27, r15); // lsrv x28, x27, x15 - __ asrv(r20, r30, r14); // asrv x20, x30, x14 - __ rorv(r14, r18, r30); // rorv x14, x18, x30 - __ umulh(r3, r11, r7); // umulh x3, x11, x7 - __ smulh(r23, r20, r24); // smulh x23, x20, x24 + __ udivw(r2, r16, r28); // udiv w2, w16, w28 + __ sdivw(r8, r23, r8); // sdiv w8, w23, w8 + __ lslvw(r18, r17, r14); // lslv w18, w17, w14 + __ lsrvw(r30, r25, r22); // lsrv w30, w25, w22 + __ asrvw(r16, r2, r5); // asrv w16, w2, w5 + __ rorvw(r15, r28, r0); // rorv w15, w28, w0 + __ udiv(r13, r20, r1); // udiv x13, x20, x1 + __ sdiv(r28, r30, r18); // sdiv x28, x30, x18 + __ lslv(r17, r28, r9); // lslv x17, x28, x9 + __ lsrv(r18, r13, r4); // lsrv x18, x13, x4 + __ asrv(r12, r24, r16); // asrv x12, x24, x16 + __ rorv(r14, r9, r24); // rorv x14, x9, x24 + __ umulh(r20, r4, r24); // umulh x20, x4, x24 + __ smulh(r18, r5, r28); // smulh x18, x5, x28 // FourRegMulOp - __ maddw(r2, r5, r21, r9); // madd w2, w5, w21, w9 - __ msubw(r24, r24, r4, r8); // msub w24, w24, w4, w8 - __ madd(r11, r12, r15, r19); // madd x11, x12, x15, x19 - __ msub(r29, r25, r12, r25); // msub x29, x25, x12, x25 - __ smaddl(r17, r11, r12, r22); // smaddl x17, w11, w12, x22 - __ smsubl(r28, r3, r20, r18); // smsubl x28, w3, w20, x18 - __ umaddl(r7, r4, r28, r26); // umaddl x7, w4, w28, x26 - __ umsubl(r22, r10, r17, r5); // umsubl x22, w10, w17, x5 + __ maddw(r19, r29, r17, r18); // madd w19, w29, w17, w18 + __ msubw(r14, r22, r15, r19); // msub w14, w22, w15, w19 + __ madd(r12, r5, r1, r8); // madd x12, x5, x1, x8 + __ msub(r22, r18, r11, r16); // msub x22, x18, x11, x16 + __ smaddl(r0, r11, r12, r30); // smaddl x0, w11, w12, x30 + __ smsubl(r19, r8, r13, r12); // smsubl x19, w8, w13, x12 + __ umaddl(r13, r30, r17, r5); // umaddl x13, w30, w17, x5 + __ umsubl(r16, r12, r23, r9); // umsubl x16, w12, w23, x9 // ThreeRegFloatOp - __ fmuls(v17, v3, v17); // fmul s17, s3, s17 - __ fdivs(v11, v17, v6); // fdiv s11, s17, s6 - __ fadds(v29, v7, v9); // fadd s29, s7, s9 - __ fsubs(v7, v12, v19); // fsub s7, s12, s19 - __ fmuls(v0, v23, v3); // fmul s0, s23, s3 - __ fmuld(v26, v3, v21); // fmul d26, d3, d21 - __ fdivd(v0, v19, v5); // fdiv d0, d19, d5 - __ faddd(v0, v26, v9); // fadd d0, d26, d9 - __ fsubd(v25, v21, v21); // fsub d25, d21, d21 - __ fmuld(v16, v13, v19); // fmul d16, d13, d19 + __ fmuls(v6, v20, v0); // fmul s6, s20, s0 + __ fdivs(v21, v6, v15); // fdiv s21, s6, s15 + __ fadds(v24, v9, v25); // fadd s24, s9, s25 + __ fsubs(v9, v24, v18); // fsub s9, s24, s18 + __ fmuls(v26, v24, v10); // fmul s26, s24, s10 + __ fmuld(v12, v20, v0); // fmul d12, d20, d0 + __ fdivd(v12, v15, v16); // fdiv d12, d15, d16 + __ faddd(v24, v6, v29); // fadd d24, d6, d29 + __ fsubd(v24, v6, v14); // fsub d24, d6, d14 + __ fmuld(v21, v29, v15); // fmul d21, d29, d15 // FourRegFloatOp - __ fmadds(v29, v18, v0, v16); // fmadd s29, s18, s0, s16 - __ fmsubs(v23, v13, v29, v5); // fmsub s23, s13, s29, s5 - __ fnmadds(v9, v7, v10, v14); // fnmadd s9, s7, s10, s14 - __ fnmadds(v25, v28, v15, v23); // fnmadd s25, s28, s15, s23 - __ fmaddd(v6, v13, v21, v17); // fmadd d6, d13, d21, d17 - __ fmsubd(v3, v21, v2, v7); // fmsub d3, d21, d2, d7 - __ fnmaddd(v10, v25, v5, v17); // fnmadd d10, d25, d5, d17 - __ fnmaddd(v14, v14, v20, v18); // fnmadd d14, d14, d20, d18 + __ fmadds(v9, v25, v1, v29); // fmadd s9, s25, s1, s29 + __ fmsubs(v13, v20, v10, v29); // fmsub s13, s20, s10, s29 + __ fnmadds(v28, v11, v11, v7); // fnmadd s28, s11, s11, s7 + __ fnmadds(v7, v28, v21, v1); // fnmadd s7, s28, s21, s1 + __ fmaddd(v30, v29, v15, v1); // fmadd d30, d29, d15, d1 + __ fmsubd(v12, v8, v27, v26); // fmsub d12, d8, d27, d26 + __ fnmaddd(v17, v24, v11, v25); // fnmadd d17, d24, d11, d25 + __ fnmaddd(v30, v1, v8, v0); // fnmadd d30, d1, d8, d0 // TwoRegFloatOp - __ fmovs(v15, v2); // fmov s15, s2 - __ fabss(v18, v7); // fabs s18, s7 - __ fnegs(v3, v6); // fneg s3, s6 - __ fsqrts(v12, v1); // fsqrt s12, s1 - __ fcvts(v9, v0); // fcvt d9, s0 - __ fmovd(v4, v5); // fmov d4, d5 - __ fabsd(v3, v15); // fabs d3, d15 - __ fnegd(v17, v25); // fneg d17, d25 - __ fsqrtd(v12, v24); // fsqrt d12, d24 - __ fcvtd(v21, v5); // fcvt s21, d5 + __ fmovs(v1, v5); // fmov s1, s5 + __ fabss(v6, v19); // fabs s6, s19 + __ fnegs(v4, v0); // fneg s4, s0 + __ fsqrts(v9, v10); // fsqrt s9, s10 + __ fcvts(v20, v14); // fcvt d20, s14 + __ fmovd(v0, v19); // fmov d0, d19 + __ fabsd(v30, v18); // fabs d30, d18 + __ fnegd(v0, v8); // fneg d0, d8 + __ fsqrtd(v0, v8); // fsqrt d0, d8 + __ fcvtd(v14, v30); // fcvt s14, d30 // FloatConvertOp - __ fcvtzsw(r4, v21); // fcvtzs w4, s21 - __ fcvtzs(r27, v3); // fcvtzs x27, s3 - __ fcvtzdw(r29, v8); // fcvtzs w29, d8 - __ fcvtzd(r9, v21); // fcvtzs x9, d21 - __ scvtfws(v20, r29); // scvtf s20, w29 - __ scvtfs(v7, r8); // scvtf s7, x8 - __ scvtfwd(v12, r21); // scvtf d12, w21 - __ scvtfd(v16, r21); // scvtf d16, x21 - __ fmovs(r18, v5); // fmov w18, s5 - __ fmovd(r25, v8); // fmov x25, d8 - __ fmovs(v18, r26); // fmov s18, w26 - __ fmovd(v0, r11); // fmov d0, x11 + __ fcvtzsw(r19, v22); // fcvtzs w19, s22 + __ fcvtzs(r17, v10); // fcvtzs x17, s10 + __ fcvtzdw(r27, v21); // fcvtzs w27, d21 + __ fcvtzd(r7, v4); // fcvtzs x7, d4 + __ scvtfws(v30, r25); // scvtf s30, w25 + __ scvtfs(v25, r16); // scvtf s25, x16 + __ scvtfwd(v9, r26); // scvtf d9, w26 + __ scvtfd(v7, r0); // scvtf d7, x0 + __ fmovs(r0, v15); // fmov w0, s15 + __ fmovd(r11, v4); // fmov x11, d4 + __ fmovs(v30, r15); // fmov s30, w15 + __ fmovd(v2, r23); // fmov d2, x23 // TwoRegFloatOp - __ fcmps(v16, v6); // fcmp s16, s6 - __ fcmpd(v16, v29); // fcmp d16, d29 - __ fcmps(v30, 0.0); // fcmp s30, #0.0 - __ fcmpd(v9, 0.0); // fcmp d9, #0.0 + __ fcmps(v14, v10); // fcmp s14, s10 + __ fcmpd(v30, v0); // fcmp d30, d0 + __ fcmps(v11, 0.0); // fcmp s11, #0.0 + __ fcmpd(v24, 0.0); // fcmp d24, #0.0 // LoadStorePairOp - __ stpw(r27, r4, Address(r12, -16)); // stp w27, w4, [x12, #-16] - __ ldpw(r3, r9, Address(r10, 80)); // ldp w3, w9, [x10, #80] - __ ldpsw(r16, r3, Address(r3, 64)); // ldpsw x16, x3, [x3, #64] - __ stp(r10, r28, Address(r19, -192)); // stp x10, x28, [x19, #-192] - __ ldp(r19, r18, Address(r7, -192)); // ldp x19, x18, [x7, #-192] + __ stpw(r28, r16, Address(r1, -240)); // stp w28, w16, [x1, #-240] + __ ldpw(r23, r21, Address(r14, 96)); // ldp w23, w21, [x14, #96] + __ ldpsw(r0, r24, Address(r7, -64)); // ldpsw x0, x24, [x7, #-64] + __ stp(r21, r20, Address(r16, 128)); // stp x21, x20, [x16, #128] + __ ldp(r1, r3, Address(r26, -112)); // ldp x1, x3, [x26, #-112] // LoadStorePairOp - __ stpw(r10, r16, Address(__ pre(r30, 16))); // stp w10, w16, [x30, #16]! - __ ldpw(r2, r4, Address(__ pre(r18, -240))); // ldp w2, w4, [x18, #-240]! - __ ldpsw(r24, r19, Address(__ pre(r13, 48))); // ldpsw x24, x19, [x13, #48]! - __ stp(r17, r0, Address(__ pre(r24, 0))); // stp x17, x0, [x24, #0]! - __ ldp(r14, r26, Address(__ pre(r3, -192))); // ldp x14, x26, [x3, #-192]! + __ stpw(r12, r14, Address(__ pre(r10, -240))); // stp w12, w14, [x10, #-240]! + __ ldpw(r3, r0, Address(__ pre(r7, -240))); // ldp w3, w0, [x7, #-240]! + __ ldpsw(r26, r24, Address(__ pre(r5, -208))); // ldpsw x26, x24, [x5, #-208]! + __ stp(r16, r22, Address(__ pre(r8, -160))); // stp x16, x22, [x8, #-160]! + __ ldp(r26, r4, Address(__ pre(r15, -144))); // ldp x26, x4, [x15, #-144]! // LoadStorePairOp - __ stpw(r22, r1, Address(__ post(r0, 80))); // stp w22, w1, [x0], #80 - __ ldpw(r18, r10, Address(__ post(r0, -16))); // ldp w18, w10, [x0], #-16 - __ ldpsw(r24, r24, Address(__ post(r22, -16))); // ldpsw x24, x24, [x22], #-16 - __ stp(r12, r12, Address(__ post(r4, 80))); // stp x12, x12, [x4], #80 - __ ldp(r4, r9, Address(__ post(r19, -240))); // ldp x4, x9, [x19], #-240 + __ stpw(r9, r28, Address(__ post(r29, 112))); // stp w9, w28, [x29], #112 + __ ldpw(r8, r5, Address(__ post(r3, 64))); // ldp w8, w5, [x3], #64 + __ ldpsw(r30, r4, Address(__ post(r12, -208))); // ldpsw x30, x4, [x12], #-208 + __ stp(r14, r30, Address(__ post(r16, -160))); // stp x14, x30, [x16], #-160 + __ ldp(r27, r22, Address(__ post(r9, -208))); // ldp x27, x22, [x9], #-208 // LoadStorePairOp - __ stnpw(r18, r26, Address(r6, -224)); // stnp w18, w26, [x6, #-224] - __ ldnpw(r21, r20, Address(r1, 112)); // ldnp w21, w20, [x1, #112] - __ stnp(r25, r29, Address(r20, -224)); // stnp x25, x29, [x20, #-224] - __ ldnp(r1, r5, Address(r23, 112)); // ldnp x1, x5, [x23, #112] + __ stnpw(r26, r21, Address(r24, -256)); // stnp w26, w21, [x24, #-256] + __ ldnpw(r20, r9, Address(r15, -48)); // ldnp w20, w9, [x15, #-48] + __ stnp(r15, r26, Address(r13, -240)); // stnp x15, x26, [x13, #-240] + __ ldnp(r5, r26, Address(r5, 16)); // ldnp x5, x26, [x5, #16] // LdStSIMDOp - __ ld1(v4, __ T8B, Address(r20)); // ld1 {v4.8B}, [x20] - __ ld1(v24, v25, __ T16B, Address(__ post(r10, 32))); // ld1 {v24.16B, v25.16B}, [x10], 32 - __ ld1(v24, v25, v26, __ T1D, Address(__ post(r6, r15))); // ld1 {v24.1D, v25.1D, v26.1D}, [x6], x15 - __ ld1(v3, v4, v5, v6, __ T8H, Address(__ post(r4, 64))); // ld1 {v3.8H, v4.8H, v5.8H, v6.8H}, [x4], 64 - __ ld1r(v2, __ T8B, Address(r6)); // ld1r {v2.8B}, [x6] - __ ld1r(v13, __ T4S, Address(__ post(r14, 4))); // ld1r {v13.4S}, [x14], 4 - __ ld1r(v15, __ T1D, Address(__ post(r21, r24))); // ld1r {v15.1D}, [x21], x24 - __ ld2(v9, v10, __ T2D, Address(r21)); // ld2 {v9.2D, v10.2D}, [x21] - __ ld2(v29, v30, __ T4H, Address(__ post(r21, 16))); // ld2 {v29.4H, v30.4H}, [x21], 16 - __ ld2r(v8, v9, __ T16B, Address(r14)); // ld2r {v8.16B, v9.16B}, [x14] - __ ld2r(v7, v8, __ T2S, Address(__ post(r20, 8))); // ld2r {v7.2S, v8.2S}, [x20], 8 - __ ld2r(v28, v29, __ T2D, Address(__ post(r3, r3))); // ld2r {v28.2D, v29.2D}, [x3], x3 - __ ld3(v27, v28, v29, __ T4S, Address(__ post(r11, r29))); // ld3 {v27.4S, v28.4S, v29.4S}, [x11], x29 - __ ld3(v16, v17, v18, __ T2S, Address(r10)); // ld3 {v16.2S, v17.2S, v18.2S}, [x10] - __ ld3r(v21, v22, v23, __ T8H, Address(r12)); // ld3r {v21.8H, v22.8H, v23.8H}, [x12] - __ ld3r(v4, v5, v6, __ T4S, Address(__ post(r29, 12))); // ld3r {v4.4S, v5.4S, v6.4S}, [x29], 12 - __ ld3r(v24, v25, v26, __ T1D, Address(__ post(r9, r19))); // ld3r {v24.1D, v25.1D, v26.1D}, [x9], x19 - __ ld4(v10, v11, v12, v13, __ T8H, Address(__ post(r3, 64))); // ld4 {v10.8H, v11.8H, v12.8H, v13.8H}, [x3], 64 - __ ld4(v27, v28, v29, v30, __ T8B, Address(__ post(r28, r9))); // ld4 {v27.8B, v28.8B, v29.8B, v30.8B}, [x28], x9 - __ ld4r(v21, v22, v23, v24, __ T8B, Address(r30)); // ld4r {v21.8B, v22.8B, v23.8B, v24.8B}, [x30] - __ ld4r(v23, v24, v25, v26, __ T4H, Address(__ post(r14, 8))); // ld4r {v23.4H, v24.4H, v25.4H, v26.4H}, [x14], 8 - __ ld4r(v4, v5, v6, v7, __ T2S, Address(__ post(r13, r20))); // ld4r {v4.2S, v5.2S, v6.2S, v7.2S}, [x13], x20 + __ ld1(v19, __ T8B, Address(r26)); // ld1 {v19.8B}, [x26] + __ ld1(v1, v2, __ T16B, Address(__ post(r14, 32))); // ld1 {v1.16B, v2.16B}, [x14], 32 + __ ld1(v29, v30, v31, __ T1D, Address(__ post(r24, r25))); // ld1 {v29.1D, v30.1D, v31.1D}, [x24], x25 + __ ld1(v20, v21, v22, v23, __ T8H, Address(__ post(r0, 64))); // ld1 {v20.8H, v21.8H, v22.8H, v23.8H}, [x0], 64 + __ ld1r(v25, __ T8B, Address(r27)); // ld1r {v25.8B}, [x27] + __ ld1r(v30, __ T4S, Address(__ post(r26, 4))); // ld1r {v30.4S}, [x26], 4 + __ ld1r(v9, __ T1D, Address(__ post(r21, r10))); // ld1r {v9.1D}, [x21], x10 + __ ld2(v2, v3, __ T2D, Address(r14)); // ld2 {v2.2D, v3.2D}, [x14] + __ ld2(v14, v15, __ T4H, Address(__ post(r18, 16))); // ld2 {v14.4H, v15.4H}, [x18], 16 + __ ld2r(v4, v5, __ T16B, Address(r0)); // ld2r {v4.16B, v5.16B}, [x0] + __ ld2r(v18, v19, __ T2S, Address(__ post(r1, 8))); // ld2r {v18.2S, v19.2S}, [x1], 8 + __ ld2r(v26, v27, __ T2D, Address(__ post(r0, r27))); // ld2r {v26.2D, v27.2D}, [x0], x27 + __ ld3(v7, v8, v9, __ T4S, Address(__ post(r22, r3))); // ld3 {v7.4S, v8.4S, v9.4S}, [x22], x3 + __ ld3(v5, v6, v7, __ T2S, Address(r21)); // ld3 {v5.2S, v6.2S, v7.2S}, [x21] + __ ld3r(v30, v31, v0, __ T8H, Address(r7)); // ld3r {v30.8H, v31.8H, v0.8H}, [x7] + __ ld3r(v7, v8, v9, __ T4S, Address(__ post(r23, 12))); // ld3r {v7.4S, v8.4S, v9.4S}, [x23], 12 + __ ld3r(v15, v16, v17, __ T1D, Address(__ post(r10, r6))); // ld3r {v15.1D, v16.1D, v17.1D}, [x10], x6 + __ ld4(v20, v21, v22, v23, __ T8H, Address(__ post(r25, 64))); // ld4 {v20.8H, v21.8H, v22.8H, v23.8H}, [x25], 64 + __ ld4(v5, v6, v7, v8, __ T8B, Address(__ post(r27, r24))); // ld4 {v5.8B, v6.8B, v7.8B, v8.8B}, [x27], x24 + __ ld4r(v5, v6, v7, v8, __ T8B, Address(r21)); // ld4r {v5.8B, v6.8B, v7.8B, v8.8B}, [x21] + __ ld4r(v19, v20, v21, v22, __ T4H, Address(__ post(r27, 8))); // ld4r {v19.4H, v20.4H, v21.4H, v22.4H}, [x27], 8 + __ ld4r(v6, v7, v8, v9, __ T2S, Address(__ post(r30, r22))); // ld4r {v6.2S, v7.2S, v8.2S, v9.2S}, [x30], x22 + +// SHA512SIMDOp + __ sha512h(v4, __ T2D, v23, v1); // sha512h q4, q23, v1.2D + __ sha512h2(v3, __ T2D, v12, v13); // sha512h2 q3, q12, v13.2D + __ sha512su0(v27, __ T2D, v6); // sha512su0 v27.2D, v6.2D + __ sha512su1(v9, __ T2D, v21, v10); // sha512su1 v9.2D, v21.2D, v10.2D // SpecialCases - __ ccmn(zr, zr, 3u, Assembler::LE); // ccmn xzr, xzr, #3, LE - __ ccmnw(zr, zr, 5u, Assembler::EQ); // ccmn wzr, wzr, #5, EQ - __ ccmp(zr, 1, 4u, Assembler::NE); // ccmp xzr, 1, #4, NE - __ ccmpw(zr, 2, 2, Assembler::GT); // ccmp wzr, 2, #2, GT - __ extr(zr, zr, zr, 0); // extr xzr, xzr, xzr, 0 - __ stlxp(r0, zr, zr, sp); // stlxp w0, xzr, xzr, [sp] - __ stlxpw(r2, zr, zr, r3); // stlxp w2, wzr, wzr, [x3] - __ stxp(r4, zr, zr, r5); // stxp w4, xzr, xzr, [x5] - __ stxpw(r6, zr, zr, sp); // stxp w6, wzr, wzr, [sp] - __ dup(v0, __ T16B, zr); // dup v0.16b, wzr - __ mov(v1, __ T1D, 0, zr); // mov v1.d[0], xzr - __ mov(v1, __ T2S, 1, zr); // mov v1.s[1], wzr - __ mov(v1, __ T4H, 2, zr); // mov v1.h[2], wzr - __ mov(v1, __ T8B, 3, zr); // mov v1.b[3], wzr - __ ld1(v31, v0, __ T2D, Address(__ post(r1, r0))); // ld1 {v31.2d, v0.2d}, [x1], x0 + __ ccmn(zr, zr, 3u, Assembler::LE); // ccmn xzr, xzr, #3, LE + __ ccmnw(zr, zr, 5u, Assembler::EQ); // ccmn wzr, wzr, #5, EQ + __ ccmp(zr, 1, 4u, Assembler::NE); // ccmp xzr, 1, #4, NE + __ ccmpw(zr, 2, 2, Assembler::GT); // ccmp wzr, 2, #2, GT + __ extr(zr, zr, zr, 0); // extr xzr, xzr, xzr, 0 + __ stlxp(r0, zr, zr, sp); // stlxp w0, xzr, xzr, [sp] + __ stlxpw(r2, zr, zr, r3); // stlxp w2, wzr, wzr, [x3] + __ stxp(r4, zr, zr, r5); // stxp w4, xzr, xzr, [x5] + __ stxpw(r6, zr, zr, sp); // stxp w6, wzr, wzr, [sp] + __ dup(v0, __ T16B, zr); // dup v0.16b, wzr + __ mov(v1, __ T1D, 0, zr); // mov v1.d[0], xzr + __ mov(v1, __ T2S, 1, zr); // mov v1.s[1], wzr + __ mov(v1, __ T4H, 2, zr); // mov v1.h[2], wzr + __ mov(v1, __ T8B, 3, zr); // mov v1.b[3], wzr + __ ld1(v31, v0, __ T2D, Address(__ post(r1, r0))); // ld1 {v31.2d, v0.2d}, [x1], x0 // FloatImmediateOp - __ fmovd(v0, 2.0); // fmov d0, #2.0 - __ fmovd(v0, 2.125); // fmov d0, #2.125 - __ fmovd(v0, 4.0); // fmov d0, #4.0 - __ fmovd(v0, 4.25); // fmov d0, #4.25 - __ fmovd(v0, 8.0); // fmov d0, #8.0 - __ fmovd(v0, 8.5); // fmov d0, #8.5 - __ fmovd(v0, 16.0); // fmov d0, #16.0 - __ fmovd(v0, 17.0); // fmov d0, #17.0 - __ fmovd(v0, 0.125); // fmov d0, #0.125 - __ fmovd(v0, 0.1328125); // fmov d0, #0.1328125 - __ fmovd(v0, 0.25); // fmov d0, #0.25 - __ fmovd(v0, 0.265625); // fmov d0, #0.265625 - __ fmovd(v0, 0.5); // fmov d0, #0.5 - __ fmovd(v0, 0.53125); // fmov d0, #0.53125 - __ fmovd(v0, 1.0); // fmov d0, #1.0 - __ fmovd(v0, 1.0625); // fmov d0, #1.0625 - __ fmovd(v0, -2.0); // fmov d0, #-2.0 - __ fmovd(v0, -2.125); // fmov d0, #-2.125 - __ fmovd(v0, -4.0); // fmov d0, #-4.0 - __ fmovd(v0, -4.25); // fmov d0, #-4.25 - __ fmovd(v0, -8.0); // fmov d0, #-8.0 - __ fmovd(v0, -8.5); // fmov d0, #-8.5 - __ fmovd(v0, -16.0); // fmov d0, #-16.0 - __ fmovd(v0, -17.0); // fmov d0, #-17.0 - __ fmovd(v0, -0.125); // fmov d0, #-0.125 - __ fmovd(v0, -0.1328125); // fmov d0, #-0.1328125 - __ fmovd(v0, -0.25); // fmov d0, #-0.25 - __ fmovd(v0, -0.265625); // fmov d0, #-0.265625 - __ fmovd(v0, -0.5); // fmov d0, #-0.5 - __ fmovd(v0, -0.53125); // fmov d0, #-0.53125 - __ fmovd(v0, -1.0); // fmov d0, #-1.0 - __ fmovd(v0, -1.0625); // fmov d0, #-1.0625 + __ fmovd(v0, 2.0); // fmov d0, #2.0 + __ fmovd(v0, 2.125); // fmov d0, #2.125 + __ fmovd(v0, 4.0); // fmov d0, #4.0 + __ fmovd(v0, 4.25); // fmov d0, #4.25 + __ fmovd(v0, 8.0); // fmov d0, #8.0 + __ fmovd(v0, 8.5); // fmov d0, #8.5 + __ fmovd(v0, 16.0); // fmov d0, #16.0 + __ fmovd(v0, 17.0); // fmov d0, #17.0 + __ fmovd(v0, 0.125); // fmov d0, #0.125 + __ fmovd(v0, 0.1328125); // fmov d0, #0.1328125 + __ fmovd(v0, 0.25); // fmov d0, #0.25 + __ fmovd(v0, 0.265625); // fmov d0, #0.265625 + __ fmovd(v0, 0.5); // fmov d0, #0.5 + __ fmovd(v0, 0.53125); // fmov d0, #0.53125 + __ fmovd(v0, 1.0); // fmov d0, #1.0 + __ fmovd(v0, 1.0625); // fmov d0, #1.0625 + __ fmovd(v0, -2.0); // fmov d0, #-2.0 + __ fmovd(v0, -2.125); // fmov d0, #-2.125 + __ fmovd(v0, -4.0); // fmov d0, #-4.0 + __ fmovd(v0, -4.25); // fmov d0, #-4.25 + __ fmovd(v0, -8.0); // fmov d0, #-8.0 + __ fmovd(v0, -8.5); // fmov d0, #-8.5 + __ fmovd(v0, -16.0); // fmov d0, #-16.0 + __ fmovd(v0, -17.0); // fmov d0, #-17.0 + __ fmovd(v0, -0.125); // fmov d0, #-0.125 + __ fmovd(v0, -0.1328125); // fmov d0, #-0.1328125 + __ fmovd(v0, -0.25); // fmov d0, #-0.25 + __ fmovd(v0, -0.265625); // fmov d0, #-0.265625 + __ fmovd(v0, -0.5); // fmov d0, #-0.5 + __ fmovd(v0, -0.53125); // fmov d0, #-0.53125 + __ fmovd(v0, -1.0); // fmov d0, #-1.0 + __ fmovd(v0, -1.0625); // fmov d0, #-1.0625 // LSEOp - __ swp(Assembler::xword, r21, r5, r24); // swp x21, x5, [x24] - __ ldadd(Assembler::xword, r13, r13, r15); // ldadd x13, x13, [x15] - __ ldbic(Assembler::xword, r22, r19, r26); // ldclr x22, x19, [x26] - __ ldeor(Assembler::xword, r25, r10, r26); // ldeor x25, x10, [x26] - __ ldorr(Assembler::xword, r5, r27, r15); // ldset x5, x27, [x15] - __ ldsmin(Assembler::xword, r19, r5, r11); // ldsmin x19, x5, [x11] - __ ldsmax(Assembler::xword, r26, r0, r4); // ldsmax x26, x0, [x4] - __ ldumin(Assembler::xword, r22, r23, r30); // ldumin x22, x23, [x30] - __ ldumax(Assembler::xword, r18, r28, r8); // ldumax x18, x28, [x8] + __ swp(Assembler::xword, r24, zr, r3); // swp x24, xzr, [x3] + __ ldadd(Assembler::xword, r5, r6, r5); // ldadd x5, x6, [x5] + __ ldbic(Assembler::xword, r25, r9, r12); // ldclr x25, x9, [x12] + __ ldeor(Assembler::xword, r9, r22, r9); // ldeor x9, x22, [x9] + __ ldorr(Assembler::xword, r14, r4, r1); // ldset x14, x4, [x1] + __ ldsmin(Assembler::xword, r23, r30, r29); // ldsmin x23, x30, [x29] + __ ldsmax(Assembler::xword, r21, r13, r26); // ldsmax x21, x13, [x26] + __ ldumin(Assembler::xword, r16, r9, r11); // ldumin x16, x9, [x11] + __ ldumax(Assembler::xword, r21, r17, r21); // ldumax x21, x17, [x21] // LSEOp - __ swpa(Assembler::xword, r13, r29, r27); // swpa x13, x29, [x27] - __ ldadda(Assembler::xword, r11, r5, r13); // ldadda x11, x5, [x13] - __ ldbica(Assembler::xword, r1, r24, r21); // ldclra x1, x24, [x21] - __ ldeora(Assembler::xword, r27, r17, r24); // ldeora x27, x17, [x24] - __ ldorra(Assembler::xword, r18, r30, r5); // ldseta x18, x30, [x5] - __ ldsmina(Assembler::xword, r7, r22, r25); // ldsmina x7, x22, [x25] - __ ldsmaxa(Assembler::xword, r4, r26, r19); // ldsmaxa x4, x26, [x19] - __ ldumina(Assembler::xword, r6, r30, r3); // ldumina x6, x30, [x3] - __ ldumaxa(Assembler::xword, r24, r23, r5); // ldumaxa x24, x23, [x5] + __ swpa(Assembler::xword, r25, r25, r9); // swpa x25, x25, [x9] + __ ldadda(Assembler::xword, r5, r25, r6); // ldadda x5, x25, [x6] + __ ldbica(Assembler::xword, r24, r14, r23); // ldclra x24, x14, [x23] + __ ldeora(Assembler::xword, r19, r24, r26); // ldeora x19, x24, [x26] + __ ldorra(Assembler::xword, r15, r23, r2); // ldseta x15, x23, [x2] + __ ldsmina(Assembler::xword, r6, r7, r7); // ldsmina x6, x7, [x7] + __ ldsmaxa(Assembler::xword, r30, r15, r14); // ldsmaxa x30, x15, [x14] + __ ldumina(Assembler::xword, zr, r7, r5); // ldumina xzr, x7, [x5] + __ ldumaxa(Assembler::xword, r20, r25, r1); // ldumaxa x20, x25, [x1] // LSEOp - __ swpal(Assembler::xword, r24, r18, r28); // swpal x24, x18, [x28] - __ ldaddal(Assembler::xword, r19, zr, r7); // ldaddal x19, xzr, [x7] - __ ldbical(Assembler::xword, r13, r6, r28); // ldclral x13, x6, [x28] - __ ldeoral(Assembler::xword, r8, r15, r21); // ldeoral x8, x15, [x21] - __ ldorral(Assembler::xword, r2, r13, r1); // ldsetal x2, x13, [x1] - __ ldsminal(Assembler::xword, r17, r29, r25); // ldsminal x17, x29, [x25] - __ ldsmaxal(Assembler::xword, r25, r18, r14); // ldsmaxal x25, x18, [x14] - __ lduminal(Assembler::xword, zr, r6, r27); // lduminal xzr, x6, [x27] - __ ldumaxal(Assembler::xword, r16, r5, r15); // ldumaxal x16, x5, [x15] + __ swpal(Assembler::xword, r16, r18, r17); // swpal x16, x18, [x17] + __ ldaddal(Assembler::xword, r0, r15, r11); // ldaddal x0, x15, [x11] + __ ldbical(Assembler::xword, r9, r17, r7); // ldclral x9, x17, [x7] + __ ldeoral(Assembler::xword, r1, r23, r23); // ldeoral x1, x23, [x23] + __ ldorral(Assembler::xword, r18, r1, r3); // ldsetal x18, x1, [x3] + __ ldsminal(Assembler::xword, r27, zr, r8); // ldsminal x27, xzr, [x8] + __ ldsmaxal(Assembler::xword, r9, r27, r11); // ldsmaxal x9, x27, [x11] + __ lduminal(Assembler::xword, r25, r3, r3); // lduminal x25, x3, [x3] + __ ldumaxal(Assembler::xword, r16, r24, r25); // ldumaxal x16, x24, [x25] // LSEOp - __ swpl(Assembler::xword, r11, r18, r3); // swpl x11, x18, [x3] - __ ldaddl(Assembler::xword, r26, r20, r2); // ldaddl x26, x20, [x2] - __ ldbicl(Assembler::xword, r11, r4, r11); // ldclrl x11, x4, [x11] - __ ldeorl(Assembler::xword, r30, r19, r23); // ldeorl x30, x19, [x23] - __ ldorrl(Assembler::xword, r3, r15, r14); // ldsetl x3, x15, [x14] - __ ldsminl(Assembler::xword, r30, r22, r20); // ldsminl x30, x22, [x20] - __ ldsmaxl(Assembler::xword, r7, r5, r24); // ldsmaxl x7, x5, [x24] - __ lduminl(Assembler::xword, r23, r16, r15); // lduminl x23, x16, [x15] - __ ldumaxl(Assembler::xword, r11, r19, r0); // ldumaxl x11, x19, [x0] + __ swpl(Assembler::xword, r6, r2, r29); // swpl x6, x2, [x29] + __ ldaddl(Assembler::xword, r23, r25, r12); // ldaddl x23, x25, [x12] + __ ldbicl(Assembler::xword, r9, r29, r23); // ldclrl x9, x29, [x23] + __ ldeorl(Assembler::xword, r29, r0, r2); // ldeorl x29, x0, [x2] + __ ldorrl(Assembler::xword, r19, r6, r10); // ldsetl x19, x6, [x10] + __ ldsminl(Assembler::xword, r17, r13, r25); // ldsminl x17, x13, [x25] + __ ldsmaxl(Assembler::xword, r1, r23, r25); // ldsmaxl x1, x23, [x25] + __ lduminl(Assembler::xword, r20, r26, r6); // lduminl x20, x26, [x6] + __ ldumaxl(Assembler::xword, r13, r22, r12); // ldumaxl x13, x22, [x12] // LSEOp - __ swp(Assembler::word, r28, r28, r1); // swp w28, w28, [x1] - __ ldadd(Assembler::word, r11, r21, r12); // ldadd w11, w21, [x12] - __ ldbic(Assembler::word, r29, r0, r18); // ldclr w29, w0, [x18] - __ ldeor(Assembler::word, r5, r0, r25); // ldeor w5, w0, [x25] - __ ldorr(Assembler::word, r14, r0, r26); // ldset w14, w0, [x26] - __ ldsmin(Assembler::word, r28, r18, r29); // ldsmin w28, w18, [x29] - __ ldsmax(Assembler::word, r15, r1, r29); // ldsmax w15, w1, [x29] - __ ldumin(Assembler::word, r8, r26, r28); // ldumin w8, w26, [x28] - __ ldumax(Assembler::word, r17, r14, r4); // ldumax w17, w14, [x4] + __ swp(Assembler::word, r23, r24, r27); // swp w23, w24, [x27] + __ ldadd(Assembler::word, r3, r7, r20); // ldadd w3, w7, [x20] + __ ldbic(Assembler::word, r10, r21, r23); // ldclr w10, w21, [x23] + __ ldeor(Assembler::word, r9, r26, r12); // ldeor w9, w26, [x12] + __ ldorr(Assembler::word, r26, r23, r27); // ldset w26, w23, [x27] + __ ldsmin(Assembler::word, r4, r14, r21); // ldsmin w4, w14, [x21] + __ ldsmax(Assembler::word, r10, r0, r9); // ldsmax w10, w0, [x9] + __ ldumin(Assembler::word, r9, r13, r6); // ldumin w9, w13, [x6] + __ ldumax(Assembler::word, r9, zr, r21); // ldumax w9, wzr, [x21] // LSEOp - __ swpa(Assembler::word, r24, r25, r1); // swpa w24, w25, [x1] - __ ldadda(Assembler::word, r10, r17, r17); // ldadda w10, w17, [x17] - __ ldbica(Assembler::word, r29, r20, r21); // ldclra w29, w20, [x21] - __ ldeora(Assembler::word, r29, r9, r12); // ldeora w29, w9, [x12] - __ ldorra(Assembler::word, r11, r6, r5); // ldseta w11, w6, [x5] - __ ldsmina(Assembler::word, r21, r7, r21); // ldsmina w21, w7, [x21] - __ ldsmaxa(Assembler::word, r10, r23, r12); // ldsmaxa w10, w23, [x12] - __ ldumina(Assembler::word, r21, r5, r10); // ldumina w21, w5, [x10] - __ ldumaxa(Assembler::word, r30, r20, r18); // ldumaxa w30, w20, [x18] + __ swpa(Assembler::word, r12, r28, r11); // swpa w12, w28, [x11] + __ ldadda(Assembler::word, r8, r0, r12); // ldadda w8, w0, [x12] + __ ldbica(Assembler::word, r29, r7, r1); // ldclra w29, w7, [x1] + __ ldeora(Assembler::word, r29, r27, r25); // ldeora w29, w27, [x25] + __ ldorra(Assembler::word, r27, r16, r8); // ldseta w27, w16, [x8] + __ ldsmina(Assembler::word, r13, r18, sp); // ldsmina w13, w18, [sp] + __ ldsmaxa(Assembler::word, r28, r0, r24); // ldsmaxa w28, w0, [x24] + __ ldumina(Assembler::word, r28, r28, r13); // ldumina w28, w28, [x13] + __ ldumaxa(Assembler::word, r14, r29, r2); // ldumaxa w14, w29, [x2] // LSEOp - __ swpal(Assembler::word, r13, r23, r5); // swpal w13, w23, [x5] - __ ldaddal(Assembler::word, r15, r24, r5); // ldaddal w15, w24, [x5] - __ ldbical(Assembler::word, r9, r10, r25); // ldclral w9, w10, [x25] - __ ldeoral(Assembler::word, r20, r17, r17); // ldeoral w20, w17, [x17] - __ ldorral(Assembler::word, r12, r18, r30); // ldsetal w12, w18, [x30] - __ ldsminal(Assembler::word, r3, r3, r25); // ldsminal w3, w3, [x25] - __ ldsmaxal(Assembler::word, r26, r25, r10); // ldsmaxal w26, w25, [x10] - __ lduminal(Assembler::word, r2, r11, sp); // lduminal w2, w11, [sp] - __ ldumaxal(Assembler::word, r7, r2, r5); // ldumaxal w7, w2, [x5] + __ swpal(Assembler::word, r8, r28, r17); // swpal w8, w28, [x17] + __ ldaddal(Assembler::word, r4, r10, r2); // ldaddal w4, w10, [x2] + __ ldbical(Assembler::word, r0, r28, r14); // ldclral w0, w28, [x14] + __ ldeoral(Assembler::word, r8, r12, r4); // ldeoral w8, w12, [x4] + __ ldorral(Assembler::word, r1, r22, r13); // ldsetal w1, w22, [x13] + __ ldsminal(Assembler::word, r24, r6, r20); // ldsminal w24, w6, [x20] + __ ldsmaxal(Assembler::word, r14, r14, r4); // ldsmaxal w14, w14, [x4] + __ lduminal(Assembler::word, r30, r2, r14); // lduminal w30, w2, [x14] + __ ldumaxal(Assembler::word, r2, r18, r22); // ldumaxal w2, w18, [x22] // LSEOp - __ swpl(Assembler::word, r0, r7, r20); // swpl w0, w7, [x20] - __ ldaddl(Assembler::word, r5, zr, r2); // ldaddl w5, wzr, [x2] - __ ldbicl(Assembler::word, r27, r25, r27); // ldclrl w27, w25, [x27] - __ ldeorl(Assembler::word, r30, r24, r26); // ldeorl w30, w24, [x26] - __ ldorrl(Assembler::word, r15, r2, r22); // ldsetl w15, w2, [x22] - __ ldsminl(Assembler::word, r0, r3, sp); // ldsminl w0, w3, [sp] - __ ldsmaxl(Assembler::word, r15, r20, r10); // ldsmaxl w15, w20, [x10] - __ lduminl(Assembler::word, r22, r21, r14); // lduminl w22, w21, [x14] - __ ldumaxl(Assembler::word, r6, r30, r2); // ldumaxl w6, w30, [x2] + __ swpl(Assembler::word, r25, r25, r17); // swpl w25, w25, [x17] + __ ldaddl(Assembler::word, r4, r19, r7); // ldaddl w4, w19, [x7] + __ ldbicl(Assembler::word, r19, r15, r11); // ldclrl w19, w15, [x11] + __ ldeorl(Assembler::word, r23, r29, r16); // ldeorl w23, w29, [x16] + __ ldorrl(Assembler::word, r27, r5, r26); // ldsetl w27, w5, [x26] + __ ldsminl(Assembler::word, zr, r27, r0); // ldsminl wzr, w27, [x0] + __ ldsmaxl(Assembler::word, r22, r6, r4); // ldsmaxl w22, w6, [x4] + __ lduminl(Assembler::word, r13, r30, r2); // lduminl w13, w30, [x2] + __ ldumaxl(Assembler::word, r19, r26, r12); // ldumaxl w19, w26, [x12] __ bind(forth); @@ -762,651 +768,656 @@ aarch64ops.o: file format elf64-littleaarch64 Disassembly of section .text: 0000000000000000 : - 0: 8b50798f add x15, x12, x16, lsr #30 - 4: cb4381e1 sub x1, x15, x3, lsr #32 - 8: ab05372d adds x13, x25, x5, lsl #13 - c: eb864796 subs x22, x28, x6, asr #17 - 10: 0b961920 add w0, w9, w22, asr #6 - 14: 4b195473 sub w19, w3, w25, lsl #21 - 18: 2b0b5264 adds w4, w19, w11, lsl #20 - 1c: 6b9300f8 subs w24, w7, w19, asr #0 - 20: 8a0bc0fe and x30, x7, x11, lsl #48 - 24: aa0f3118 orr x24, x8, x15, lsl #12 - 28: ca170531 eor x17, x9, x23, lsl #1 - 2c: ea44dd6e ands x14, x11, x4, lsr #55 - 30: 0a4c44f3 and w19, w7, w12, lsr #17 - 34: 2a8b7373 orr w19, w27, w11, asr #28 - 38: 4a567c7e eor w30, w3, w22, lsr #31 - 3c: 6a9c0353 ands w19, w26, w28, asr #0 - 40: 8a3accdd bic x29, x6, x26, lsl #51 - 44: aa318f7a orn x26, x27, x17, lsl #35 - 48: ca2e1495 eon x21, x4, x14, lsl #5 - 4c: eaa015e2 bics x2, x15, x0, asr #5 - 50: 0a2274e2 bic w2, w7, w2, lsl #29 - 54: 2a751598 orn w24, w12, w21, lsr #5 - 58: 4a3309fe eon w30, w15, w19, lsl #2 - 5c: 6ab172fe bics w30, w23, w17, asr #28 - 60: 110a5284 add w4, w20, #0x294 - 64: 310b1942 adds w2, w10, #0x2c6 - 68: 5103d353 sub w19, w26, #0xf4 - 6c: 710125bc subs w28, w13, #0x49 - 70: 910d7bc2 add x2, x30, #0x35e - 74: b108fa1b adds x27, x16, #0x23e - 78: d1093536 sub x22, x9, #0x24d - 7c: f10ae824 subs x4, x1, #0x2ba - 80: 120e667c and w28, w19, #0xfffc0fff - 84: 321f6cbb orr w27, w5, #0x1ffffffe - 88: 520f6a9e eor w30, w20, #0xfffe0fff - 8c: 72136f56 ands w22, w26, #0xffffe1ff - 90: 927e4ce5 and x5, x7, #0x3ffffc - 94: b278b4ed orr x13, x7, #0x3fffffffffff00 - 98: d24c6527 eor x7, x9, #0xfff0000000003fff - 9c: f2485803 ands x3, x0, #0xff00000000007fff - a0: 14000000 b a0 - a4: 17ffffd7 b 0 - a8: 140001ee b 860 - ac: 94000000 bl ac - b0: 97ffffd4 bl 0 - b4: 940001eb bl 860 - b8: 34000010 cbz w16, b8 - bc: 34fffa30 cbz w16, 0 - c0: 34003d10 cbz w16, 860 - c4: 35000013 cbnz w19, c4 - c8: 35fff9d3 cbnz w19, 0 - cc: 35003cb3 cbnz w19, 860 - d0: b4000005 cbz x5, d0 - d4: b4fff965 cbz x5, 0 - d8: b4003c45 cbz x5, 860 - dc: b5000004 cbnz x4, dc - e0: b5fff904 cbnz x4, 0 - e4: b5003be4 cbnz x4, 860 - e8: 1000001b adr x27, e8 - ec: 10fff8bb adr x27, 0 - f0: 10003b9b adr x27, 860 - f4: 90000010 adrp x16, 0 - f8: 3640001c tbz w28, #8, f8 - fc: 3647f83c tbz w28, #8, 0 - 100: 36403b1c tbz w28, #8, 860 - 104: 37080001 tbnz w1, #1, 104 - 108: 370ff7c1 tbnz w1, #1, 0 - 10c: 37083aa1 tbnz w1, #1, 860 - 110: 12a437f4 mov w20, #0xde40ffff // #-566165505 - 114: 528c9d67 mov w7, #0x64eb // #25835 - 118: 72838bb1 movk w17, #0x1c5d - 11c: 92c1062e mov x14, #0xfffff7ceffffffff // #-9006546419713 - 120: d287da49 mov x9, #0x3ed2 // #16082 - 124: f2a6d153 movk x19, #0x368a, lsl #16 - 128: 93465ac9 sbfx x9, x22, #6, #17 - 12c: 330b0013 bfi w19, w0, #21, #1 - 130: 530b4e6a ubfx w10, w19, #11, #9 - 134: 934545e4 sbfx x4, x15, #5, #13 - 138: b35370a3 bfxil x3, x5, #19, #10 - 13c: d3510b8c ubfiz x12, x28, #47, #3 - 140: 13960c0f extr w15, w0, w22, #3 - 144: 93ceddc6 ror x6, x14, #55 - 148: 54000000 b.eq 148 // b.none - 14c: 54fff5a0 b.eq 0 // b.none - 150: 54003880 b.eq 860 // b.none - 154: 54000001 b.ne 154 // b.any - 158: 54fff541 b.ne 0 // b.any - 15c: 54003821 b.ne 860 // b.any - 160: 54000002 b.cs 160 // b.hs, b.nlast - 164: 54fff4e2 b.cs 0 // b.hs, b.nlast - 168: 540037c2 b.cs 860 // b.hs, b.nlast - 16c: 54000002 b.cs 16c // b.hs, b.nlast - 170: 54fff482 b.cs 0 // b.hs, b.nlast - 174: 54003762 b.cs 860 // b.hs, b.nlast - 178: 54000003 b.cc 178 // b.lo, b.ul, b.last - 17c: 54fff423 b.cc 0 // b.lo, b.ul, b.last - 180: 54003703 b.cc 860 // b.lo, b.ul, b.last - 184: 54000003 b.cc 184 // b.lo, b.ul, b.last - 188: 54fff3c3 b.cc 0 // b.lo, b.ul, b.last - 18c: 540036a3 b.cc 860 // b.lo, b.ul, b.last - 190: 54000004 b.mi 190 // b.first - 194: 54fff364 b.mi 0 // b.first - 198: 54003644 b.mi 860 // b.first - 19c: 54000005 b.pl 19c // b.nfrst - 1a0: 54fff305 b.pl 0 // b.nfrst - 1a4: 540035e5 b.pl 860 // b.nfrst - 1a8: 54000006 b.vs 1a8 - 1ac: 54fff2a6 b.vs 0 - 1b0: 54003586 b.vs 860 - 1b4: 54000007 b.vc 1b4 - 1b8: 54fff247 b.vc 0 - 1bc: 54003527 b.vc 860 - 1c0: 54000008 b.hi 1c0 // b.pmore - 1c4: 54fff1e8 b.hi 0 // b.pmore - 1c8: 540034c8 b.hi 860 // b.pmore - 1cc: 54000009 b.ls 1cc // b.plast - 1d0: 54fff189 b.ls 0 // b.plast - 1d4: 54003469 b.ls 860 // b.plast - 1d8: 5400000a b.ge 1d8 // b.tcont - 1dc: 54fff12a b.ge 0 // b.tcont - 1e0: 5400340a b.ge 860 // b.tcont - 1e4: 5400000b b.lt 1e4 // b.tstop - 1e8: 54fff0cb b.lt 0 // b.tstop - 1ec: 540033ab b.lt 860 // b.tstop - 1f0: 5400000c b.gt 1f0 - 1f4: 54fff06c b.gt 0 - 1f8: 5400334c b.gt 860 - 1fc: 5400000d b.le 1fc - 200: 54fff00d b.le 0 - 204: 540032ed b.le 860 - 208: 5400000e b.al 208 - 20c: 54ffefae b.al 0 - 210: 5400328e b.al 860 - 214: 5400000f b.nv 214 - 218: 54ffef4f b.nv 0 - 21c: 5400322f b.nv 860 - 220: d40ac601 svc #0x5630 - 224: d40042a2 hvc #0x215 - 228: d404dac3 smc #0x26d6 - 22c: d4224d40 brk #0x126a - 230: d44219c0 hlt #0x10ce - 234: d503201f nop - 238: d69f03e0 eret - 23c: d6bf03e0 drps - 240: d5033fdf isb - 244: d503339f dsb osh - 248: d50335bf dmb nshld - 24c: d61f0280 br x20 - 250: d63f0040 blr x2 - 254: c8127c17 stxr w18, x23, [x0] - 258: c81efec5 stlxr w30, x5, [x22] - 25c: c85f7d05 ldxr x5, [x8] - 260: c85ffe14 ldaxr x20, [x16] - 264: c89ffd66 stlr x6, [x11] - 268: c8dfff66 ldar x6, [x27] - 26c: 880a7cb1 stxr w10, w17, [x5] - 270: 8816fd89 stlxr w22, w9, [x12] - 274: 885f7d1b ldxr w27, [x8] - 278: 885ffc57 ldaxr w23, [x2] - 27c: 889fffba stlr w26, [x29] - 280: 88dffd4d ldar w13, [x10] - 284: 48197f7c stxrh w25, w28, [x27] - 288: 481dfd96 stlxrh w29, w22, [x12] - 28c: 485f7f96 ldxrh w22, [x28] - 290: 485fffc3 ldaxrh w3, [x30] - 294: 489ffdf8 stlrh w24, [x15] - 298: 48dfff5b ldarh w27, [x26] - 29c: 080b7e6a stxrb w11, w10, [x19] - 2a0: 0817fedb stlxrb w23, w27, [x22] - 2a4: 085f7e18 ldxrb w24, [x16] - 2a8: 085ffc38 ldaxrb w24, [x1] - 2ac: 089fffa5 stlrb w5, [x29] - 2b0: 08dffe18 ldarb w24, [x16] - 2b4: c87f6239 ldxp x25, x24, [x17] - 2b8: c87fb276 ldaxp x22, x12, [x19] - 2bc: c820573a stxp w0, x26, x21, [x25] - 2c0: c821aca6 stlxp w1, x6, x11, [x5] - 2c4: 887f388d ldxp w13, w14, [x4] - 2c8: 887f88d1 ldaxp w17, w2, [x6] - 2cc: 882f2643 stxp w15, w3, w9, [x18] - 2d0: 88329131 stlxp w18, w17, w4, [x9] - 2d4: f81cf2b7 stur x23, [x21, #-49] - 2d8: b803f055 stur w21, [x2, #63] - 2dc: 39002f9b strb w27, [x28, #11] - 2e0: 781f31fd sturh w29, [x15, #-13] - 2e4: f85d33ce ldur x14, [x30, #-45] - 2e8: b843539d ldur w29, [x28, #53] - 2ec: 39401f54 ldrb w20, [x26, #7] - 2f0: 785ce059 ldurh w25, [x2, #-50] - 2f4: 389f1143 ldursb x3, [x10, #-15] - 2f8: 788131ee ldursh x14, [x15, #19] - 2fc: 78dfb17d ldursh w29, [x11, #-5] - 300: b89b90af ldursw x15, [x5, #-71] - 304: fc403193 ldur d19, [x12, #3] - 308: bc42a36c ldur s12, [x27, #42] - 30c: fc07d396 stur d22, [x28, #125] - 310: bc1ec1f8 stur s24, [x15, #-20] - 314: f81e8f88 str x8, [x28, #-24]! - 318: b8025de6 str w6, [x15, #37]! - 31c: 38007c27 strb w7, [x1, #7]! - 320: 7801ee20 strh w0, [x17, #30]! - 324: f8454fb9 ldr x25, [x29, #84]! - 328: b85cce9a ldr w26, [x20, #-52]! - 32c: 385e7fba ldrb w26, [x29, #-25]! - 330: 7841af24 ldrh w4, [x25, #26]! - 334: 389ebd1c ldrsb x28, [x8, #-21]! - 338: 789fadd1 ldrsh x17, [x14, #-6]! - 33c: 78c0aefc ldrsh w28, [x23, #10]! - 340: b89c0f7e ldrsw x30, [x27, #-64]! - 344: fc50efd4 ldr d20, [x30, #-242]! - 348: bc414f71 ldr s17, [x27, #20]! - 34c: fc011c67 str d7, [x3, #17]! - 350: bc1f0d6d str s13, [x11, #-16]! - 354: f81c3526 str x6, [x9], #-61 - 358: b81e34b0 str w16, [x5], #-29 - 35c: 3800f7bd strb w29, [x29], #15 - 360: 78012684 strh w4, [x20], #18 - 364: f842e653 ldr x19, [x18], #46 - 368: b8417456 ldr w22, [x2], #23 - 36c: 385e2467 ldrb w7, [x3], #-30 - 370: 785e358b ldrh w11, [x12], #-29 - 374: 389e34c8 ldrsb x8, [x6], #-29 - 378: 788046f8 ldrsh x24, [x23], #4 - 37c: 78c00611 ldrsh w17, [x16], #0 - 380: b89f8680 ldrsw x0, [x20], #-8 - 384: fc582454 ldr d20, [x2], #-126 - 388: bc5987d3 ldr s19, [x30], #-104 - 38c: fc076624 str d4, [x17], #118 - 390: bc190675 str s21, [x19], #-112 - 394: f833785a str x26, [x2, x19, lsl #3] - 398: b82fd809 str w9, [x0, w15, sxtw #2] - 39c: 3821799a strb w26, [x12, x1, lsl #0] - 3a0: 782a7975 strh w21, [x11, x10, lsl #1] - 3a4: f870eaf0 ldr x16, [x23, x16, sxtx] - 3a8: b871d96a ldr w10, [x11, w17, sxtw #2] - 3ac: 386b7aed ldrb w13, [x23, x11, lsl #0] - 3b0: 7875689b ldrh w27, [x4, x21] - 3b4: 38afd91a ldrsb x26, [x8, w15, sxtw #0] - 3b8: 78a2c955 ldrsh x21, [x10, w2, sxtw] - 3bc: 78ee6bc8 ldrsh w8, [x30, x14] - 3c0: b8b4f9dd ldrsw x29, [x14, x20, sxtx #2] - 3c4: fc76eb7e ldr d30, [x27, x22, sxtx] - 3c8: bc76692d ldr s13, [x9, x22] - 3cc: fc31db28 str d8, [x25, w17, sxtw #3] - 3d0: bc255b01 str s1, [x24, w5, uxtw #2] - 3d4: f91c52aa str x10, [x21, #14496] - 3d8: b91c3fb2 str w18, [x29, #7228] - 3dc: 391f8877 strb w23, [x3, #2018] - 3e0: 791ac97c strh w28, [x11, #3428] - 3e4: f95c1758 ldr x24, [x26, #14376] - 3e8: b95b3c55 ldr w21, [x2, #6972] - 3ec: 395ce0a4 ldrb w4, [x5, #1848] - 3f0: 795851ce ldrh w14, [x14, #3112] - 3f4: 399e9f64 ldrsb x4, [x27, #1959] - 3f8: 79993764 ldrsh x4, [x27, #3226] - 3fc: 79d9af8a ldrsh w10, [x28, #3286] - 400: b99eea2a ldrsw x10, [x17, #7912] - 404: fd5a2f8d ldr d13, [x28, #13400] - 408: bd5dac78 ldr s24, [x3, #7596] - 40c: fd1e0182 str d2, [x12, #15360] - 410: bd195c31 str s17, [x1, #6492] - 414: 58000010 ldr x16, 414 - 418: 1800000d ldr w13, 418 - 41c: f8981240 prfum pldl1keep, [x18, #-127] - 420: d8ffdf00 prfm pldl1keep, 0 - 424: f8a27a80 prfm pldl1keep, [x20, x2, lsl #3] - 428: f99af920 prfm pldl1keep, [x9, #13808] - 42c: 1a0202e8 adc w8, w23, w2 - 430: 3a130078 adcs w24, w3, w19 - 434: 5a1d0316 sbc w22, w24, w29 - 438: 7a03036c sbcs w12, w27, w3 - 43c: 9a0102eb adc x11, x23, x1 - 440: ba1700bd adcs x29, x5, x23 - 444: da0c0329 sbc x9, x25, x12 - 448: fa16000c sbcs x12, x0, x22 - 44c: 0b23459a add w26, w12, w3, uxtw #1 - 450: 2b328a14 adds w20, w16, w18, sxtb #2 - 454: cb274bde sub x30, x30, w7, uxtw #2 - 458: 6b222eab subs w11, w21, w2, uxth #3 - 45c: 8b214b42 add x2, x26, w1, uxtw #2 - 460: ab34a7b2 adds x18, x29, w20, sxth #1 - 464: cb24520e sub x14, x16, w4, uxtw #4 - 468: eb378e20 subs x0, x17, w23, sxtb #3 - 46c: 3a565283 ccmn w20, w22, #0x3, pl // pl = nfrst - 470: 7a420321 ccmp w25, w2, #0x1, eq // eq = none - 474: ba58c247 ccmn x18, x24, #0x7, gt - 478: fa4d5106 ccmp x8, x13, #0x6, pl // pl = nfrst - 47c: 3a426924 ccmn w9, #0x2, #0x4, vs - 480: 7a5b0847 ccmp w2, #0x1b, #0x7, eq // eq = none - 484: ba413a02 ccmn x16, #0x1, #0x2, cc // cc = lo, ul, last - 488: fa5fba23 ccmp x17, #0x1f, #0x3, lt // lt = tstop - 48c: 1a979377 csel w23, w27, w23, ls // ls = plast - 490: 1a86640a csinc w10, w0, w6, vs - 494: 5a89300b csinv w11, w0, w9, cc // cc = lo, ul, last - 498: 5a923771 csneg w17, w27, w18, cc // cc = lo, ul, last - 49c: 9a8b720c csel x12, x16, x11, vc - 4a0: 9a868786 csinc x6, x28, x6, hi // hi = pmore - 4a4: da9a736d csinv x13, x27, x26, vc - 4a8: da9256dd csneg x29, x22, x18, pl // pl = nfrst - 4ac: 5ac0026c rbit w12, w19 - 4b0: 5ac00657 rev16 w23, w18 - 4b4: 5ac00b89 rev w9, w28 - 4b8: 5ac01262 clz w2, w19 - 4bc: 5ac017b9 cls w25, w29 - 4c0: dac002e4 rbit x4, x23 - 4c4: dac0065d rev16 x29, x18 - 4c8: dac00907 rev32 x7, x8 - 4cc: dac00e2d rev x13, x17 - 4d0: dac01011 clz x17, x0 - 4d4: dac01752 cls x18, x26 - 4d8: 1ad0098b udiv w11, w12, w16 - 4dc: 1ac70d24 sdiv w4, w9, w7 - 4e0: 1ad020ec lsl w12, w7, w16 - 4e4: 1ad72613 lsr w19, w16, w23 - 4e8: 1ac62887 asr w7, w4, w6 - 4ec: 1ad72e95 ror w21, w20, w23 - 4f0: 9adc0990 udiv x16, x12, x28 - 4f4: 9acd0d84 sdiv x4, x12, x13 - 4f8: 9ac721a9 lsl x9, x13, x7 - 4fc: 9acf277c lsr x28, x27, x15 - 500: 9ace2bd4 asr x20, x30, x14 - 504: 9ade2e4e ror x14, x18, x30 - 508: 9bc77d63 umulh x3, x11, x7 - 50c: 9b587e97 smulh x23, x20, x24 - 510: 1b1524a2 madd w2, w5, w21, w9 - 514: 1b04a318 msub w24, w24, w4, w8 - 518: 9b0f4d8b madd x11, x12, x15, x19 - 51c: 9b0ce73d msub x29, x25, x12, x25 - 520: 9b2c5971 smaddl x17, w11, w12, x22 - 524: 9b34c87c smsubl x28, w3, w20, x18 - 528: 9bbc6887 umaddl x7, w4, w28, x26 - 52c: 9bb19556 umsubl x22, w10, w17, x5 - 530: 1e310871 fmul s17, s3, s17 - 534: 1e261a2b fdiv s11, s17, s6 - 538: 1e2928fd fadd s29, s7, s9 - 53c: 1e333987 fsub s7, s12, s19 - 540: 1e230ae0 fmul s0, s23, s3 - 544: 1e75087a fmul d26, d3, d21 - 548: 1e651a60 fdiv d0, d19, d5 - 54c: 1e692b40 fadd d0, d26, d9 - 550: 1e753ab9 fsub d25, d21, d21 - 554: 1e7309b0 fmul d16, d13, d19 - 558: 1f00425d fmadd s29, s18, s0, s16 - 55c: 1f1d95b7 fmsub s23, s13, s29, s5 - 560: 1f2a38e9 fnmadd s9, s7, s10, s14 - 564: 1f2f5f99 fnmadd s25, s28, s15, s23 - 568: 1f5545a6 fmadd d6, d13, d21, d17 - 56c: 1f429ea3 fmsub d3, d21, d2, d7 - 570: 1f65472a fnmadd d10, d25, d5, d17 - 574: 1f7449ce fnmadd d14, d14, d20, d18 - 578: 1e20404f fmov s15, s2 - 57c: 1e20c0f2 fabs s18, s7 - 580: 1e2140c3 fneg s3, s6 - 584: 1e21c02c fsqrt s12, s1 - 588: 1e22c009 fcvt d9, s0 - 58c: 1e6040a4 fmov d4, d5 - 590: 1e60c1e3 fabs d3, d15 - 594: 1e614331 fneg d17, d25 - 598: 1e61c30c fsqrt d12, d24 - 59c: 1e6240b5 fcvt s21, d5 - 5a0: 1e3802a4 fcvtzs w4, s21 - 5a4: 9e38007b fcvtzs x27, s3 - 5a8: 1e78011d fcvtzs w29, d8 - 5ac: 9e7802a9 fcvtzs x9, d21 - 5b0: 1e2203b4 scvtf s20, w29 - 5b4: 9e220107 scvtf s7, x8 - 5b8: 1e6202ac scvtf d12, w21 - 5bc: 9e6202b0 scvtf d16, x21 - 5c0: 1e2600b2 fmov w18, s5 - 5c4: 9e660119 fmov x25, d8 - 5c8: 1e270352 fmov s18, w26 - 5cc: 9e670160 fmov d0, x11 - 5d0: 1e262200 fcmp s16, s6 - 5d4: 1e7d2200 fcmp d16, d29 - 5d8: 1e2023c8 fcmp s30, #0.0 - 5dc: 1e602128 fcmp d9, #0.0 - 5e0: 293e119b stp w27, w4, [x12, #-16] - 5e4: 294a2543 ldp w3, w9, [x10, #80] - 5e8: 69480c70 ldpsw x16, x3, [x3, #64] - 5ec: a934726a stp x10, x28, [x19, #-192] - 5f0: a97448f3 ldp x19, x18, [x7, #-192] - 5f4: 298243ca stp w10, w16, [x30, #16]! - 5f8: 29e21242 ldp w2, w4, [x18, #-240]! - 5fc: 69c64db8 ldpsw x24, x19, [x13, #48]! - 600: a9800311 stp x17, x0, [x24, #0]! - 604: a9f4686e ldp x14, x26, [x3, #-192]! - 608: 288a0416 stp w22, w1, [x0], #80 - 60c: 28fe2812 ldp w18, w10, [x0], #-16 - 610: 68fe62d8 .inst 0x68fe62d8 ; undefined - 614: a885308c stp x12, x12, [x4], #80 - 618: a8f12664 ldp x4, x9, [x19], #-240 - 61c: 282468d2 stnp w18, w26, [x6, #-224] - 620: 284e5035 ldnp w21, w20, [x1, #112] - 624: a8327699 stnp x25, x29, [x20, #-224] - 628: a84716e1 ldnp x1, x5, [x23, #112] - 62c: 0c407284 ld1 {v4.8b}, [x20] - 630: 4cdfa158 ld1 {v24.16b, v25.16b}, [x10], #32 - 634: 0ccf6cd8 ld1 {v24.1d-v26.1d}, [x6], x15 - 638: 4cdf2483 ld1 {v3.8h-v6.8h}, [x4], #64 - 63c: 0d40c0c2 ld1r {v2.8b}, [x6] - 640: 4ddfc9cd ld1r {v13.4s}, [x14], #4 - 644: 0dd8ceaf ld1r {v15.1d}, [x21], x24 - 648: 4c408ea9 ld2 {v9.2d, v10.2d}, [x21] - 64c: 0cdf86bd ld2 {v29.4h, v30.4h}, [x21], #16 - 650: 4d60c1c8 ld2r {v8.16b, v9.16b}, [x14] - 654: 0dffca87 ld2r {v7.2s, v8.2s}, [x20], #8 - 658: 4de3cc7c ld2r {v28.2d, v29.2d}, [x3], x3 - 65c: 4cdd497b ld3 {v27.4s-v29.4s}, [x11], x29 - 660: 0c404950 ld3 {v16.2s-v18.2s}, [x10] - 664: 4d40e595 ld3r {v21.8h-v23.8h}, [x12] - 668: 4ddfeba4 ld3r {v4.4s-v6.4s}, [x29], #12 - 66c: 0dd3ed38 ld3r {v24.1d-v26.1d}, [x9], x19 - 670: 4cdf046a ld4 {v10.8h-v13.8h}, [x3], #64 - 674: 0cc9039b ld4 {v27.8b-v30.8b}, [x28], x9 - 678: 0d60e3d5 ld4r {v21.8b-v24.8b}, [x30] - 67c: 0dffe5d7 ld4r {v23.4h-v26.4h}, [x14], #8 - 680: 0df4e9a4 ld4r {v4.2s-v7.2s}, [x13], x20 - 684: ba5fd3e3 ccmn xzr, xzr, #0x3, le - 688: 3a5f03e5 ccmn wzr, wzr, #0x5, eq // eq = none - 68c: fa411be4 ccmp xzr, #0x1, #0x4, ne // ne = any - 690: 7a42cbe2 ccmp wzr, #0x2, #0x2, gt - 694: 93df03ff ror xzr, xzr, #0 - 698: c820ffff stlxp w0, xzr, xzr, [sp] - 69c: 8822fc7f stlxp w2, wzr, wzr, [x3] - 6a0: c8247cbf stxp w4, xzr, xzr, [x5] - 6a4: 88267fff stxp w6, wzr, wzr, [sp] - 6a8: 4e010fe0 dup v0.16b, wzr - 6ac: 4e081fe1 mov v1.d[0], xzr - 6b0: 4e0c1fe1 mov v1.s[1], wzr - 6b4: 4e0a1fe1 mov v1.h[2], wzr - 6b8: 4e071fe1 mov v1.b[3], wzr - 6bc: 4cc0ac3f ld1 {v31.2d, v0.2d}, [x1], x0 - 6c0: 1e601000 fmov d0, #2.000000000000000000e+00 - 6c4: 1e603000 fmov d0, #2.125000000000000000e+00 - 6c8: 1e621000 fmov d0, #4.000000000000000000e+00 - 6cc: 1e623000 fmov d0, #4.250000000000000000e+00 - 6d0: 1e641000 fmov d0, #8.000000000000000000e+00 - 6d4: 1e643000 fmov d0, #8.500000000000000000e+00 - 6d8: 1e661000 fmov d0, #1.600000000000000000e+01 - 6dc: 1e663000 fmov d0, #1.700000000000000000e+01 - 6e0: 1e681000 fmov d0, #1.250000000000000000e-01 - 6e4: 1e683000 fmov d0, #1.328125000000000000e-01 - 6e8: 1e6a1000 fmov d0, #2.500000000000000000e-01 - 6ec: 1e6a3000 fmov d0, #2.656250000000000000e-01 - 6f0: 1e6c1000 fmov d0, #5.000000000000000000e-01 - 6f4: 1e6c3000 fmov d0, #5.312500000000000000e-01 - 6f8: 1e6e1000 fmov d0, #1.000000000000000000e+00 - 6fc: 1e6e3000 fmov d0, #1.062500000000000000e+00 - 700: 1e701000 fmov d0, #-2.000000000000000000e+00 - 704: 1e703000 fmov d0, #-2.125000000000000000e+00 - 708: 1e721000 fmov d0, #-4.000000000000000000e+00 - 70c: 1e723000 fmov d0, #-4.250000000000000000e+00 - 710: 1e741000 fmov d0, #-8.000000000000000000e+00 - 714: 1e743000 fmov d0, #-8.500000000000000000e+00 - 718: 1e761000 fmov d0, #-1.600000000000000000e+01 - 71c: 1e763000 fmov d0, #-1.700000000000000000e+01 - 720: 1e781000 fmov d0, #-1.250000000000000000e-01 - 724: 1e783000 fmov d0, #-1.328125000000000000e-01 - 728: 1e7a1000 fmov d0, #-2.500000000000000000e-01 - 72c: 1e7a3000 fmov d0, #-2.656250000000000000e-01 - 730: 1e7c1000 fmov d0, #-5.000000000000000000e-01 - 734: 1e7c3000 fmov d0, #-5.312500000000000000e-01 - 738: 1e7e1000 fmov d0, #-1.000000000000000000e+00 - 73c: 1e7e3000 fmov d0, #-1.062500000000000000e+00 - 740: f8358305 swp x21, x5, [x24] - 744: f82d01ed ldadd x13, x13, [x15] - 748: f8361353 ldclr x22, x19, [x26] - 74c: f839234a ldeor x25, x10, [x26] - 750: f82531fb ldset x5, x27, [x15] - 754: f8335165 ldsmin x19, x5, [x11] - 758: f83a4080 ldsmax x26, x0, [x4] - 75c: f83673d7 ldumin x22, x23, [x30] - 760: f832611c ldumax x18, x28, [x8] - 764: f8ad837d swpa x13, x29, [x27] - 768: f8ab01a5 ldadda x11, x5, [x13] - 76c: f8a112b8 ldclra x1, x24, [x21] - 770: f8bb2311 ldeora x27, x17, [x24] - 774: f8b230be ldseta x18, x30, [x5] - 778: f8a75336 ldsmina x7, x22, [x25] - 77c: f8a4427a ldsmaxa x4, x26, [x19] - 780: f8a6707e ldumina x6, x30, [x3] - 784: f8b860b7 ldumaxa x24, x23, [x5] - 788: f8f88392 swpal x24, x18, [x28] - 78c: f8f300ff ldaddal x19, xzr, [x7] - 790: f8ed1386 ldclral x13, x6, [x28] - 794: f8e822af ldeoral x8, x15, [x21] - 798: f8e2302d ldsetal x2, x13, [x1] - 79c: f8f1533d ldsminal x17, x29, [x25] - 7a0: f8f941d2 ldsmaxal x25, x18, [x14] - 7a4: f8ff7366 lduminal xzr, x6, [x27] - 7a8: f8f061e5 ldumaxal x16, x5, [x15] - 7ac: f86b8072 swpl x11, x18, [x3] - 7b0: f87a0054 ldaddl x26, x20, [x2] - 7b4: f86b1164 ldclrl x11, x4, [x11] - 7b8: f87e22f3 ldeorl x30, x19, [x23] - 7bc: f86331cf ldsetl x3, x15, [x14] - 7c0: f87e5296 ldsminl x30, x22, [x20] - 7c4: f8674305 ldsmaxl x7, x5, [x24] - 7c8: f87771f0 lduminl x23, x16, [x15] - 7cc: f86b6013 ldumaxl x11, x19, [x0] - 7d0: b83c803c swp w28, w28, [x1] - 7d4: b82b0195 ldadd w11, w21, [x12] - 7d8: b83d1240 ldclr w29, w0, [x18] - 7dc: b8252320 ldeor w5, w0, [x25] - 7e0: b82e3340 ldset w14, w0, [x26] - 7e4: b83c53b2 ldsmin w28, w18, [x29] - 7e8: b82f43a1 ldsmax w15, w1, [x29] - 7ec: b828739a ldumin w8, w26, [x28] - 7f0: b831608e ldumax w17, w14, [x4] - 7f4: b8b88039 swpa w24, w25, [x1] - 7f8: b8aa0231 ldadda w10, w17, [x17] - 7fc: b8bd12b4 ldclra w29, w20, [x21] - 800: b8bd2189 ldeora w29, w9, [x12] - 804: b8ab30a6 ldseta w11, w6, [x5] - 808: b8b552a7 ldsmina w21, w7, [x21] - 80c: b8aa4197 ldsmaxa w10, w23, [x12] - 810: b8b57145 ldumina w21, w5, [x10] - 814: b8be6254 ldumaxa w30, w20, [x18] - 818: b8ed80b7 swpal w13, w23, [x5] - 81c: b8ef00b8 ldaddal w15, w24, [x5] - 820: b8e9132a ldclral w9, w10, [x25] - 824: b8f42231 ldeoral w20, w17, [x17] - 828: b8ec33d2 ldsetal w12, w18, [x30] - 82c: b8e35323 ldsminal w3, w3, [x25] - 830: b8fa4159 ldsmaxal w26, w25, [x10] - 834: b8e273eb lduminal w2, w11, [sp] - 838: b8e760a2 ldumaxal w7, w2, [x5] - 83c: b8608287 swpl w0, w7, [x20] - 840: b865005f staddl w5, [x2] - 844: b87b1379 ldclrl w27, w25, [x27] - 848: b87e2358 ldeorl w30, w24, [x26] - 84c: b86f32c2 ldsetl w15, w2, [x22] - 850: b86053e3 ldsminl w0, w3, [sp] - 854: b86f4154 ldsmaxl w15, w20, [x10] - 858: b87671d5 lduminl w22, w21, [x14] - 85c: b866605e ldumaxl w6, w30, [x2] + 0: 8b402464 add x4, x3, x0, lsr #9 + 4: cb0447a8 sub x8, x29, x4, lsl #17 + 8: ab174767 adds x7, x27, x23, lsl #17 + c: eb49a5e6 subs x6, x15, x9, lsr #41 + 10: 0b905c6c add w12, w3, w16, asr #23 + 14: 4b5d7f08 sub w8, w24, w29, lsr #31 + 18: 2b0f1f87 adds w7, w28, w15, lsl #7 + 1c: 6b5c35fa subs w26, w15, w28, lsr #13 + 20: 8a827101 and x1, x8, x2, asr #28 + 24: aa4c2b73 orr x19, x27, x12, lsr #10 + 28: ca4aed64 eor x4, x11, x10, lsr #59 + 2c: ea027225 ands x5, x17, x2, lsl #28 + 30: 0a4c35fc and w28, w15, w12, lsr #13 + 34: 2a5942ae orr w14, w21, w25, lsr #16 + 38: 4a40120d eor w13, w16, w0, lsr #4 + 3c: 6a504f5e ands w30, w26, w16, lsr #19 + 40: 8a7956ec bic x12, x23, x25, lsr #21 + 44: aa6120ab orn x11, x5, x1, lsr #8 + 48: caa5da26 eon x6, x17, x5, asr #54 + 4c: eaafca7e bics x30, x19, x15, asr #50 + 50: 0a7b18cf bic w15, w6, w27, lsr #6 + 54: 2aa61076 orn w22, w3, w6, asr #4 + 58: 4ab71482 eon w2, w4, w23, asr #5 + 5c: 6abe4ca2 bics w2, w5, w30, asr #19 + 60: 110e120c add w12, w16, #0x384 + 64: 310aa10b adds w11, w8, #0x2a8 + 68: 5100b0e8 sub w8, w7, #0x2c + 6c: 710f89e8 subs w8, w15, #0x3e2 + 70: 91002740 add x0, x26, #0x9 + 74: b10e865b adds x27, x18, #0x3a1 + 78: d104b112 sub x18, x8, #0x12c + 7c: f1091db4 subs x20, x13, #0x247 + 80: 121d4e7d and w29, w19, #0x7ffff8 + 84: 3215606e orr w14, w3, #0xfffff80f + 88: 520c03ae eor w14, w29, #0x100000 + 8c: 72174638 ands w24, w17, #0x7fffe00 + 90: 92022071 and x17, x3, #0xc000007fc000007f + 94: b2061dc7 orr x7, x14, #0xfc000003fc000003 + 98: d245bb45 eor x5, x26, #0xf80003ffffffffff + 9c: f20a22ba ands x26, x21, #0x7fc000007fc00000 + a0: 14000000 b a0 + a4: 17ffffd7 b 0 + a8: 140001f2 b 870 + ac: 94000000 bl ac + b0: 97ffffd4 bl 0 + b4: 940001ef bl 870 + b8: 34000000 cbz w0, b8 + bc: 34fffa20 cbz w0, 0 + c0: 34003d80 cbz w0, 870 + c4: 3500000b cbnz w11, c4 + c8: 35fff9cb cbnz w11, 0 + cc: 35003d2b cbnz w11, 870 + d0: b4000015 cbz x21, d0 + d4: b4fff975 cbz x21, 0 + d8: b4003cd5 cbz x21, 870 + dc: b5000008 cbnz x8, dc + e0: b5fff908 cbnz x8, 0 + e4: b5003c68 cbnz x8, 870 + e8: 1000000b adr x11, e8 + ec: 10fff8ab adr x11, 0 + f0: 10003c0b adr x11, 870 + f4: 90000000 adrp x0, 0 + f8: 36100005 tbz w5, #2, f8 + fc: 3617f825 tbz w5, #2, 0 + 100: 36103b85 tbz w5, #2, 870 + 104: 37200016 tbnz w22, #4, 104 + 108: 3727f7d6 tbnz w22, #4, 0 + 10c: 37203b36 tbnz w22, #4, 870 + 110: 12a5b6d6 mov w22, #0xd249ffff // #-766902273 + 114: 52ad7534 mov w20, #0x6ba90000 // #1806237696 + 118: 728edc9e movk w30, #0x76e4 + 11c: 92ce63db mov x27, #0xffff8ce1ffffffff // #-126572686213121 + 120: d2e3cc61 mov x1, #0x1e63000000000000 // #2189593843832193024 + 124: f2a1d6a9 movk x9, #0xeb5, lsl #16 + 128: 9355739c sbfx x28, x28, #21, #8 + 12c: 3308088f bfi w15, w4, #24, #3 + 130: 53174135 ubfiz w21, w9, #9, #17 + 134: 935a576e sbfiz x14, x27, #38, #22 + 138: b35c74d3 bfxil x19, x6, #28, #2 + 13c: d3500acb ubfiz x11, x22, #48, #3 + 140: 138172c7 extr w7, w22, w1, #28 + 144: 93cedb75 extr x21, x27, x14, #54 + 148: 54000000 b.eq 148 // b.none + 14c: 54fff5a0 b.eq 0 // b.none + 150: 54003900 b.eq 870 // b.none + 154: 54000001 b.ne 154 // b.any + 158: 54fff541 b.ne 0 // b.any + 15c: 540038a1 b.ne 870 // b.any + 160: 54000002 b.cs 160 // b.hs, b.nlast + 164: 54fff4e2 b.cs 0 // b.hs, b.nlast + 168: 54003842 b.cs 870 // b.hs, b.nlast + 16c: 54000002 b.cs 16c // b.hs, b.nlast + 170: 54fff482 b.cs 0 // b.hs, b.nlast + 174: 540037e2 b.cs 870 // b.hs, b.nlast + 178: 54000003 b.cc 178 // b.lo, b.ul, b.last + 17c: 54fff423 b.cc 0 // b.lo, b.ul, b.last + 180: 54003783 b.cc 870 // b.lo, b.ul, b.last + 184: 54000003 b.cc 184 // b.lo, b.ul, b.last + 188: 54fff3c3 b.cc 0 // b.lo, b.ul, b.last + 18c: 54003723 b.cc 870 // b.lo, b.ul, b.last + 190: 54000004 b.mi 190 // b.first + 194: 54fff364 b.mi 0 // b.first + 198: 540036c4 b.mi 870 // b.first + 19c: 54000005 b.pl 19c // b.nfrst + 1a0: 54fff305 b.pl 0 // b.nfrst + 1a4: 54003665 b.pl 870 // b.nfrst + 1a8: 54000006 b.vs 1a8 + 1ac: 54fff2a6 b.vs 0 + 1b0: 54003606 b.vs 870 + 1b4: 54000007 b.vc 1b4 + 1b8: 54fff247 b.vc 0 + 1bc: 540035a7 b.vc 870 + 1c0: 54000008 b.hi 1c0 // b.pmore + 1c4: 54fff1e8 b.hi 0 // b.pmore + 1c8: 54003548 b.hi 870 // b.pmore + 1cc: 54000009 b.ls 1cc // b.plast + 1d0: 54fff189 b.ls 0 // b.plast + 1d4: 540034e9 b.ls 870 // b.plast + 1d8: 5400000a b.ge 1d8 // b.tcont + 1dc: 54fff12a b.ge 0 // b.tcont + 1e0: 5400348a b.ge 870 // b.tcont + 1e4: 5400000b b.lt 1e4 // b.tstop + 1e8: 54fff0cb b.lt 0 // b.tstop + 1ec: 5400342b b.lt 870 // b.tstop + 1f0: 5400000c b.gt 1f0 + 1f4: 54fff06c b.gt 0 + 1f8: 540033cc b.gt 870 + 1fc: 5400000d b.le 1fc + 200: 54fff00d b.le 0 + 204: 5400336d b.le 870 + 208: 5400000e b.al 208 + 20c: 54ffefae b.al 0 + 210: 5400330e b.al 870 + 214: 5400000f b.nv 214 + 218: 54ffef4f b.nv 0 + 21c: 540032af b.nv 870 + 220: d40faaa1 svc #0x7d55 + 224: d4025942 hvc #0x12ca + 228: d40ab883 smc #0x55c4 + 22c: d42a4f00 brk #0x5278 + 230: d447c560 hlt #0x3e2b + 234: d503201f nop + 238: d69f03e0 eret + 23c: d6bf03e0 drps + 240: d5033fdf isb + 244: d5033a9f dsb ishst + 248: d5033abf dmb ishst + 24c: d61f0220 br x17 + 250: d63f0000 blr x0 + 254: c8037d87 stxr w3, x7, [x12] + 258: c810fe4d stlxr w16, x13, [x18] + 25c: c85f7fcb ldxr x11, [x30] + 260: c85ffc75 ldaxr x21, [x3] + 264: c89fff56 stlr x22, [x26] + 268: c8dfff62 ldar x2, [x27] + 26c: 88147c4f stxr w20, w15, [x2] + 270: 880bfda8 stlxr w11, w8, [x13] + 274: 885f7f50 ldxr w16, [x26] + 278: 885ffd7b ldaxr w27, [x11] + 27c: 889ffc9e stlr w30, [x4] + 280: 88dffd62 ldar w2, [x11] + 284: 48167e5b stxrh w22, w27, [x18] + 288: 4819feea stlxrh w25, w10, [x23] + 28c: 485f7fcd ldxrh w13, [x30] + 290: 485ffc4d ldaxrh w13, [x2] + 294: 489fff02 stlrh w2, [x24] + 298: 48dffef9 ldarh w25, [x23] + 29c: 080d7fa0 stxrb w13, w0, [x29] + 2a0: 0808fcd4 stlxrb w8, w20, [x6] + 2a4: 085f7caf ldxrb w15, [x5] + 2a8: 085ffd40 ldaxrb w0, [x10] + 2ac: 089fff4c stlrb w12, [x26] + 2b0: 08dffc4b ldarb w11, [x2] + 2b4: c87f4537 ldxp x23, x17, [x9] + 2b8: c87f9da1 ldaxp x1, x7, [x13] + 2bc: c8272fa0 stxp w7, x0, x11, [x29] + 2c0: c8399576 stlxp w25, x22, x5, [x11] + 2c4: 887f1b67 ldxp w7, w6, [x27] + 2c8: 887f8b07 ldaxp w7, w2, [x24] + 2cc: 88267a65 stxp w6, w5, w30, [x19] + 2d0: 88229e5d stlxp w2, w29, w7, [x18] + 2d4: f814929d stur x29, [x20, #-183] + 2d8: b81d91a6 stur w6, [x13, #-39] + 2dc: 381f50a9 sturb w9, [x5, #-11] + 2e0: 78015116 sturh w22, [x8, #21] + 2e4: f85af3a1 ldur x1, [x29, #-81] + 2e8: b85e53b4 ldur w20, [x29, #-27] + 2ec: 385f818f ldurb w15, [x12, #-8] + 2f0: 785c20e9 ldurh w9, [x7, #-62] + 2f4: 389f71b7 ldursb x23, [x13, #-9] + 2f8: 79803db2 ldrsh x18, [x13, #30] + 2fc: 79c037d1 ldrsh w17, [x30, #26] + 300: b89831d5 ldursw x21, [x14, #-125] + 304: fc43b1b5 ldur d21, [x13, #59] + 308: bc43f115 ldur s21, [x8, #63] + 30c: fc035316 stur d22, [x24, #53] + 310: bc01501a stur s26, [x0, #21] + 314: f8129ed7 str x23, [x22, #-215]! + 318: b81fdfbe str w30, [x29, #-3]! + 31c: 381eece2 strb w2, [x7, #-18]! + 320: 78013d97 strh w23, [x12, #19]! + 324: f852ec92 ldr x18, [x4, #-210]! + 328: b85b9fd3 ldr w19, [x30, #-71]! + 32c: 385f5e91 ldrb w17, [x20, #-11]! + 330: 785c0dc9 ldrh w9, [x14, #-64]! + 334: 3880bc66 ldrsb x6, [x3, #11]! + 338: 789faecb ldrsh x11, [x22, #-6]! + 33c: 78de5d66 ldrsh w6, [x11, #-27]! + 340: b8836e59 ldrsw x25, [x18, #54]! + 344: fc5f8ef5 ldr d21, [x23, #-8]! + 348: bc5d9d5e ldr s30, [x10, #-39]! + 34c: fc17fc22 str d2, [x1, #-129]! + 350: bc001c1a str s26, [x0, #1]! + 354: f819d749 str x9, [x26], #-99 + 358: b803e5c9 str w9, [x14], #62 + 35c: 381e275e strb w30, [x26], #-30 + 360: 7800b61c strh w28, [x16], #11 + 364: f844d75d ldr x29, [x26], #77 + 368: b84356e0 ldr w0, [x23], #53 + 36c: 385ee6a7 ldrb w7, [x21], #-18 + 370: 784185b8 ldrh w24, [x13], #24 + 374: 389ef501 ldrsb x1, [x8], #-17 + 378: 789de771 ldrsh x17, [x27], #-34 + 37c: 78de6435 ldrsh w21, [x1], #-26 + 380: b88006a6 ldrsw x6, [x21], #0 + 384: fc43a465 ldr d5, [x3], #58 + 388: bc5b0667 ldr s7, [x19], #-80 + 38c: fc01b601 str d1, [x16], #27 + 390: bc03e727 str s7, [x25], #62 + 394: f83e586d str x13, [x3, w30, uxtw #3] + 398: b821e871 str w17, [x3, x1, sxtx] + 39c: 383b7a77 strb w23, [x19, x27, lsl #0] + 3a0: 782a5a85 strh w5, [x20, w10, uxtw #1] + 3a4: f870d85d ldr x29, [x2, w16, sxtw #3] + 3a8: b875fa30 ldr w16, [x17, x21, sxtx #2] + 3ac: 38705a0a ldrb w10, [x16, w16, uxtw #0] + 3b0: 787adb77 ldrh w23, [x27, w26, sxtw #1] + 3b4: 38a7780d ldrsb x13, [x0, x7, lsl #0] + 3b8: 78b248af ldrsh x15, [x5, w18, uxtw] + 3bc: 78f27a92 ldrsh w18, [x20, x18, lsl #1] + 3c0: b8b149de ldrsw x30, [x14, w17, uxtw] + 3c4: fc7a58d3 ldr d19, [x6, w26, uxtw #3] + 3c8: bc62cafe ldr s30, [x23, w2, sxtw] + 3cc: fc274adb str d27, [x22, w7, uxtw] + 3d0: bc3afb09 str s9, [x24, x26, sxtx #2] + 3d4: f91f778e str x14, [x28, #16104] + 3d8: b91eb9b0 str w16, [x13, #7864] + 3dc: 39186b74 strb w20, [x27, #1562] + 3e0: 791988f0 strh w16, [x7, #3268] + 3e4: f95e4ea5 ldr x5, [x21, #15512] + 3e8: b95de900 ldr w0, [x8, #7656] + 3ec: 395f90e1 ldrb w1, [x7, #2020] + 3f0: 7959bdc1 ldrh w1, [x14, #3294] + 3f4: 399b9b26 ldrsb x6, [x25, #1766] + 3f8: 79996209 ldrsh x9, [x16, #3248] + 3fc: 79dc309b ldrsh w27, [x4, #3608] + 400: b99c8e02 ldrsw x2, [x16, #7308] + 404: fd5fa345 ldr d5, [x26, #16192] + 408: bd5efdb3 ldr s19, [x13, #7932] + 40c: fd1a20f6 str d22, [x7, #13376] + 410: bd1e8928 str s8, [x9, #7816] + 414: 58ffdf7a ldr x26, 0 + 418: 18ffdf4c ldr w12, 0 + 41c: f882f140 prfum pldl1keep, [x10, #47] + 420: d8002280 prfm pldl1keep, 870 + 424: f8b47aa0 prfm pldl1keep, [x21, x20, lsl #3] + 428: f99ed1a0 prfm pldl1keep, [x13, #15776] + 42c: 1a03011a adc w26, w8, w3 + 430: 3a0703c9 adcs w9, w30, w7 + 434: 5a0b01f8 sbc w24, w15, w11 + 438: 7a0b02a4 sbcs w4, w21, w11 + 43c: 9a1e022f adc x15, x17, x30 + 440: ba1001e6 adcs x6, x15, x16 + 444: da0a0041 sbc x1, x2, x10 + 448: fa0b0089 sbcs x9, x4, x11 + 44c: 0b3167b7 add w23, w29, w17, uxtx #1 + 450: 2b2bed6f adds w15, w11, w11, sxtx #3 + 454: cb2753c2 sub x2, x30, w7, uxtw #4 + 458: 6b3a867e subs w30, w19, w26, sxtb #1 + 45c: 8b2c6c02 add x2, x0, x12, uxtx #3 + 460: ab30902e adds x14, x1, w16, sxtb #4 + 464: cb378ecf sub x15, x22, w23, sxtb #3 + 468: eb3c4480 subs x0, x4, w28, uxtw #1 + 46c: 3a5220ab ccmn w5, w18, #0xb, cs // cs = hs, nlast + 470: 7a552248 ccmp w18, w21, #0x8, cs // cs = hs, nlast + 474: ba5131ef ccmn x15, x17, #0xf, cc // cc = lo, ul, last + 478: fa5711a6 ccmp x13, x23, #0x6, ne // ne = any + 47c: 3a493b8f ccmn w28, #0x9, #0xf, cc // cc = lo, ul, last + 480: 7a4c99c9 ccmp w14, #0xc, #0x9, ls // ls = plast + 484: ba463ac2 ccmn x22, #0x6, #0x2, cc // cc = lo, ul, last + 488: fa4c4aa0 ccmp x21, #0xc, #0x0, mi // mi = first + 48c: 1a9cc2ae csel w14, w21, w28, gt + 490: 1a91c5d9 csinc w25, w14, w17, gt + 494: 5a9920d1 csinv w17, w6, w25, cs // cs = hs, nlast + 498: 5a8e2455 csneg w21, w2, w14, cs // cs = hs, nlast + 49c: 9a912163 csel x3, x11, x17, cs // cs = hs, nlast + 4a0: 9a9b27db csinc x27, x30, x27, cs // cs = hs, nlast + 4a4: da8581e0 csinv x0, x15, x5, hi // hi = pmore + 4a8: da882562 csneg x2, x11, x8, cs // cs = hs, nlast + 4ac: 5ac00262 rbit w2, w19 + 4b0: 5ac00596 rev16 w22, w12 + 4b4: 5ac00ac5 rev w5, w22 + 4b8: 5ac01363 clz w3, w27 + 4bc: 5ac01492 cls w18, w4 + 4c0: dac00376 rbit x22, x27 + 4c4: dac0054c rev16 x12, x10 + 4c8: dac00885 rev32 x5, x4 + 4cc: dac00d56 rev x22, x10 + 4d0: dac010ed clz x13, x7 + 4d4: dac01546 cls x6, x10 + 4d8: 1adc0a02 udiv w2, w16, w28 + 4dc: 1ac80ee8 sdiv w8, w23, w8 + 4e0: 1ace2232 lsl w18, w17, w14 + 4e4: 1ad6273e lsr w30, w25, w22 + 4e8: 1ac52850 asr w16, w2, w5 + 4ec: 1ac02f8f ror w15, w28, w0 + 4f0: 9ac10a8d udiv x13, x20, x1 + 4f4: 9ad20fdc sdiv x28, x30, x18 + 4f8: 9ac92391 lsl x17, x28, x9 + 4fc: 9ac425b2 lsr x18, x13, x4 + 500: 9ad02b0c asr x12, x24, x16 + 504: 9ad82d2e ror x14, x9, x24 + 508: 9bd87c94 umulh x20, x4, x24 + 50c: 9b5c7cb2 smulh x18, x5, x28 + 510: 1b114bb3 madd w19, w29, w17, w18 + 514: 1b0fcece msub w14, w22, w15, w19 + 518: 9b0120ac madd x12, x5, x1, x8 + 51c: 9b0bc256 msub x22, x18, x11, x16 + 520: 9b2c7960 smaddl x0, w11, w12, x30 + 524: 9b2db113 smsubl x19, w8, w13, x12 + 528: 9bb117cd umaddl x13, w30, w17, x5 + 52c: 9bb7a590 umsubl x16, w12, w23, x9 + 530: 1e200a86 fmul s6, s20, s0 + 534: 1e2f18d5 fdiv s21, s6, s15 + 538: 1e392938 fadd s24, s9, s25 + 53c: 1e323b09 fsub s9, s24, s18 + 540: 1e2a0b1a fmul s26, s24, s10 + 544: 1e600a8c fmul d12, d20, d0 + 548: 1e7019ec fdiv d12, d15, d16 + 54c: 1e7d28d8 fadd d24, d6, d29 + 550: 1e6e38d8 fsub d24, d6, d14 + 554: 1e6f0bb5 fmul d21, d29, d15 + 558: 1f017729 fmadd s9, s25, s1, s29 + 55c: 1f0af68d fmsub s13, s20, s10, s29 + 560: 1f2b1d7c fnmadd s28, s11, s11, s7 + 564: 1f350787 fnmadd s7, s28, s21, s1 + 568: 1f4f07be fmadd d30, d29, d15, d1 + 56c: 1f5be90c fmsub d12, d8, d27, d26 + 570: 1f6b6711 fnmadd d17, d24, d11, d25 + 574: 1f68003e fnmadd d30, d1, d8, d0 + 578: 1e2040a1 fmov s1, s5 + 57c: 1e20c266 fabs s6, s19 + 580: 1e214004 fneg s4, s0 + 584: 1e21c149 fsqrt s9, s10 + 588: 1e22c1d4 fcvt d20, s14 + 58c: 1e604260 fmov d0, d19 + 590: 1e60c25e fabs d30, d18 + 594: 1e614100 fneg d0, d8 + 598: 1e61c100 fsqrt d0, d8 + 59c: 1e6243ce fcvt s14, d30 + 5a0: 1e3802d3 fcvtzs w19, s22 + 5a4: 9e380151 fcvtzs x17, s10 + 5a8: 1e7802bb fcvtzs w27, d21 + 5ac: 9e780087 fcvtzs x7, d4 + 5b0: 1e22033e scvtf s30, w25 + 5b4: 9e220219 scvtf s25, x16 + 5b8: 1e620349 scvtf d9, w26 + 5bc: 9e620007 scvtf d7, x0 + 5c0: 1e2601e0 fmov w0, s15 + 5c4: 9e66008b fmov x11, d4 + 5c8: 1e2701fe fmov s30, w15 + 5cc: 9e6702e2 fmov d2, x23 + 5d0: 1e2a21c0 fcmp s14, s10 + 5d4: 1e6023c0 fcmp d30, d0 + 5d8: 1e202168 fcmp s11, #0.0 + 5dc: 1e602308 fcmp d24, #0.0 + 5e0: 2922403c stp w28, w16, [x1, #-240] + 5e4: 294c55d7 ldp w23, w21, [x14, #96] + 5e8: 697860e0 ldpsw x0, x24, [x7, #-64] + 5ec: a9085215 stp x21, x20, [x16, #128] + 5f0: a9790f41 ldp x1, x3, [x26, #-112] + 5f4: 29a2394c stp w12, w14, [x10, #-240]! + 5f8: 29e200e3 ldp w3, w0, [x7, #-240]! + 5fc: 69e660ba ldpsw x26, x24, [x5, #-208]! + 600: a9b65910 stp x16, x22, [x8, #-160]! + 604: a9f711fa ldp x26, x4, [x15, #-144]! + 608: 288e73a9 stp w9, w28, [x29], #112 + 60c: 28c81468 ldp w8, w5, [x3], #64 + 610: 68e6119e ldpsw x30, x4, [x12], #-208 + 614: a8b67a0e stp x14, x30, [x16], #-160 + 618: a8f3593b ldp x27, x22, [x9], #-208 + 61c: 2820571a stnp w26, w21, [x24, #-256] + 620: 287a25f4 ldnp w20, w9, [x15, #-48] + 624: a83169af stnp x15, x26, [x13, #-240] + 628: a84168a5 ldnp x5, x26, [x5, #16] + 62c: 0c407353 ld1 {v19.8b}, [x26] + 630: 4cdfa1c1 ld1 {v1.16b, v2.16b}, [x14], #32 + 634: 0cd96f1d ld1 {v29.1d-v31.1d}, [x24], x25 + 638: 4cdf2414 ld1 {v20.8h-v23.8h}, [x0], #64 + 63c: 0d40c379 ld1r {v25.8b}, [x27] + 640: 4ddfcb5e ld1r {v30.4s}, [x26], #4 + 644: 0dcacea9 ld1r {v9.1d}, [x21], x10 + 648: 4c408dc2 ld2 {v2.2d, v3.2d}, [x14] + 64c: 0cdf864e ld2 {v14.4h, v15.4h}, [x18], #16 + 650: 4d60c004 ld2r {v4.16b, v5.16b}, [x0] + 654: 0dffc832 ld2r {v18.2s, v19.2s}, [x1], #8 + 658: 4dfbcc1a ld2r {v26.2d, v27.2d}, [x0], x27 + 65c: 4cc34ac7 ld3 {v7.4s-v9.4s}, [x22], x3 + 660: 0c404aa5 ld3 {v5.2s-v7.2s}, [x21] + 664: 4d40e4fe ld3r {v30.8h, v31.8h, v0.8h}, [x7] + 668: 4ddfeae7 ld3r {v7.4s-v9.4s}, [x23], #12 + 66c: 0dc6ed4f ld3r {v15.1d-v17.1d}, [x10], x6 + 670: 4cdf0734 ld4 {v20.8h-v23.8h}, [x25], #64 + 674: 0cd80365 ld4 {v5.8b-v8.8b}, [x27], x24 + 678: 0d60e2a5 ld4r {v5.8b-v8.8b}, [x21] + 67c: 0dffe773 ld4r {v19.4h-v22.4h}, [x27], #8 + 680: 0df6ebc6 ld4r {v6.2s-v9.2s}, [x30], x22 + 684: ce6182e4 sha512h q4, q23, v1.2d + 688: ce6d8583 sha512h2 q3, q12, v13.2d + 68c: cec080db sha512su0 v27.2d, v6.2d + 690: ce6a8aa9 sha512su1 v9.2d, v21.2d, v10.2d + 694: ba5fd3e3 ccmn xzr, xzr, #0x3, le + 698: 3a5f03e5 ccmn wzr, wzr, #0x5, eq // eq = none + 69c: fa411be4 ccmp xzr, #0x1, #0x4, ne // ne = any + 6a0: 7a42cbe2 ccmp wzr, #0x2, #0x2, gt + 6a4: 93df03ff ror xzr, xzr, #0 + 6a8: c820ffff stlxp w0, xzr, xzr, [sp] + 6ac: 8822fc7f stlxp w2, wzr, wzr, [x3] + 6b0: c8247cbf stxp w4, xzr, xzr, [x5] + 6b4: 88267fff stxp w6, wzr, wzr, [sp] + 6b8: 4e010fe0 dup v0.16b, wzr + 6bc: 4e081fe1 mov v1.d[0], xzr + 6c0: 4e0c1fe1 mov v1.s[1], wzr + 6c4: 4e0a1fe1 mov v1.h[2], wzr + 6c8: 4e071fe1 mov v1.b[3], wzr + 6cc: 4cc0ac3f ld1 {v31.2d, v0.2d}, [x1], x0 + 6d0: 1e601000 fmov d0, #2.000000000000000000e+00 + 6d4: 1e603000 fmov d0, #2.125000000000000000e+00 + 6d8: 1e621000 fmov d0, #4.000000000000000000e+00 + 6dc: 1e623000 fmov d0, #4.250000000000000000e+00 + 6e0: 1e641000 fmov d0, #8.000000000000000000e+00 + 6e4: 1e643000 fmov d0, #8.500000000000000000e+00 + 6e8: 1e661000 fmov d0, #1.600000000000000000e+01 + 6ec: 1e663000 fmov d0, #1.700000000000000000e+01 + 6f0: 1e681000 fmov d0, #1.250000000000000000e-01 + 6f4: 1e683000 fmov d0, #1.328125000000000000e-01 + 6f8: 1e6a1000 fmov d0, #2.500000000000000000e-01 + 6fc: 1e6a3000 fmov d0, #2.656250000000000000e-01 + 700: 1e6c1000 fmov d0, #5.000000000000000000e-01 + 704: 1e6c3000 fmov d0, #5.312500000000000000e-01 + 708: 1e6e1000 fmov d0, #1.000000000000000000e+00 + 70c: 1e6e3000 fmov d0, #1.062500000000000000e+00 + 710: 1e701000 fmov d0, #-2.000000000000000000e+00 + 714: 1e703000 fmov d0, #-2.125000000000000000e+00 + 718: 1e721000 fmov d0, #-4.000000000000000000e+00 + 71c: 1e723000 fmov d0, #-4.250000000000000000e+00 + 720: 1e741000 fmov d0, #-8.000000000000000000e+00 + 724: 1e743000 fmov d0, #-8.500000000000000000e+00 + 728: 1e761000 fmov d0, #-1.600000000000000000e+01 + 72c: 1e763000 fmov d0, #-1.700000000000000000e+01 + 730: 1e781000 fmov d0, #-1.250000000000000000e-01 + 734: 1e783000 fmov d0, #-1.328125000000000000e-01 + 738: 1e7a1000 fmov d0, #-2.500000000000000000e-01 + 73c: 1e7a3000 fmov d0, #-2.656250000000000000e-01 + 740: 1e7c1000 fmov d0, #-5.000000000000000000e-01 + 744: 1e7c3000 fmov d0, #-5.312500000000000000e-01 + 748: 1e7e1000 fmov d0, #-1.000000000000000000e+00 + 74c: 1e7e3000 fmov d0, #-1.062500000000000000e+00 + 750: f838807f swp x24, xzr, [x3] + 754: f82500a6 ldadd x5, x6, [x5] + 758: f8391189 ldclr x25, x9, [x12] + 75c: f8292136 ldeor x9, x22, [x9] + 760: f82e3024 ldset x14, x4, [x1] + 764: f83753be ldsmin x23, x30, [x29] + 768: f835434d ldsmax x21, x13, [x26] + 76c: f8307169 ldumin x16, x9, [x11] + 770: f83562b1 ldumax x21, x17, [x21] + 774: f8b98139 swpa x25, x25, [x9] + 778: f8a500d9 ldadda x5, x25, [x6] + 77c: f8b812ee ldclra x24, x14, [x23] + 780: f8b32358 ldeora x19, x24, [x26] + 784: f8af3057 ldseta x15, x23, [x2] + 788: f8a650e7 ldsmina x6, x7, [x7] + 78c: f8be41cf ldsmaxa x30, x15, [x14] + 790: f8bf70a7 ldumina xzr, x7, [x5] + 794: f8b46039 ldumaxa x20, x25, [x1] + 798: f8f08232 swpal x16, x18, [x17] + 79c: f8e0016f ldaddal x0, x15, [x11] + 7a0: f8e910f1 ldclral x9, x17, [x7] + 7a4: f8e122f7 ldeoral x1, x23, [x23] + 7a8: f8f23061 ldsetal x18, x1, [x3] + 7ac: f8fb511f ldsminal x27, xzr, [x8] + 7b0: f8e9417b ldsmaxal x9, x27, [x11] + 7b4: f8f97063 lduminal x25, x3, [x3] + 7b8: f8f06338 ldumaxal x16, x24, [x25] + 7bc: f86683a2 swpl x6, x2, [x29] + 7c0: f8770199 ldaddl x23, x25, [x12] + 7c4: f86912fd ldclrl x9, x29, [x23] + 7c8: f87d2040 ldeorl x29, x0, [x2] + 7cc: f8733146 ldsetl x19, x6, [x10] + 7d0: f871532d ldsminl x17, x13, [x25] + 7d4: f8614337 ldsmaxl x1, x23, [x25] + 7d8: f87470da lduminl x20, x26, [x6] + 7dc: f86d6196 ldumaxl x13, x22, [x12] + 7e0: b8378378 swp w23, w24, [x27] + 7e4: b8230287 ldadd w3, w7, [x20] + 7e8: b82a12f5 ldclr w10, w21, [x23] + 7ec: b829219a ldeor w9, w26, [x12] + 7f0: b83a3377 ldset w26, w23, [x27] + 7f4: b82452ae ldsmin w4, w14, [x21] + 7f8: b82a4120 ldsmax w10, w0, [x9] + 7fc: b82970cd ldumin w9, w13, [x6] + 800: b82962bf stumax w9, [x21] + 804: b8ac817c swpa w12, w28, [x11] + 808: b8a80180 ldadda w8, w0, [x12] + 80c: b8bd1027 ldclra w29, w7, [x1] + 810: b8bd233b ldeora w29, w27, [x25] + 814: b8bb3110 ldseta w27, w16, [x8] + 818: b8ad53f2 ldsmina w13, w18, [sp] + 81c: b8bc4300 ldsmaxa w28, w0, [x24] + 820: b8bc71bc ldumina w28, w28, [x13] + 824: b8ae605d ldumaxa w14, w29, [x2] + 828: b8e8823c swpal w8, w28, [x17] + 82c: b8e4004a ldaddal w4, w10, [x2] + 830: b8e011dc ldclral w0, w28, [x14] + 834: b8e8208c ldeoral w8, w12, [x4] + 838: b8e131b6 ldsetal w1, w22, [x13] + 83c: b8f85286 ldsminal w24, w6, [x20] + 840: b8ee408e ldsmaxal w14, w14, [x4] + 844: b8fe71c2 lduminal w30, w2, [x14] + 848: b8e262d2 ldumaxal w2, w18, [x22] + 84c: b8798239 swpl w25, w25, [x17] + 850: b86400f3 ldaddl w4, w19, [x7] + 854: b873116f ldclrl w19, w15, [x11] + 858: b877221d ldeorl w23, w29, [x16] + 85c: b87b3345 ldsetl w27, w5, [x26] + 860: b87f501b ldsminl wzr, w27, [x0] + 864: b8764086 ldsmaxl w22, w6, [x4] + 868: b86d705e lduminl w13, w30, [x2] + 86c: b873619a ldumaxl w19, w26, [x12] */ static const unsigned int insns[] = { - 0x8b50798f, 0xcb4381e1, 0xab05372d, 0xeb864796, - 0x0b961920, 0x4b195473, 0x2b0b5264, 0x6b9300f8, - 0x8a0bc0fe, 0xaa0f3118, 0xca170531, 0xea44dd6e, - 0x0a4c44f3, 0x2a8b7373, 0x4a567c7e, 0x6a9c0353, - 0x8a3accdd, 0xaa318f7a, 0xca2e1495, 0xeaa015e2, - 0x0a2274e2, 0x2a751598, 0x4a3309fe, 0x6ab172fe, - 0x110a5284, 0x310b1942, 0x5103d353, 0x710125bc, - 0x910d7bc2, 0xb108fa1b, 0xd1093536, 0xf10ae824, - 0x120e667c, 0x321f6cbb, 0x520f6a9e, 0x72136f56, - 0x927e4ce5, 0xb278b4ed, 0xd24c6527, 0xf2485803, - 0x14000000, 0x17ffffd7, 0x140001ee, 0x94000000, - 0x97ffffd4, 0x940001eb, 0x34000010, 0x34fffa30, - 0x34003d10, 0x35000013, 0x35fff9d3, 0x35003cb3, - 0xb4000005, 0xb4fff965, 0xb4003c45, 0xb5000004, - 0xb5fff904, 0xb5003be4, 0x1000001b, 0x10fff8bb, - 0x10003b9b, 0x90000010, 0x3640001c, 0x3647f83c, - 0x36403b1c, 0x37080001, 0x370ff7c1, 0x37083aa1, - 0x12a437f4, 0x528c9d67, 0x72838bb1, 0x92c1062e, - 0xd287da49, 0xf2a6d153, 0x93465ac9, 0x330b0013, - 0x530b4e6a, 0x934545e4, 0xb35370a3, 0xd3510b8c, - 0x13960c0f, 0x93ceddc6, 0x54000000, 0x54fff5a0, - 0x54003880, 0x54000001, 0x54fff541, 0x54003821, - 0x54000002, 0x54fff4e2, 0x540037c2, 0x54000002, - 0x54fff482, 0x54003762, 0x54000003, 0x54fff423, - 0x54003703, 0x54000003, 0x54fff3c3, 0x540036a3, - 0x54000004, 0x54fff364, 0x54003644, 0x54000005, - 0x54fff305, 0x540035e5, 0x54000006, 0x54fff2a6, - 0x54003586, 0x54000007, 0x54fff247, 0x54003527, - 0x54000008, 0x54fff1e8, 0x540034c8, 0x54000009, - 0x54fff189, 0x54003469, 0x5400000a, 0x54fff12a, - 0x5400340a, 0x5400000b, 0x54fff0cb, 0x540033ab, - 0x5400000c, 0x54fff06c, 0x5400334c, 0x5400000d, - 0x54fff00d, 0x540032ed, 0x5400000e, 0x54ffefae, - 0x5400328e, 0x5400000f, 0x54ffef4f, 0x5400322f, - 0xd40ac601, 0xd40042a2, 0xd404dac3, 0xd4224d40, - 0xd44219c0, 0xd503201f, 0xd69f03e0, 0xd6bf03e0, - 0xd5033fdf, 0xd503339f, 0xd50335bf, 0xd61f0280, - 0xd63f0040, 0xc8127c17, 0xc81efec5, 0xc85f7d05, - 0xc85ffe14, 0xc89ffd66, 0xc8dfff66, 0x880a7cb1, - 0x8816fd89, 0x885f7d1b, 0x885ffc57, 0x889fffba, - 0x88dffd4d, 0x48197f7c, 0x481dfd96, 0x485f7f96, - 0x485fffc3, 0x489ffdf8, 0x48dfff5b, 0x080b7e6a, - 0x0817fedb, 0x085f7e18, 0x085ffc38, 0x089fffa5, - 0x08dffe18, 0xc87f6239, 0xc87fb276, 0xc820573a, - 0xc821aca6, 0x887f388d, 0x887f88d1, 0x882f2643, - 0x88329131, 0xf81cf2b7, 0xb803f055, 0x39002f9b, - 0x781f31fd, 0xf85d33ce, 0xb843539d, 0x39401f54, - 0x785ce059, 0x389f1143, 0x788131ee, 0x78dfb17d, - 0xb89b90af, 0xfc403193, 0xbc42a36c, 0xfc07d396, - 0xbc1ec1f8, 0xf81e8f88, 0xb8025de6, 0x38007c27, - 0x7801ee20, 0xf8454fb9, 0xb85cce9a, 0x385e7fba, - 0x7841af24, 0x389ebd1c, 0x789fadd1, 0x78c0aefc, - 0xb89c0f7e, 0xfc50efd4, 0xbc414f71, 0xfc011c67, - 0xbc1f0d6d, 0xf81c3526, 0xb81e34b0, 0x3800f7bd, - 0x78012684, 0xf842e653, 0xb8417456, 0x385e2467, - 0x785e358b, 0x389e34c8, 0x788046f8, 0x78c00611, - 0xb89f8680, 0xfc582454, 0xbc5987d3, 0xfc076624, - 0xbc190675, 0xf833785a, 0xb82fd809, 0x3821799a, - 0x782a7975, 0xf870eaf0, 0xb871d96a, 0x386b7aed, - 0x7875689b, 0x38afd91a, 0x78a2c955, 0x78ee6bc8, - 0xb8b4f9dd, 0xfc76eb7e, 0xbc76692d, 0xfc31db28, - 0xbc255b01, 0xf91c52aa, 0xb91c3fb2, 0x391f8877, - 0x791ac97c, 0xf95c1758, 0xb95b3c55, 0x395ce0a4, - 0x795851ce, 0x399e9f64, 0x79993764, 0x79d9af8a, - 0xb99eea2a, 0xfd5a2f8d, 0xbd5dac78, 0xfd1e0182, - 0xbd195c31, 0x58000010, 0x1800000d, 0xf8981240, - 0xd8ffdf00, 0xf8a27a80, 0xf99af920, 0x1a0202e8, - 0x3a130078, 0x5a1d0316, 0x7a03036c, 0x9a0102eb, - 0xba1700bd, 0xda0c0329, 0xfa16000c, 0x0b23459a, - 0x2b328a14, 0xcb274bde, 0x6b222eab, 0x8b214b42, - 0xab34a7b2, 0xcb24520e, 0xeb378e20, 0x3a565283, - 0x7a420321, 0xba58c247, 0xfa4d5106, 0x3a426924, - 0x7a5b0847, 0xba413a02, 0xfa5fba23, 0x1a979377, - 0x1a86640a, 0x5a89300b, 0x5a923771, 0x9a8b720c, - 0x9a868786, 0xda9a736d, 0xda9256dd, 0x5ac0026c, - 0x5ac00657, 0x5ac00b89, 0x5ac01262, 0x5ac017b9, - 0xdac002e4, 0xdac0065d, 0xdac00907, 0xdac00e2d, - 0xdac01011, 0xdac01752, 0x1ad0098b, 0x1ac70d24, - 0x1ad020ec, 0x1ad72613, 0x1ac62887, 0x1ad72e95, - 0x9adc0990, 0x9acd0d84, 0x9ac721a9, 0x9acf277c, - 0x9ace2bd4, 0x9ade2e4e, 0x9bc77d63, 0x9b587e97, - 0x1b1524a2, 0x1b04a318, 0x9b0f4d8b, 0x9b0ce73d, - 0x9b2c5971, 0x9b34c87c, 0x9bbc6887, 0x9bb19556, - 0x1e310871, 0x1e261a2b, 0x1e2928fd, 0x1e333987, - 0x1e230ae0, 0x1e75087a, 0x1e651a60, 0x1e692b40, - 0x1e753ab9, 0x1e7309b0, 0x1f00425d, 0x1f1d95b7, - 0x1f2a38e9, 0x1f2f5f99, 0x1f5545a6, 0x1f429ea3, - 0x1f65472a, 0x1f7449ce, 0x1e20404f, 0x1e20c0f2, - 0x1e2140c3, 0x1e21c02c, 0x1e22c009, 0x1e6040a4, - 0x1e60c1e3, 0x1e614331, 0x1e61c30c, 0x1e6240b5, - 0x1e3802a4, 0x9e38007b, 0x1e78011d, 0x9e7802a9, - 0x1e2203b4, 0x9e220107, 0x1e6202ac, 0x9e6202b0, - 0x1e2600b2, 0x9e660119, 0x1e270352, 0x9e670160, - 0x1e262200, 0x1e7d2200, 0x1e2023c8, 0x1e602128, - 0x293e119b, 0x294a2543, 0x69480c70, 0xa934726a, - 0xa97448f3, 0x298243ca, 0x29e21242, 0x69c64db8, - 0xa9800311, 0xa9f4686e, 0x288a0416, 0x28fe2812, - 0x68fe62d8, 0xa885308c, 0xa8f12664, 0x282468d2, - 0x284e5035, 0xa8327699, 0xa84716e1, 0x0c407284, - 0x4cdfa158, 0x0ccf6cd8, 0x4cdf2483, 0x0d40c0c2, - 0x4ddfc9cd, 0x0dd8ceaf, 0x4c408ea9, 0x0cdf86bd, - 0x4d60c1c8, 0x0dffca87, 0x4de3cc7c, 0x4cdd497b, - 0x0c404950, 0x4d40e595, 0x4ddfeba4, 0x0dd3ed38, - 0x4cdf046a, 0x0cc9039b, 0x0d60e3d5, 0x0dffe5d7, - 0x0df4e9a4, 0xba5fd3e3, 0x3a5f03e5, 0xfa411be4, + 0x8b402464, 0xcb0447a8, 0xab174767, 0xeb49a5e6, + 0x0b905c6c, 0x4b5d7f08, 0x2b0f1f87, 0x6b5c35fa, + 0x8a827101, 0xaa4c2b73, 0xca4aed64, 0xea027225, + 0x0a4c35fc, 0x2a5942ae, 0x4a40120d, 0x6a504f5e, + 0x8a7956ec, 0xaa6120ab, 0xcaa5da26, 0xeaafca7e, + 0x0a7b18cf, 0x2aa61076, 0x4ab71482, 0x6abe4ca2, + 0x110e120c, 0x310aa10b, 0x5100b0e8, 0x710f89e8, + 0x91002740, 0xb10e865b, 0xd104b112, 0xf1091db4, + 0x121d4e7d, 0x3215606e, 0x520c03ae, 0x72174638, + 0x92022071, 0xb2061dc7, 0xd245bb45, 0xf20a22ba, + 0x14000000, 0x17ffffd7, 0x140001f2, 0x94000000, + 0x97ffffd4, 0x940001ef, 0x34000000, 0x34fffa20, + 0x34003d80, 0x3500000b, 0x35fff9cb, 0x35003d2b, + 0xb4000015, 0xb4fff975, 0xb4003cd5, 0xb5000008, + 0xb5fff908, 0xb5003c68, 0x1000000b, 0x10fff8ab, + 0x10003c0b, 0x90000000, 0x36100005, 0x3617f825, + 0x36103b85, 0x37200016, 0x3727f7d6, 0x37203b36, + 0x12a5b6d6, 0x52ad7534, 0x728edc9e, 0x92ce63db, + 0xd2e3cc61, 0xf2a1d6a9, 0x9355739c, 0x3308088f, + 0x53174135, 0x935a576e, 0xb35c74d3, 0xd3500acb, + 0x138172c7, 0x93cedb75, 0x54000000, 0x54fff5a0, + 0x54003900, 0x54000001, 0x54fff541, 0x540038a1, + 0x54000002, 0x54fff4e2, 0x54003842, 0x54000002, + 0x54fff482, 0x540037e2, 0x54000003, 0x54fff423, + 0x54003783, 0x54000003, 0x54fff3c3, 0x54003723, + 0x54000004, 0x54fff364, 0x540036c4, 0x54000005, + 0x54fff305, 0x54003665, 0x54000006, 0x54fff2a6, + 0x54003606, 0x54000007, 0x54fff247, 0x540035a7, + 0x54000008, 0x54fff1e8, 0x54003548, 0x54000009, + 0x54fff189, 0x540034e9, 0x5400000a, 0x54fff12a, + 0x5400348a, 0x5400000b, 0x54fff0cb, 0x5400342b, + 0x5400000c, 0x54fff06c, 0x540033cc, 0x5400000d, + 0x54fff00d, 0x5400336d, 0x5400000e, 0x54ffefae, + 0x5400330e, 0x5400000f, 0x54ffef4f, 0x540032af, + 0xd40faaa1, 0xd4025942, 0xd40ab883, 0xd42a4f00, + 0xd447c560, 0xd503201f, 0xd69f03e0, 0xd6bf03e0, + 0xd5033fdf, 0xd5033a9f, 0xd5033abf, 0xd61f0220, + 0xd63f0000, 0xc8037d87, 0xc810fe4d, 0xc85f7fcb, + 0xc85ffc75, 0xc89fff56, 0xc8dfff62, 0x88147c4f, + 0x880bfda8, 0x885f7f50, 0x885ffd7b, 0x889ffc9e, + 0x88dffd62, 0x48167e5b, 0x4819feea, 0x485f7fcd, + 0x485ffc4d, 0x489fff02, 0x48dffef9, 0x080d7fa0, + 0x0808fcd4, 0x085f7caf, 0x085ffd40, 0x089fff4c, + 0x08dffc4b, 0xc87f4537, 0xc87f9da1, 0xc8272fa0, + 0xc8399576, 0x887f1b67, 0x887f8b07, 0x88267a65, + 0x88229e5d, 0xf814929d, 0xb81d91a6, 0x381f50a9, + 0x78015116, 0xf85af3a1, 0xb85e53b4, 0x385f818f, + 0x785c20e9, 0x389f71b7, 0x79803db2, 0x79c037d1, + 0xb89831d5, 0xfc43b1b5, 0xbc43f115, 0xfc035316, + 0xbc01501a, 0xf8129ed7, 0xb81fdfbe, 0x381eece2, + 0x78013d97, 0xf852ec92, 0xb85b9fd3, 0x385f5e91, + 0x785c0dc9, 0x3880bc66, 0x789faecb, 0x78de5d66, + 0xb8836e59, 0xfc5f8ef5, 0xbc5d9d5e, 0xfc17fc22, + 0xbc001c1a, 0xf819d749, 0xb803e5c9, 0x381e275e, + 0x7800b61c, 0xf844d75d, 0xb84356e0, 0x385ee6a7, + 0x784185b8, 0x389ef501, 0x789de771, 0x78de6435, + 0xb88006a6, 0xfc43a465, 0xbc5b0667, 0xfc01b601, + 0xbc03e727, 0xf83e586d, 0xb821e871, 0x383b7a77, + 0x782a5a85, 0xf870d85d, 0xb875fa30, 0x38705a0a, + 0x787adb77, 0x38a7780d, 0x78b248af, 0x78f27a92, + 0xb8b149de, 0xfc7a58d3, 0xbc62cafe, 0xfc274adb, + 0xbc3afb09, 0xf91f778e, 0xb91eb9b0, 0x39186b74, + 0x791988f0, 0xf95e4ea5, 0xb95de900, 0x395f90e1, + 0x7959bdc1, 0x399b9b26, 0x79996209, 0x79dc309b, + 0xb99c8e02, 0xfd5fa345, 0xbd5efdb3, 0xfd1a20f6, + 0xbd1e8928, 0x58ffdf7a, 0x18ffdf4c, 0xf882f140, + 0xd8002280, 0xf8b47aa0, 0xf99ed1a0, 0x1a03011a, + 0x3a0703c9, 0x5a0b01f8, 0x7a0b02a4, 0x9a1e022f, + 0xba1001e6, 0xda0a0041, 0xfa0b0089, 0x0b3167b7, + 0x2b2bed6f, 0xcb2753c2, 0x6b3a867e, 0x8b2c6c02, + 0xab30902e, 0xcb378ecf, 0xeb3c4480, 0x3a5220ab, + 0x7a552248, 0xba5131ef, 0xfa5711a6, 0x3a493b8f, + 0x7a4c99c9, 0xba463ac2, 0xfa4c4aa0, 0x1a9cc2ae, + 0x1a91c5d9, 0x5a9920d1, 0x5a8e2455, 0x9a912163, + 0x9a9b27db, 0xda8581e0, 0xda882562, 0x5ac00262, + 0x5ac00596, 0x5ac00ac5, 0x5ac01363, 0x5ac01492, + 0xdac00376, 0xdac0054c, 0xdac00885, 0xdac00d56, + 0xdac010ed, 0xdac01546, 0x1adc0a02, 0x1ac80ee8, + 0x1ace2232, 0x1ad6273e, 0x1ac52850, 0x1ac02f8f, + 0x9ac10a8d, 0x9ad20fdc, 0x9ac92391, 0x9ac425b2, + 0x9ad02b0c, 0x9ad82d2e, 0x9bd87c94, 0x9b5c7cb2, + 0x1b114bb3, 0x1b0fcece, 0x9b0120ac, 0x9b0bc256, + 0x9b2c7960, 0x9b2db113, 0x9bb117cd, 0x9bb7a590, + 0x1e200a86, 0x1e2f18d5, 0x1e392938, 0x1e323b09, + 0x1e2a0b1a, 0x1e600a8c, 0x1e7019ec, 0x1e7d28d8, + 0x1e6e38d8, 0x1e6f0bb5, 0x1f017729, 0x1f0af68d, + 0x1f2b1d7c, 0x1f350787, 0x1f4f07be, 0x1f5be90c, + 0x1f6b6711, 0x1f68003e, 0x1e2040a1, 0x1e20c266, + 0x1e214004, 0x1e21c149, 0x1e22c1d4, 0x1e604260, + 0x1e60c25e, 0x1e614100, 0x1e61c100, 0x1e6243ce, + 0x1e3802d3, 0x9e380151, 0x1e7802bb, 0x9e780087, + 0x1e22033e, 0x9e220219, 0x1e620349, 0x9e620007, + 0x1e2601e0, 0x9e66008b, 0x1e2701fe, 0x9e6702e2, + 0x1e2a21c0, 0x1e6023c0, 0x1e202168, 0x1e602308, + 0x2922403c, 0x294c55d7, 0x697860e0, 0xa9085215, + 0xa9790f41, 0x29a2394c, 0x29e200e3, 0x69e660ba, + 0xa9b65910, 0xa9f711fa, 0x288e73a9, 0x28c81468, + 0x68e6119e, 0xa8b67a0e, 0xa8f3593b, 0x2820571a, + 0x287a25f4, 0xa83169af, 0xa84168a5, 0x0c407353, + 0x4cdfa1c1, 0x0cd96f1d, 0x4cdf2414, 0x0d40c379, + 0x4ddfcb5e, 0x0dcacea9, 0x4c408dc2, 0x0cdf864e, + 0x4d60c004, 0x0dffc832, 0x4dfbcc1a, 0x4cc34ac7, + 0x0c404aa5, 0x4d40e4fe, 0x4ddfeae7, 0x0dc6ed4f, + 0x4cdf0734, 0x0cd80365, 0x0d60e2a5, 0x0dffe773, + 0x0df6ebc6, 0xce6182e4, 0xce6d8583, 0xcec080db, + 0xce6a8aa9, 0xba5fd3e3, 0x3a5f03e5, 0xfa411be4, 0x7a42cbe2, 0x93df03ff, 0xc820ffff, 0x8822fc7f, 0xc8247cbf, 0x88267fff, 0x4e010fe0, 0x4e081fe1, 0x4e0c1fe1, 0x4e0a1fe1, 0x4e071fe1, 0x4cc0ac3f, @@ -1418,24 +1429,24 @@ Disassembly of section .text: 0x1e741000, 0x1e743000, 0x1e761000, 0x1e763000, 0x1e781000, 0x1e783000, 0x1e7a1000, 0x1e7a3000, 0x1e7c1000, 0x1e7c3000, 0x1e7e1000, 0x1e7e3000, - 0xf8358305, 0xf82d01ed, 0xf8361353, 0xf839234a, - 0xf82531fb, 0xf8335165, 0xf83a4080, 0xf83673d7, - 0xf832611c, 0xf8ad837d, 0xf8ab01a5, 0xf8a112b8, - 0xf8bb2311, 0xf8b230be, 0xf8a75336, 0xf8a4427a, - 0xf8a6707e, 0xf8b860b7, 0xf8f88392, 0xf8f300ff, - 0xf8ed1386, 0xf8e822af, 0xf8e2302d, 0xf8f1533d, - 0xf8f941d2, 0xf8ff7366, 0xf8f061e5, 0xf86b8072, - 0xf87a0054, 0xf86b1164, 0xf87e22f3, 0xf86331cf, - 0xf87e5296, 0xf8674305, 0xf87771f0, 0xf86b6013, - 0xb83c803c, 0xb82b0195, 0xb83d1240, 0xb8252320, - 0xb82e3340, 0xb83c53b2, 0xb82f43a1, 0xb828739a, - 0xb831608e, 0xb8b88039, 0xb8aa0231, 0xb8bd12b4, - 0xb8bd2189, 0xb8ab30a6, 0xb8b552a7, 0xb8aa4197, - 0xb8b57145, 0xb8be6254, 0xb8ed80b7, 0xb8ef00b8, - 0xb8e9132a, 0xb8f42231, 0xb8ec33d2, 0xb8e35323, - 0xb8fa4159, 0xb8e273eb, 0xb8e760a2, 0xb8608287, - 0xb865005f, 0xb87b1379, 0xb87e2358, 0xb86f32c2, - 0xb86053e3, 0xb86f4154, 0xb87671d5, 0xb866605e, + 0xf838807f, 0xf82500a6, 0xf8391189, 0xf8292136, + 0xf82e3024, 0xf83753be, 0xf835434d, 0xf8307169, + 0xf83562b1, 0xf8b98139, 0xf8a500d9, 0xf8b812ee, + 0xf8b32358, 0xf8af3057, 0xf8a650e7, 0xf8be41cf, + 0xf8bf70a7, 0xf8b46039, 0xf8f08232, 0xf8e0016f, + 0xf8e910f1, 0xf8e122f7, 0xf8f23061, 0xf8fb511f, + 0xf8e9417b, 0xf8f97063, 0xf8f06338, 0xf86683a2, + 0xf8770199, 0xf86912fd, 0xf87d2040, 0xf8733146, + 0xf871532d, 0xf8614337, 0xf87470da, 0xf86d6196, + 0xb8378378, 0xb8230287, 0xb82a12f5, 0xb829219a, + 0xb83a3377, 0xb82452ae, 0xb82a4120, 0xb82970cd, + 0xb82962bf, 0xb8ac817c, 0xb8a80180, 0xb8bd1027, + 0xb8bd233b, 0xb8bb3110, 0xb8ad53f2, 0xb8bc4300, + 0xb8bc71bc, 0xb8ae605d, 0xb8e8823c, 0xb8e4004a, + 0xb8e011dc, 0xb8e8208c, 0xb8e131b6, 0xb8f85286, + 0xb8ee408e, 0xb8fe71c2, 0xb8e262d2, 0xb8798239, + 0xb86400f3, 0xb873116f, 0xb877221d, 0xb87b3345, + 0xb87f501b, 0xb8764086, 0xb86d705e, 0xb873619a, }; // END Generated code -- do not edit diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp index 2aad7cdbabd..e7790f3b018 100644 --- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp @@ -2372,6 +2372,30 @@ public: #undef INSN +#define INSN(NAME, opc) \ + void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \ + starti; \ + assert(T == T2D, "arrangement must be T2D"); \ + f(0b11001110011, 31, 21), rf(Vm, 16), f(opc, 15, 10), rf(Vn, 5), rf(Vd, 0); \ + } + + INSN(sha512h, 0b100000); + INSN(sha512h2, 0b100001); + INSN(sha512su1, 0b100010); + +#undef INSN + +#define INSN(NAME, opc) \ + void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) { \ + starti; \ + assert(T == T2D, "arrangement must be T2D"); \ + f(opc, 31, 10), rf(Vn, 5), rf(Vd, 0); \ + } + + INSN(sha512su0, 0b1100111011000000100000); + +#undef INSN + #define INSN(NAME, opc) \ void NAME(FloatRegister Vd, FloatRegister Vn) { \ starti; \ diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp index d4b7d29d70a..e7c375e192e 100644 --- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp @@ -3125,6 +3125,172 @@ class StubGenerator: public StubCodeGenerator { return start; } + // Arguments: + // + // Inputs: + // c_rarg0 - byte[] source+offset + // c_rarg1 - int[] SHA.state + // c_rarg2 - int offset + // c_rarg3 - int limit + // + address generate_sha512_implCompress(bool multi_block, const char *name) { + static const uint64_t round_consts[80] = { + 0x428A2F98D728AE22L, 0x7137449123EF65CDL, 0xB5C0FBCFEC4D3B2FL, + 0xE9B5DBA58189DBBCL, 0x3956C25BF348B538L, 0x59F111F1B605D019L, + 0x923F82A4AF194F9BL, 0xAB1C5ED5DA6D8118L, 0xD807AA98A3030242L, + 0x12835B0145706FBEL, 0x243185BE4EE4B28CL, 0x550C7DC3D5FFB4E2L, + 0x72BE5D74F27B896FL, 0x80DEB1FE3B1696B1L, 0x9BDC06A725C71235L, + 0xC19BF174CF692694L, 0xE49B69C19EF14AD2L, 0xEFBE4786384F25E3L, + 0x0FC19DC68B8CD5B5L, 0x240CA1CC77AC9C65L, 0x2DE92C6F592B0275L, + 0x4A7484AA6EA6E483L, 0x5CB0A9DCBD41FBD4L, 0x76F988DA831153B5L, + 0x983E5152EE66DFABL, 0xA831C66D2DB43210L, 0xB00327C898FB213FL, + 0xBF597FC7BEEF0EE4L, 0xC6E00BF33DA88FC2L, 0xD5A79147930AA725L, + 0x06CA6351E003826FL, 0x142929670A0E6E70L, 0x27B70A8546D22FFCL, + 0x2E1B21385C26C926L, 0x4D2C6DFC5AC42AEDL, 0x53380D139D95B3DFL, + 0x650A73548BAF63DEL, 0x766A0ABB3C77B2A8L, 0x81C2C92E47EDAEE6L, + 0x92722C851482353BL, 0xA2BFE8A14CF10364L, 0xA81A664BBC423001L, + 0xC24B8B70D0F89791L, 0xC76C51A30654BE30L, 0xD192E819D6EF5218L, + 0xD69906245565A910L, 0xF40E35855771202AL, 0x106AA07032BBD1B8L, + 0x19A4C116B8D2D0C8L, 0x1E376C085141AB53L, 0x2748774CDF8EEB99L, + 0x34B0BCB5E19B48A8L, 0x391C0CB3C5C95A63L, 0x4ED8AA4AE3418ACBL, + 0x5B9CCA4F7763E373L, 0x682E6FF3D6B2B8A3L, 0x748F82EE5DEFB2FCL, + 0x78A5636F43172F60L, 0x84C87814A1F0AB72L, 0x8CC702081A6439ECL, + 0x90BEFFFA23631E28L, 0xA4506CEBDE82BDE9L, 0xBEF9A3F7B2C67915L, + 0xC67178F2E372532BL, 0xCA273ECEEA26619CL, 0xD186B8C721C0C207L, + 0xEADA7DD6CDE0EB1EL, 0xF57D4F7FEE6ED178L, 0x06F067AA72176FBAL, + 0x0A637DC5A2C898A6L, 0x113F9804BEF90DAEL, 0x1B710B35131C471BL, + 0x28DB77F523047D84L, 0x32CAAB7B40C72493L, 0x3C9EBE0A15C9BEBCL, + 0x431D67C49C100D4CL, 0x4CC5D4BECB3E42B6L, 0x597F299CFC657E2AL, + 0x5FCB6FAB3AD6FAECL, 0x6C44198C4A475817L + }; + + // Double rounds for sha512. + #define sha512_dround(dr, i0, i1, i2, i3, i4, rc0, rc1, in0, in1, in2, in3, in4) \ + if (dr < 36) \ + __ ld1(v##rc1, __ T2D, __ post(rscratch2, 16)); \ + __ addv(v5, __ T2D, v##rc0, v##in0); \ + __ ext(v6, __ T16B, v##i2, v##i3, 8); \ + __ ext(v5, __ T16B, v5, v5, 8); \ + __ ext(v7, __ T16B, v##i1, v##i2, 8); \ + __ addv(v##i3, __ T2D, v##i3, v5); \ + if (dr < 32) { \ + __ ext(v5, __ T16B, v##in3, v##in4, 8); \ + __ sha512su0(v##in0, __ T2D, v##in1); \ + } \ + __ sha512h(v##i3, __ T2D, v6, v7); \ + if (dr < 32) \ + __ sha512su1(v##in0, __ T2D, v##in2, v5); \ + __ addv(v##i4, __ T2D, v##i1, v##i3); \ + __ sha512h2(v##i3, __ T2D, v##i1, v##i0); \ + + __ align(CodeEntryAlignment); + StubCodeMark mark(this, "StubRoutines", name); + address start = __ pc(); + + Register buf = c_rarg0; + Register state = c_rarg1; + Register ofs = c_rarg2; + Register limit = c_rarg3; + + __ stpd(v8, v9, __ pre(sp, -64)); + __ stpd(v10, v11, Address(sp, 16)); + __ stpd(v12, v13, Address(sp, 32)); + __ stpd(v14, v15, Address(sp, 48)); + + Label sha512_loop; + + // load state + __ ld1(v8, v9, v10, v11, __ T2D, state); + + // load first 4 round constants + __ lea(rscratch1, ExternalAddress((address)round_consts)); + __ ld1(v20, v21, v22, v23, __ T2D, __ post(rscratch1, 64)); + + __ BIND(sha512_loop); + // load 128B of data into v12..v19 + __ ld1(v12, v13, v14, v15, __ T2D, __ post(buf, 64)); + __ ld1(v16, v17, v18, v19, __ T2D, __ post(buf, 64)); + __ rev64(v12, __ T16B, v12); + __ rev64(v13, __ T16B, v13); + __ rev64(v14, __ T16B, v14); + __ rev64(v15, __ T16B, v15); + __ rev64(v16, __ T16B, v16); + __ rev64(v17, __ T16B, v17); + __ rev64(v18, __ T16B, v18); + __ rev64(v19, __ T16B, v19); + + __ mov(rscratch2, rscratch1); + + __ mov(v0, __ T16B, v8); + __ mov(v1, __ T16B, v9); + __ mov(v2, __ T16B, v10); + __ mov(v3, __ T16B, v11); + + sha512_dround( 0, 0, 1, 2, 3, 4, 20, 24, 12, 13, 19, 16, 17); + sha512_dround( 1, 3, 0, 4, 2, 1, 21, 25, 13, 14, 12, 17, 18); + sha512_dround( 2, 2, 3, 1, 4, 0, 22, 26, 14, 15, 13, 18, 19); + sha512_dround( 3, 4, 2, 0, 1, 3, 23, 27, 15, 16, 14, 19, 12); + sha512_dround( 4, 1, 4, 3, 0, 2, 24, 28, 16, 17, 15, 12, 13); + sha512_dround( 5, 0, 1, 2, 3, 4, 25, 29, 17, 18, 16, 13, 14); + sha512_dround( 6, 3, 0, 4, 2, 1, 26, 30, 18, 19, 17, 14, 15); + sha512_dround( 7, 2, 3, 1, 4, 0, 27, 31, 19, 12, 18, 15, 16); + sha512_dround( 8, 4, 2, 0, 1, 3, 28, 24, 12, 13, 19, 16, 17); + sha512_dround( 9, 1, 4, 3, 0, 2, 29, 25, 13, 14, 12, 17, 18); + sha512_dround(10, 0, 1, 2, 3, 4, 30, 26, 14, 15, 13, 18, 19); + sha512_dround(11, 3, 0, 4, 2, 1, 31, 27, 15, 16, 14, 19, 12); + sha512_dround(12, 2, 3, 1, 4, 0, 24, 28, 16, 17, 15, 12, 13); + sha512_dround(13, 4, 2, 0, 1, 3, 25, 29, 17, 18, 16, 13, 14); + sha512_dround(14, 1, 4, 3, 0, 2, 26, 30, 18, 19, 17, 14, 15); + sha512_dround(15, 0, 1, 2, 3, 4, 27, 31, 19, 12, 18, 15, 16); + sha512_dround(16, 3, 0, 4, 2, 1, 28, 24, 12, 13, 19, 16, 17); + sha512_dround(17, 2, 3, 1, 4, 0, 29, 25, 13, 14, 12, 17, 18); + sha512_dround(18, 4, 2, 0, 1, 3, 30, 26, 14, 15, 13, 18, 19); + sha512_dround(19, 1, 4, 3, 0, 2, 31, 27, 15, 16, 14, 19, 12); + sha512_dround(20, 0, 1, 2, 3, 4, 24, 28, 16, 17, 15, 12, 13); + sha512_dround(21, 3, 0, 4, 2, 1, 25, 29, 17, 18, 16, 13, 14); + sha512_dround(22, 2, 3, 1, 4, 0, 26, 30, 18, 19, 17, 14, 15); + sha512_dround(23, 4, 2, 0, 1, 3, 27, 31, 19, 12, 18, 15, 16); + sha512_dround(24, 1, 4, 3, 0, 2, 28, 24, 12, 13, 19, 16, 17); + sha512_dround(25, 0, 1, 2, 3, 4, 29, 25, 13, 14, 12, 17, 18); + sha512_dround(26, 3, 0, 4, 2, 1, 30, 26, 14, 15, 13, 18, 19); + sha512_dround(27, 2, 3, 1, 4, 0, 31, 27, 15, 16, 14, 19, 12); + sha512_dround(28, 4, 2, 0, 1, 3, 24, 28, 16, 17, 15, 12, 13); + sha512_dround(29, 1, 4, 3, 0, 2, 25, 29, 17, 18, 16, 13, 14); + sha512_dround(30, 0, 1, 2, 3, 4, 26, 30, 18, 19, 17, 14, 15); + sha512_dround(31, 3, 0, 4, 2, 1, 27, 31, 19, 12, 18, 15, 16); + sha512_dround(32, 2, 3, 1, 4, 0, 28, 24, 12, 0, 0, 0, 0); + sha512_dround(33, 4, 2, 0, 1, 3, 29, 25, 13, 0, 0, 0, 0); + sha512_dround(34, 1, 4, 3, 0, 2, 30, 26, 14, 0, 0, 0, 0); + sha512_dround(35, 0, 1, 2, 3, 4, 31, 27, 15, 0, 0, 0, 0); + sha512_dround(36, 3, 0, 4, 2, 1, 24, 0, 16, 0, 0, 0, 0); + sha512_dround(37, 2, 3, 1, 4, 0, 25, 0, 17, 0, 0, 0, 0); + sha512_dround(38, 4, 2, 0, 1, 3, 26, 0, 18, 0, 0, 0, 0); + sha512_dround(39, 1, 4, 3, 0, 2, 27, 0, 19, 0, 0, 0, 0); + + __ addv(v8, __ T2D, v8, v0); + __ addv(v9, __ T2D, v9, v1); + __ addv(v10, __ T2D, v10, v2); + __ addv(v11, __ T2D, v11, v3); + + if (multi_block) { + __ add(ofs, ofs, 128); + __ cmp(ofs, limit); + __ br(Assembler::LE, sha512_loop); + __ mov(c_rarg0, ofs); // return ofs + } + + __ st1(v8, v9, v10, v11, __ T2D, state); + + __ ldpd(v14, v15, Address(sp, 48)); + __ ldpd(v12, v13, Address(sp, 32)); + __ ldpd(v10, v11, Address(sp, 16)); + __ ldpd(v8, v9, __ post(sp, 64)); + + __ ret(lr); + + return start; + } + // Safefetch stubs. void generate_safefetch(const char* name, int size, address* entry, address* fault_pc, address* continuation_pc) { @@ -5852,6 +6018,10 @@ class StubGenerator: public StubCodeGenerator { StubRoutines::_sha256_implCompress = generate_sha256_implCompress(false, "sha256_implCompress"); StubRoutines::_sha256_implCompressMB = generate_sha256_implCompress(true, "sha256_implCompressMB"); } + if (UseSHA512Intrinsics) { + StubRoutines::_sha512_implCompress = generate_sha512_implCompress(false, "sha512_implCompress"); + StubRoutines::_sha512_implCompressMB = generate_sha512_implCompress(true, "sha512_implCompressMB"); + } // generate Adler32 intrinsics code if (UseAdler32Intrinsics) { diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp index 25d6b853378..ab8c27ad716 100644 --- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp @@ -62,6 +62,10 @@ #define HWCAP_ATOMICS (1<<8) #endif +#ifndef HWCAP_SHA512 +#define HWCAP_SHA512 (1 << 21) +#endif + int VM_Version::_cpu; int VM_Version::_model; int VM_Version::_model2; @@ -285,6 +289,7 @@ void VM_Version::get_processor_features() { if (auxv & HWCAP_AES) strcat(buf, ", aes"); if (auxv & HWCAP_SHA1) strcat(buf, ", sha1"); if (auxv & HWCAP_SHA2) strcat(buf, ", sha256"); + if (auxv & HWCAP_SHA512) strcat(buf, ", sha512"); if (auxv & HWCAP_ATOMICS) strcat(buf, ", lse"); _features_string = os::strdup(buf); @@ -390,7 +395,12 @@ void VM_Version::get_processor_features() { FLAG_SET_DEFAULT(UseSHA256Intrinsics, false); } - if (UseSHA512Intrinsics) { + if (UseSHA && (auxv & HWCAP_SHA512)) { + // Do not auto-enable UseSHA512Intrinsics until it has been fully tested on hardware + // if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) { + // FLAG_SET_DEFAULT(UseSHA512Intrinsics, true); + // } + } else if (UseSHA512Intrinsics) { warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU."); FLAG_SET_DEFAULT(UseSHA512Intrinsics, false); } From 4d3baa2d377c5c300c104c5a31f447310326203d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= Date: Fri, 7 Aug 2020 11:52:09 +0200 Subject: [PATCH 022/100] 8251179: Word tearing problem with _last_sweep Reviewed-by: coleenp, dholmes, kbarrett --- .../jfr/leakprofiler/checkpoint/eventEmitter.cpp | 2 +- .../checkpoint/objectSampleCheckpoint.cpp | 4 ++-- .../jfr/leakprofiler/sampling/objectSampler.cpp | 12 +++++++----- .../jfr/leakprofiler/sampling/objectSampler.hpp | 3 +-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp index 4dc703a9d1a..0cb3841a64f 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp @@ -74,7 +74,7 @@ size_t EventEmitter::write_events(ObjectSampler* object_sampler, EdgeStore* edge assert(object_sampler != NULL, "invariant"); assert(edge_store != NULL, "invariant"); - const jlong last_sweep = emit_all ? max_jlong : object_sampler->last_sweep().value(); + const jlong last_sweep = emit_all ? max_jlong : ObjectSampler::last_sweep(); size_t count = 0; // First pass associates a live sample with its immediate edge diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp index 45779b14c71..0faf97ac7cf 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp @@ -133,7 +133,7 @@ int ObjectSampleCheckpoint::save_mark_words(const ObjectSampler* sampler, Object if (sampler->last() == NULL) { return 0; } - SampleMarker sample_marker(marker, emit_all ? max_jlong : sampler->last_sweep().value()); + SampleMarker sample_marker(marker, emit_all ? max_jlong : ObjectSampler::last_sweep()); iterate_samples(sample_marker, true); return sample_marker.count(); } @@ -361,7 +361,7 @@ class BlobWriter { static void write_sample_blobs(const ObjectSampler* sampler, bool emit_all, Thread* thread) { // sample set is predicated on time of last sweep - const jlong last_sweep = emit_all ? max_jlong : sampler->last_sweep().value(); + const jlong last_sweep = emit_all ? max_jlong : ObjectSampler::last_sweep(); JfrCheckpointWriter writer(thread, false); BlobWriter cbw(sampler, writer, last_sweep); iterate_samples(cbw, true); diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp index 9c956edf73d..273d8ab12d5 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp @@ -34,6 +34,7 @@ #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp" #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp" #include "jfr/support/jfrThreadLocal.hpp" +#include "jfr/utilities/jfrTime.hpp" #include "jfr/utilities/jfrTryLock.hpp" #include "logging/log.hpp" #include "memory/universe.hpp" @@ -44,7 +45,8 @@ #include "runtime/thread.hpp" // Timestamp of when the gc last processed the set of sampled objects. -static JfrTicks _last_sweep; +// Atomic access to prevent word tearing on 32-bit platforms. +static volatile int64_t _last_sweep; // Condition variable to communicate that some sampled objects have been cleared by the gc // and can therefore be removed from the sample priority queue. @@ -66,7 +68,7 @@ void ObjectSampler::oop_storage_gc_notification(size_t num_dead) { // instance was created concurrently. This allows for a small race where cleaning // could be done again. Atomic::store(&_dead_samples, true); - _last_sweep = JfrTicks::now(); + Atomic::store(&_last_sweep, (int64_t)JfrTicks::now().value()); } } @@ -90,8 +92,8 @@ ObjectSampler::ObjectSampler(size_t size) : _total_allocated(0), _threshold(0), _size(size) { - _last_sweep = JfrTicks::now(); Atomic::store(&_dead_samples, false); + Atomic::store(&_last_sweep, (int64_t)JfrTicks::now().value()); } ObjectSampler::~ObjectSampler() { @@ -285,6 +287,6 @@ ObjectSample* ObjectSampler::item_at(int index) { ); } -const JfrTicks& ObjectSampler::last_sweep() { - return _last_sweep; +int64_t ObjectSampler::last_sweep() { + return Atomic::load(&_last_sweep); } diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp index 962735a309c..1e942cba5b0 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp @@ -26,7 +26,6 @@ #define SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP #include "memory/allocation.hpp" -#include "jfr/utilities/jfrTime.hpp" typedef u8 traceid; @@ -80,7 +79,7 @@ class ObjectSampler : public CHeapObj { // For operations that require exclusive access (non-safepoint) static ObjectSampler* acquire(); static void release(); - static const JfrTicks& last_sweep(); + static int64_t last_sweep(); const ObjectSample* first() const; ObjectSample* last() const; const ObjectSample* last_resolved() const; From 0c9e0c2e7fbefe7449144c5ada8ae2a20931bfc7 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Fri, 7 Aug 2020 07:53:26 -0400 Subject: [PATCH 023/100] 8244997: Convert the JavaThread::_threadObj oop to use OopStorage Move the oop and handle releasing it in the service thread. Remove Universe::oops_do from callers. Co-authored-by: Erik Osterlund Co-authored-by: Tom Rodriguez Reviewed-by: dholmes, zgu, eosterlund, cjplummer --- src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp | 4 +- src/hotspot/cpu/arm/c1_LIR_arm.cpp | 6 +- src/hotspot/cpu/ppc/c1_LIR_ppc.cpp | 6 +- src/hotspot/cpu/s390/c1_LIR_s390.cpp | 4 +- src/hotspot/cpu/x86/c1_LIR_x86.cpp | 6 +- src/hotspot/share/c1/c1_LIRGenerator.cpp | 6 +- src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp | 1 - src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp | 1 - src/hotspot/share/gc/g1/g1RootProcessor.cpp | 8 --- .../share/gc/parallel/psParallelCompact.cpp | 5 -- src/hotspot/share/gc/parallel/psRootType.hpp | 3 +- src/hotspot/share/gc/parallel/psScavenge.cpp | 4 -- .../share/gc/shared/c2/barrierSetC2.cpp | 13 +++-- .../share/gc/shared/c2/barrierSetC2.hpp | 4 +- .../share/gc/shared/genCollectedHeap.cpp | 4 -- .../share/gc/shared/genCollectedHeap.hpp | 1 - src/hotspot/share/gc/shared/oopStorageSet.hpp | 4 +- .../gc/shenandoah/shenandoahPhaseTimings.hpp | 1 - .../gc/shenandoah/shenandoahRootProcessor.cpp | 3 - .../gc/shenandoah/shenandoahRootProcessor.hpp | 1 - .../gc/shenandoah/shenandoahRootVerifier.cpp | 4 -- src/hotspot/share/gc/z/zRootsIterator.cpp | 8 --- src/hotspot/share/gc/z/zRootsIterator.hpp | 2 - .../leakprofiler/chains/rootSetClosure.cpp | 2 - .../leakprofiler/checkpoint/rootResolver.cpp | 14 ----- src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 2 +- src/hotspot/share/memory/universe.cpp | 5 -- src/hotspot/share/memory/universe.hpp | 6 -- src/hotspot/share/opto/graphKit.cpp | 2 +- src/hotspot/share/opto/library_call.cpp | 5 +- src/hotspot/share/opto/memnode.cpp | 4 +- src/hotspot/share/prims/jvmtiTagMap.cpp | 2 +- src/hotspot/share/runtime/serviceThread.cpp | 37 +++++++++++++ src/hotspot/share/runtime/serviceThread.hpp | 3 +- src/hotspot/share/runtime/thread.cpp | 55 +++++++++++++------ src/hotspot/share/runtime/thread.hpp | 9 ++- src/hotspot/share/runtime/threadSMR.cpp | 50 ----------------- src/hotspot/share/runtime/threadSMR.hpp | 27 --------- src/hotspot/share/runtime/vmStructs.cpp | 2 +- src/hotspot/share/services/heapDumper.cpp | 5 +- .../sun/jvm/hotspot/runtime/JavaThread.java | 9 ++- .../hotspot/GraalHotSpotVMConfig.java | 14 ++++- .../meta/HotSpotGraphBuilderPlugins.java | 12 +++- .../replacements/HotSpotReplacementsUtil.java | 2 + .../jtreg/gc/g1/TestGCLogMessages.java | 1 - .../gc/collection/TestG1ParallelPhases.java | 2 +- 46 files changed, 162 insertions(+), 207 deletions(-) diff --git a/src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp index ce75dc552a9..58e1cf5ae63 100644 --- a/src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/c1_LIR_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -48,7 +48,7 @@ LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) { void LIR_Address::verify() const { assert(base()->is_cpu_register(), "wrong base operand"); assert(index()->is_illegal() || index()->is_double_cpu() || index()->is_single_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, "wrong type for addresses"); } #endif // PRODUCT diff --git a/src/hotspot/cpu/arm/c1_LIR_arm.cpp b/src/hotspot/cpu/arm/c1_LIR_arm.cpp index 791c6985137..60bd5265bfb 100644 --- a/src/hotspot/cpu/arm/c1_LIR_arm.cpp +++ b/src/hotspot/cpu/arm/c1_LIR_arm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2020, 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 @@ -52,12 +52,12 @@ void LIR_Address::verify() const { // be handled by the back-end or will be rejected if not. #ifdef _LP64 assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, "wrong type for addresses"); #else assert(base()->is_single_cpu(), "wrong base operand"); assert(index()->is_illegal() || index()->is_single_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, "wrong type for addresses"); #endif } diff --git a/src/hotspot/cpu/ppc/c1_LIR_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIR_ppc.cpp index ef9b0833d38..fb234e82985 100644 --- a/src/hotspot/cpu/ppc/c1_LIR_ppc.cpp +++ b/src/hotspot/cpu/ppc/c1_LIR_ppc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -52,12 +52,12 @@ void LIR_Address::verify() const { #ifdef _LP64 assert(base()->is_cpu_register(), "wrong base operand"); assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, "wrong type for addresses"); #else assert(base()->is_single_cpu(), "wrong base operand"); assert(index()->is_illegal() || index()->is_single_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, "wrong type for addresses"); #endif } diff --git a/src/hotspot/cpu/s390/c1_LIR_s390.cpp b/src/hotspot/cpu/s390/c1_LIR_s390.cpp index 9507ca08561..3c46915e475 100644 --- a/src/hotspot/cpu/s390/c1_LIR_s390.cpp +++ b/src/hotspot/cpu/s390/c1_LIR_s390.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -51,7 +51,7 @@ LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) { void LIR_Address::verify() const { assert(base()->is_cpu_register(), "wrong base operand"); assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, "wrong type for addresses"); } #endif // PRODUCT diff --git a/src/hotspot/cpu/x86/c1_LIR_x86.cpp b/src/hotspot/cpu/x86/c1_LIR_x86.cpp index 92277ee0631..f7e3392d2e5 100644 --- a/src/hotspot/cpu/x86/c1_LIR_x86.cpp +++ b/src/hotspot/cpu/x86/c1_LIR_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -62,12 +62,12 @@ void LIR_Address::verify() const { #ifdef _LP64 assert(base()->is_cpu_register(), "wrong base operand"); assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_LONG || base()->type() == T_METADATA, "wrong type for addresses"); #else assert(base()->is_single_cpu(), "wrong base operand"); assert(index()->is_illegal() || index()->is_single_cpu(), "wrong index operand"); - assert(base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, + assert(base()->type() == T_ADDRESS || base()->type() == T_OBJECT || base()->type() == T_INT || base()->type() == T_METADATA, "wrong type for addresses"); #endif } diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp index 781839cd279..8fd7576526c 100644 --- a/src/hotspot/share/c1/c1_LIRGenerator.cpp +++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp @@ -1315,8 +1315,12 @@ void LIRGenerator::do_isPrimitive(Intrinsic* x) { // Example: Thread.currentThread() void LIRGenerator::do_currentThread(Intrinsic* x) { assert(x->number_of_arguments() == 0, "wrong type"); + LIR_Opr temp = new_register(T_ADDRESS); LIR_Opr reg = rlock_result(x); - __ move_wide(new LIR_Address(getThreadPointer(), in_bytes(JavaThread::threadObj_offset()), T_OBJECT), reg); + __ move(new LIR_Address(getThreadPointer(), in_bytes(JavaThread::threadObj_offset()), T_ADDRESS), temp); + // threadObj = ((OopHandle)_threadObj)->resolve(); + access_load(IN_NATIVE, T_OBJECT, + LIR_OprFact::address(new LIR_Address(temp, T_OBJECT)), reg); } diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp index 598a98be07a..2c3ae1e711f 100644 --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp @@ -58,7 +58,6 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) : // Root scanning phases _gc_par_phases[ThreadRoots] = new WorkerDataArray("ThreadRoots", "Thread Roots (ms):", max_gc_threads); - _gc_par_phases[UniverseRoots] = new WorkerDataArray("UniverseRoots", "Universe Roots (ms):", max_gc_threads); _gc_par_phases[ObjectSynchronizerRoots] = new WorkerDataArray("ObjectSynchronizerRoots", "ObjectSynchronizer Roots (ms):", max_gc_threads); _gc_par_phases[CLDGRoots] = new WorkerDataArray("CLDGRoots", "CLDG Roots (ms):", max_gc_threads); AOT_ONLY(_gc_par_phases[AOTCodeRoots] = new WorkerDataArray("AOTCodeRoots", "AOT Root Scan (ms):", max_gc_threads);) diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp index 6d1484552f9..1daebe1e41f 100644 --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp @@ -48,7 +48,6 @@ class G1GCPhaseTimes : public CHeapObj { GCWorkerStart, ExtRootScan, ThreadRoots, - UniverseRoots, ObjectSynchronizerRoots, CLDGRoots, AOT_ONLY(AOTCodeRoots COMMA) diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp index f43304f1061..d70ad7c4cf5 100644 --- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp +++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp @@ -43,7 +43,6 @@ #include "gc/shared/oopStorageSetParState.inline.hpp" #include "gc/shared/referenceProcessor.hpp" #include "memory/allocation.inline.hpp" -#include "memory/universe.hpp" #include "runtime/mutex.hpp" #include "utilities/macros.hpp" @@ -181,13 +180,6 @@ void G1RootProcessor::process_vm_roots(G1RootClosures* closures, uint worker_id) { OopClosure* strong_roots = closures->strong_oops(); - { - G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::UniverseRoots, worker_id); - if (_process_strong_tasks.try_claim_task(G1RP_PS_Universe_oops_do)) { - Universe::oops_do(strong_roots); - } - } - { G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::ObjectSynchronizerRoots, worker_id); if (_process_strong_tasks.try_claim_task(G1RP_PS_ObjectSynchronizer_oops_do)) { diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index a9bc67c75cb..b7bb059d77f 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -2008,10 +2008,6 @@ static void mark_from_roots_work(ParallelRootType::Value root_type, uint worker_ PCMarkAndPushClosure mark_and_push_closure(cm); switch (root_type) { - case ParallelRootType::universe: - Universe::oops_do(&mark_and_push_closure); - break; - case ParallelRootType::object_synchronizer: ObjectSynchronizer::oops_do(&mark_and_push_closure); break; @@ -2225,7 +2221,6 @@ void PSParallelCompact::adjust_roots(ParCompactionManager* cm) { PCAdjustPointerClosure oop_closure(cm); // General strong roots. - Universe::oops_do(&oop_closure); Threads::oops_do(&oop_closure, NULL); ObjectSynchronizer::oops_do(&oop_closure); OopStorageSet::strong_oops_do(&oop_closure); diff --git a/src/hotspot/share/gc/parallel/psRootType.hpp b/src/hotspot/share/gc/parallel/psRootType.hpp index 8cced17f7f0..de60d8e01f6 100644 --- a/src/hotspot/share/gc/parallel/psRootType.hpp +++ b/src/hotspot/share/gc/parallel/psRootType.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -34,7 +34,6 @@ public: // The order reflects the order these roots are to be processed, // We do not want any holes in the enum as we enumerate these values by incrementing them. enum Value { - universe, object_synchronizer, class_loader_data, code_cache, diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp index e44cf30348a..5625d3d5bfe 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.cpp +++ b/src/hotspot/share/gc/parallel/psScavenge.cpp @@ -92,10 +92,6 @@ static void scavenge_roots_work(ParallelRootType::Value root_type, uint worker_i PSPromoteRootsClosure roots_to_old_closure(pm); switch (root_type) { - case ParallelRootType::universe: - Universe::oops_do(&roots_closure); - break; - case ParallelRootType::object_synchronizer: ObjectSynchronizer::oops_do(&roots_closure); break; diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp index 393830bc44b..377391e24aa 100644 --- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp +++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -141,6 +141,7 @@ Node* BarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) con bool control_dependent = (decorators & C2_CONTROL_DEPENDENT_LOAD) != 0; bool unknown_control = (decorators & C2_UNKNOWN_CONTROL_LOAD) != 0; bool unsafe = (decorators & C2_UNSAFE_ACCESS) != 0; + bool immutable = (decorators & C2_IMMUTABLE_MEMORY) != 0; bool in_native = (decorators & IN_NATIVE) != 0; @@ -153,10 +154,14 @@ Node* BarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) con GraphKit* kit = parse_access.kit(); Node* control = control_dependent ? kit->control() : NULL; - if (in_native) { - load = kit->make_load(control, adr, val_type, access.type(), mo, dep, - requires_atomic_access, unaligned, + if (immutable) { + assert(!requires_atomic_access, "can't ensure atomicity"); + Compile* C = Compile::current(); + Node* mem = kit->immutable_memory(); + load = LoadNode::make(kit->gvn(), control, mem, adr, + adr_type, val_type, access.type(), mo, dep, unaligned, mismatched, unsafe, access.barrier_data()); + load = kit->gvn().transform(load); } else { load = kit->make_load(control, adr, val_type, access.type(), adr_type, mo, dep, requires_atomic_access, unaligned, mismatched, unsafe, diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp index c962336d72d..91bbe5426b8 100644 --- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp +++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -54,6 +54,8 @@ const DecoratorSet C2_READ_ACCESS = DECORATOR_LAST << 8; const DecoratorSet C2_TIGHTLY_COUPLED_ALLOC = DECORATOR_LAST << 9; // Loads and stores from an arraycopy being optimized const DecoratorSet C2_ARRAY_COPY = DECORATOR_LAST << 10; +// Loads from immutable memory +const DecoratorSet C2_IMMUTABLE_MEMORY = DECORATOR_LAST << 11; class Compile; class ConnectionGraph; diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp index 5b30fc4d2fe..06df00ce324 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp @@ -817,10 +817,6 @@ void GenCollectedHeap::process_roots(StrongRootsScope* scope, bool is_par = scope->n_threads() > 1; Threads::possibly_parallel_oops_do(is_par, strong_roots, roots_from_code_p); - if (_process_strong_tasks->try_claim_task(GCH_PS_Universe_oops_do)) { - Universe::oops_do(strong_roots); - } - if (_process_strong_tasks->try_claim_task(GCH_PS_ObjectSynchronizer_oops_do)) { ObjectSynchronizer::oops_do(strong_roots); } diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp index 6501b5fd553..af96e618544 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp @@ -105,7 +105,6 @@ protected: // The set of potentially parallel tasks in root scanning. enum GCH_strong_roots_tasks { - GCH_PS_Universe_oops_do, GCH_PS_ObjectSynchronizer_oops_do, GCH_PS_OopStorageSet_oops_do, GCH_PS_ClassLoaderDataGraph_oops_do, diff --git a/src/hotspot/share/gc/shared/oopStorageSet.hpp b/src/hotspot/share/gc/shared/oopStorageSet.hpp index ff8a43bd65a..66c39414889 100644 --- a/src/hotspot/share/gc/shared/oopStorageSet.hpp +++ b/src/hotspot/share/gc/shared/oopStorageSet.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -37,7 +37,7 @@ class OopStorageSet : public AllStatic { public: // Must be updated when new OopStorages are introduced - static const uint strong_count = 2; + static const uint strong_count = 3; static const uint weak_count = 4 JFR_ONLY(+ 1); static const uint all_count = strong_count + weak_count; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp index e7b6310b5f2..8a69ac7c8c6 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp @@ -37,7 +37,6 @@ class outputStream; f(CNT_PREFIX ## TotalWork, DESC_PREFIX "") \ f(CNT_PREFIX ## ThreadRoots, DESC_PREFIX "Thread Roots") \ f(CNT_PREFIX ## CodeCacheRoots, DESC_PREFIX "Code Cache Roots") \ - f(CNT_PREFIX ## UniverseRoots, DESC_PREFIX "Universe Roots") \ f(CNT_PREFIX ## VMStrongRoots, DESC_PREFIX "VM Strong Roots") \ f(CNT_PREFIX ## VMWeakRoots, DESC_PREFIX "VM Weak Roots") \ f(CNT_PREFIX ## ObjectSynchronizerRoots, DESC_PREFIX "Synchronizer Roots") \ diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp index 4f8cebab6f9..39d7d2a9056 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp @@ -37,7 +37,6 @@ #include "gc/shenandoah/shenandoahVMOperations.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" -#include "memory/universe.hpp" #include "runtime/thread.hpp" ShenandoahSerialRoot::ShenandoahSerialRoot(ShenandoahSerialRoot::OopsDo oops_do, @@ -53,12 +52,10 @@ void ShenandoahSerialRoot::oops_do(OopClosure* cl, uint worker_id) { } ShenandoahSerialRoots::ShenandoahSerialRoots(ShenandoahPhaseTimings::Phase phase) : - _universe_root(&Universe::oops_do, phase, ShenandoahPhaseTimings::UniverseRoots), _object_synchronizer_root(&ObjectSynchronizer::oops_do, phase, ShenandoahPhaseTimings::ObjectSynchronizerRoots) { } void ShenandoahSerialRoots::oops_do(OopClosure* cl, uint worker_id) { - _universe_root.oops_do(cl, worker_id); _object_synchronizer_root.oops_do(cl, worker_id); } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp index efafc134ce3..895e3444efd 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp @@ -51,7 +51,6 @@ public: class ShenandoahSerialRoots { private: - ShenandoahSerialRoot _universe_root; ShenandoahSerialRoot _object_synchronizer_root; public: ShenandoahSerialRoots(ShenandoahPhaseTimings::Phase phase); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp index 45f5139da36..c1d0394e617 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp @@ -37,7 +37,6 @@ #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageSet.hpp" #include "gc/shared/weakProcessor.inline.hpp" -#include "memory/universe.hpp" #include "runtime/thread.hpp" #include "utilities/debug.hpp" @@ -75,7 +74,6 @@ void ShenandoahRootVerifier::oops_do(OopClosure* oops) { if (verify(SerialRoots)) { shenandoah_assert_safepoint(); - Universe::oops_do(oops); ObjectSynchronizer::oops_do(oops); } @@ -119,7 +117,6 @@ void ShenandoahRootVerifier::roots_do(OopClosure* oops) { CLDToOopClosure clds(oops, ClassLoaderData::_claim_none); ClassLoaderDataGraph::cld_do(&clds); - Universe::oops_do(oops); JNIHandles::oops_do(oops); ObjectSynchronizer::oops_do(oops); Universe::vm_global()->oops_do(oops); @@ -145,7 +142,6 @@ void ShenandoahRootVerifier::strong_roots_do(OopClosure* oops) { CLDToOopClosure clds(oops, ClassLoaderData::_claim_none); ClassLoaderDataGraph::roots_cld_do(&clds, NULL); - Universe::oops_do(oops); JNIHandles::oops_do(oops); ObjectSynchronizer::oops_do(oops); Universe::vm_global()->oops_do(oops); diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp index 53b76f1f62c..a50772f96d1 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.cpp +++ b/src/hotspot/share/gc/z/zRootsIterator.cpp @@ -54,7 +54,6 @@ static const ZStatSubPhase ZSubPhasePauseRootsSetup("Pause Roots Setup"); static const ZStatSubPhase ZSubPhasePauseRoots("Pause Roots"); static const ZStatSubPhase ZSubPhasePauseRootsTeardown("Pause Roots Teardown"); -static const ZStatSubPhase ZSubPhasePauseRootsUniverse("Pause Roots Universe"); static const ZStatSubPhase ZSubPhasePauseRootsObjectSynchronizer("Pause Roots ObjectSynchronizer"); static const ZStatSubPhase ZSubPhasePauseRootsJVMTIWeakExport("Pause Roots JVMTIWeakExport"); static const ZStatSubPhase ZSubPhasePauseRootsVMThread("Pause Roots VM Thread"); @@ -185,7 +184,6 @@ void ZJavaThreadsIterator::threads_do(ThreadClosure* cl) { ZRootsIterator::ZRootsIterator(bool visit_jvmti_weak_export) : _visit_jvmti_weak_export(visit_jvmti_weak_export), _java_threads_iter(), - _universe(this), _object_synchronizer(this), _jvmti_weak_export(this), _vm_thread(this), @@ -213,11 +211,6 @@ ZRootsIterator::~ZRootsIterator() { COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers()); } -void ZRootsIterator::do_universe(ZRootsIteratorClosure* cl) { - ZStatTimer timer(ZSubPhasePauseRootsUniverse); - Universe::oops_do(cl); -} - void ZRootsIterator::do_object_synchronizer(ZRootsIteratorClosure* cl) { ZStatTimer timer(ZSubPhasePauseRootsObjectSynchronizer); ObjectSynchronizer::oops_do(cl); @@ -248,7 +241,6 @@ void ZRootsIterator::do_code_cache(ZRootsIteratorClosure* cl) { void ZRootsIterator::oops_do(ZRootsIteratorClosure* cl) { ZStatTimer timer(ZSubPhasePauseRoots); - _universe.oops_do(cl); _object_synchronizer.oops_do(cl); _vm_thread.oops_do(cl); _java_threads.oops_do(cl); diff --git a/src/hotspot/share/gc/z/zRootsIterator.hpp b/src/hotspot/share/gc/z/zRootsIterator.hpp index 0f2496e0be7..ea60739b529 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.hpp +++ b/src/hotspot/share/gc/z/zRootsIterator.hpp @@ -110,14 +110,12 @@ private: const bool _visit_jvmti_weak_export; ZJavaThreadsIterator _java_threads_iter; - void do_universe(ZRootsIteratorClosure* cl); void do_object_synchronizer(ZRootsIteratorClosure* cl); void do_jvmti_weak_export(ZRootsIteratorClosure* cl); void do_vm_thread(ZRootsIteratorClosure* cl); void do_java_threads(ZRootsIteratorClosure* cl); void do_code_cache(ZRootsIteratorClosure* cl); - ZSerialOopsDo _universe; ZSerialOopsDo _object_synchronizer; ZSerialOopsDo _jvmti_weak_export; ZSerialOopsDo _vm_thread; diff --git a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp index e1c528b3156..947291bef0b 100644 --- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp @@ -34,7 +34,6 @@ #include "jfr/leakprofiler/chains/edgeQueue.hpp" #include "jfr/leakprofiler/chains/rootSetClosure.hpp" #include "jfr/leakprofiler/utilities/unifiedOopRef.inline.hpp" -#include "memory/universe.hpp" #include "oops/access.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/synchronizer.hpp" @@ -73,7 +72,6 @@ void RootSetClosure::process() { // We don't follow code blob oops, because they have misaligned oops. Threads::oops_do(this, NULL); ObjectSynchronizer::oops_do(this); - Universe::oops_do(this); OopStorageSet::strong_oops_do(this); AOTLoader::oops_do(this); } diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp index 17d3ba40e1d..be8d9ff0db8 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp @@ -33,7 +33,6 @@ #include "jfr/leakprofiler/checkpoint/rootResolver.hpp" #include "jfr/utilities/jfrThreadIterator.hpp" #include "memory/iterator.hpp" -#include "memory/universe.hpp" #include "oops/klass.hpp" #include "oops/oop.hpp" #include "prims/jvmtiThreadState.hpp" @@ -97,7 +96,6 @@ class ReferenceToRootClosure : public StackObj { bool do_cldg_roots(); bool do_object_synchronizer_roots(); - bool do_universe_roots(); bool do_oop_storage_roots(); bool do_string_table_roots(); bool do_aot_loader_roots(); @@ -138,13 +136,6 @@ bool ReferenceToRootClosure::do_object_synchronizer_roots() { return rlc.complete(); } -bool ReferenceToRootClosure::do_universe_roots() { - assert(!complete(), "invariant"); - ReferenceLocateClosure rlc(_callback, OldObjectRoot::_universe, OldObjectRoot::_type_undetermined, NULL); - Universe::oops_do(&rlc); - return rlc.complete(); -} - bool ReferenceToRootClosure::do_oop_storage_roots() { int i = 0; for (OopStorageSet::Iterator it = OopStorageSet::strong_iterator(); !it.is_end(); ++it, ++i) { @@ -185,11 +176,6 @@ bool ReferenceToRootClosure::do_roots() { return true; } - if (do_universe_roots()) { - _complete = true; - return true; - } - if (do_oop_storage_roots()) { _complete = true; return true; diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp index 26968786571..f6aec1f3f1e 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -170,7 +170,7 @@ nonstatic_field(JVMCICompileState, _jvmti_can_post_on_exceptions, jbyte) \ nonstatic_field(JVMCICompileState, _jvmti_can_pop_frame, jbyte) \ \ - nonstatic_field(JavaThread, _threadObj, oop) \ + nonstatic_field(JavaThread, _threadObj, OopHandle) \ nonstatic_field(JavaThread, _anchor, JavaFrameAnchor) \ nonstatic_field(JavaThread, _vm_result, oop) \ volatile_nonstatic_field(JavaThread, _exception_oop, oop) \ diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp index 1cf9b5d552b..992ff28892e 100644 --- a/src/hotspot/share/memory/universe.cpp +++ b/src/hotspot/share/memory/universe.cpp @@ -223,11 +223,6 @@ void Universe::basic_type_classes_do(KlassClosure *closure) { } } -void Universe::oops_do(OopClosure* f) { - - ThreadsSMRSupport::exiting_threads_oops_do(f); -} - void LatestMethodCache::metaspace_pointers_do(MetaspaceClosure* it) { it->push(&_klass); } diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp index 652f566af46..d73b9cdac18 100644 --- a/src/hotspot/share/memory/universe.hpp +++ b/src/hotspot/share/memory/universe.hpp @@ -328,12 +328,6 @@ class Universe: AllStatic { static bool should_fill_in_stack_trace(Handle throwable); static void check_alignment(uintx size, uintx alignment, const char* name); - // Iteration - - // Apply "f" to the addresses of all the direct heap pointers maintained - // as static fields of "Universe". - static void oops_do(OopClosure* f); - // CDS support static void serialize(SerializeClosure* f); diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp index d09380c0548..9861fd8800f 100644 --- a/src/hotspot/share/opto/graphKit.cpp +++ b/src/hotspot/share/opto/graphKit.cpp @@ -1614,7 +1614,7 @@ Node* GraphKit::access_load(Node* adr, // actual adress to load val at return top(); // Dead path ? } - C2AccessValuePtr addr(adr, NULL); + C2AccessValuePtr addr(adr, adr->bottom_type()->is_ptr()); C2ParseAccess access(this, decorators | C2_READ_ACCESS, bt, NULL, addr); if (access.is_raw()) { return _barrier_set->BarrierSetC2::load_at(access, val_type); diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp index d8e09638e01..4e81922816f 100644 --- a/src/hotspot/share/opto/library_call.cpp +++ b/src/hotspot/share/opto/library_call.cpp @@ -1096,9 +1096,10 @@ Node* LibraryCallKit::generate_current_thread(Node* &tls_output) { const Type* thread_type = TypeOopPtr::make_from_klass(thread_klass)->cast_to_ptr_type(TypePtr::NotNull); Node* thread = _gvn.transform(new ThreadLocalNode()); Node* p = basic_plus_adr(top()/*!oop*/, thread, in_bytes(JavaThread::threadObj_offset())); - Node* threadObj = _gvn.transform(LoadNode::make(_gvn, NULL, immutable_memory(), p, p->bottom_type()->is_ptr(), thread_type, T_OBJECT, MemNode::unordered)); tls_output = thread; - return threadObj; + Node* thread_obj_handle = LoadNode::make(_gvn, NULL, immutable_memory(), p, p->bottom_type()->is_ptr(), TypeRawPtr::NOTNULL, T_ADDRESS, MemNode::unordered); + thread_obj_handle = _gvn.transform(thread_obj_handle); + return access_load(thread_obj_handle, thread_type, T_OBJECT, IN_NATIVE | C2_IMMUTABLE_MEMORY); } diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp index dc113a94e6e..52edcca640f 100644 --- a/src/hotspot/share/opto/memnode.cpp +++ b/src/hotspot/share/opto/memnode.cpp @@ -811,7 +811,9 @@ bool LoadNode::is_immutable_value(Node* adr) { return (adr->is_AddP() && adr->in(AddPNode::Base)->is_top() && adr->in(AddPNode::Address)->Opcode() == Op_ThreadLocal && (adr->in(AddPNode::Offset)->find_intptr_t_con(-1) == - in_bytes(JavaThread::osthread_offset()))); + in_bytes(JavaThread::osthread_offset()) || + adr->in(AddPNode::Offset)->find_intptr_t_con(-1) == + in_bytes(JavaThread::threadObj_offset()))); } #endif diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp index 33d0ca3f409..263d1ec0c82 100644 --- a/src/hotspot/share/prims/jvmtiTagMap.cpp +++ b/src/hotspot/share/prims/jvmtiTagMap.cpp @@ -3030,7 +3030,7 @@ inline bool VM_HeapWalkOperation::collect_simple_roots() { // Many of these won't be visible but others (such as instances of important // exceptions) will be visible. blk.set_kind(JVMTI_HEAP_REFERENCE_OTHER); - Universe::oops_do(&blk); + Universe::vm_global()->oops_do(&blk); if (blk.stopped()) { return false; } diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp index 8ebdb14b5c1..dda2017f887 100644 --- a/src/hotspot/share/runtime/serviceThread.cpp +++ b/src/hotspot/share/runtime/serviceThread.cpp @@ -31,6 +31,7 @@ #include "gc/shared/oopStorage.hpp" #include "gc/shared/oopStorageSet.hpp" #include "memory/universe.hpp" +#include "oops/oopHandle.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/interfaceSupport.inline.hpp" #include "runtime/javaCalls.hpp" @@ -53,6 +54,29 @@ JvmtiDeferredEvent* ServiceThread::_jvmti_event = NULL; // to add this field to the per-JavaThread event queue. TODO: fix this sometime later JvmtiDeferredEventQueue ServiceThread::_jvmti_service_queue; +// Defer releasing JavaThread OopHandle to the ServiceThread +class OopHandleList : public CHeapObj { + OopHandle _handle; + OopHandleList* _next; + public: + OopHandleList(OopHandle h, OopHandleList* next) : _handle(h), _next(next) {} + ~OopHandleList() { + _handle.release(JavaThread::thread_oop_storage()); + } + OopHandleList* next() const { return _next; } +}; + +static OopHandleList* _oop_handle_list = NULL; + +static void release_oop_handles() { + assert_lock_strong(Service_lock); + while (_oop_handle_list != NULL) { + OopHandleList* l = _oop_handle_list; + _oop_handle_list = l->next(); + delete l; + } +} + void ServiceThread::initialize() { EXCEPTION_MARK; @@ -139,6 +163,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) { (thread_id_table_work = ThreadIdTable::has_work()) | (protection_domain_table_work = SystemDictionary::pd_cache_table()->has_work()) | (oopstorage_work = OopStorage::has_cleanup_work_and_reset()) | + (_oop_handle_list != NULL) | (deflate_idle_monitors = ObjectSynchronizer::is_async_deflation_needed()) ) == 0) { // Wait until notified that there is some work to do. @@ -152,6 +177,11 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) { jvmti_event = _jvmti_service_queue.dequeue(); _jvmti_event = &jvmti_event; } + + // Release thread OopHandles in lock + if (_oop_handle_list != NULL) { + release_oop_handles(); + } } if (stringtable_work) { @@ -238,3 +268,10 @@ void ServiceThread::nmethods_do(CodeBlobClosure* cf) { _jvmti_service_queue.nmethods_do(cf); } } + +void ServiceThread::add_oop_handle_release(OopHandle handle) { + MutexLocker ml(Service_lock, Mutex::_no_safepoint_check_flag); + OopHandleList* new_head = new OopHandleList(handle, _oop_handle_list); + _oop_handle_list = new_head; + Service_lock->notify_all(); +} diff --git a/src/hotspot/share/runtime/serviceThread.hpp b/src/hotspot/share/runtime/serviceThread.hpp index d0650416dfb..f8bd3d9d65b 100644 --- a/src/hotspot/share/runtime/serviceThread.hpp +++ b/src/hotspot/share/runtime/serviceThread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -52,6 +52,7 @@ class ServiceThread : public JavaThread { // Add event to the service thread event queue. static void enqueue_deferred_event(JvmtiDeferredEvent* event); + static void add_oop_handle_release(OopHandle handle); // GC support void oops_do(OopClosure* f, CodeBlobClosure* cf); diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp index f71bc313ec3..0d0536fe4de 100644 --- a/src/hotspot/share/runtime/thread.cpp +++ b/src/hotspot/share/runtime/thread.cpp @@ -37,6 +37,8 @@ #include "gc/shared/barrierSet.hpp" #include "gc/shared/gcId.hpp" #include "gc/shared/gcLocker.inline.hpp" +#include "gc/shared/oopStorage.hpp" +#include "gc/shared/oopStorageSet.hpp" #include "gc/shared/workgroup.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/linkResolver.hpp" @@ -1055,12 +1057,12 @@ static Handle create_initial_thread_group(TRAPS) { return main_instance; } -// Creates the initial Thread -static oop create_initial_thread(Handle thread_group, JavaThread* thread, +// Creates the initial Thread, and sets it to running. +static void create_initial_thread(Handle thread_group, JavaThread* thread, TRAPS) { InstanceKlass* ik = SystemDictionary::Thread_klass(); assert(ik->is_initialized(), "must be"); - instanceHandle thread_oop = ik->allocate_instance_handle(CHECK_NULL); + instanceHandle thread_oop = ik->allocate_instance_handle(CHECK); // Cannot use JavaCalls::construct_new_instance because the java.lang.Thread // constructor calls Thread.current(), which must be set here for the @@ -1069,7 +1071,7 @@ static oop create_initial_thread(Handle thread_group, JavaThread* thread, java_lang_Thread::set_priority(thread_oop(), NormPriority); thread->set_threadObj(thread_oop()); - Handle string = java_lang_String::create_from_str("main", CHECK_NULL); + Handle string = java_lang_String::create_from_str("main", CHECK); JavaValue result(T_VOID); JavaCalls::call_special(&result, thread_oop, @@ -1078,8 +1080,12 @@ static oop create_initial_thread(Handle thread_group, JavaThread* thread, vmSymbols::threadgroup_string_void_signature(), thread_group, string, - CHECK_NULL); - return thread_oop(); + CHECK); + + // Set thread status to running since main thread has + // been started and running. + java_lang_Thread::set_thread_status(thread_oop(), + java_lang_Thread::RUNNABLE); } char java_runtime_name[128] = ""; @@ -1187,6 +1193,23 @@ static void call_postVMInitHook(TRAPS) { } } +// Initialized by VMThread at vm_global_init +static OopStorage* _thread_oop_storage = NULL; + +oop JavaThread::threadObj() const { + return _threadObj.resolve(); +} + +void JavaThread::set_threadObj(oop p) { + assert(_thread_oop_storage != NULL, "not yet initialized"); + _threadObj = OopHandle(_thread_oop_storage, p); +} + +OopStorage* JavaThread::thread_oop_storage() { + assert(_thread_oop_storage != NULL, "not yet initialized"); + return _thread_oop_storage; +} + void JavaThread::allocate_threadObj(Handle thread_group, const char* thread_name, bool daemon, TRAPS) { assert(thread_group.not_null(), "thread group should be specified"); @@ -1653,7 +1676,6 @@ void JavaThread::initialize() { // Initialize fields set_saved_exception_pc(NULL); - set_threadObj(NULL); _anchor.clear(); set_entry_point(NULL); set_jni_functions(jni_functions()); @@ -1758,7 +1780,7 @@ void JavaThread::interrupt() { bool JavaThread::is_interrupted(bool clear_interrupted) { debug_only(check_for_dangling_thread_pointer(this);) - if (threadObj() == NULL) { + if (_threadObj.peek() == NULL) { // If there is no j.l.Thread then it is impossible to have // been interrupted. We can find NULL during VM initialization // or when a JNI thread is still in the process of attaching. @@ -1871,6 +1893,9 @@ JavaThread::JavaThread(ThreadFunction entry_point, size_t stack_sz) : JavaThread::~JavaThread() { + // Ask ServiceThread to release the threadObj OopHandle + ServiceThread::add_oop_handle_release(_threadObj); + // JSR166 -- return the parker to the free list Parker::Release(_parker); _parker = NULL; @@ -1971,7 +1996,7 @@ void JavaThread::run() { void JavaThread::thread_main_inner() { assert(JavaThread::current() == this, "sanity check"); - assert(this->threadObj() != NULL, "just checking"); + assert(_threadObj.peek() != NULL, "just checking"); // Execute thread entry point unless this thread has a pending exception // or has been stopped before starting. @@ -3015,7 +3040,6 @@ void JavaThread::oops_do(OopClosure* f, CodeBlobClosure* cf) { // Traverse instance variables at the end since the GC may be moving things // around using this function - f->do_oop((oop*) &_threadObj); f->do_oop((oop*) &_vm_result); f->do_oop((oop*) &_exception_oop); f->do_oop((oop*) &_pending_async_exception); @@ -3717,13 +3741,7 @@ void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) { Handle thread_group = create_initial_thread_group(CHECK); Universe::set_main_thread_group(thread_group()); initialize_class(vmSymbols::java_lang_Thread(), CHECK); - oop thread_object = create_initial_thread(thread_group, main_thread, CHECK); - main_thread->set_threadObj(thread_object); - - // Set thread status to running since main thread has - // been started and running. - java_lang_Thread::set_thread_status(thread_object, - java_lang_Thread::RUNNABLE); + create_initial_thread(thread_group, main_thread, CHECK); // The VM creates objects of this class. initialize_class(vmSymbols::java_lang_Module(), CHECK); @@ -3886,6 +3904,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { } #endif // INCLUDE_JVMCI + // Initialize OopStorage for threadObj + _thread_oop_storage = OopStorageSet::create_strong("Thread OopStorage"); + // Attach the main thread to this os thread JavaThread* main_thread = new JavaThread(); main_thread->set_thread_state(_thread_in_vm); diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp index 8b717804675..97bbe7e76c1 100644 --- a/src/hotspot/share/runtime/thread.hpp +++ b/src/hotspot/share/runtime/thread.hpp @@ -92,6 +92,8 @@ class JVMCIPrimitiveArray; class Metadata; class ResourceArea; +class OopStorage; + DEBUG_ONLY(class ResourceMark;) class WorkerThread; @@ -1017,7 +1019,7 @@ class JavaThread: public Thread { friend class ThreadsSMRSupport; // to access _threadObj for exiting_threads_oops_do private: bool _on_thread_list; // Is set when this JavaThread is added to the Threads list - oop _threadObj; // The Java level thread object + OopHandle _threadObj; // The Java level thread object #ifdef ASSERT private: @@ -1277,8 +1279,8 @@ class JavaThread: public Thread { // Thread oop. threadObj() can be NULL for initial JavaThread // (or for threads attached via JNI) - oop threadObj() const { return _threadObj; } - void set_threadObj(oop p) { _threadObj = p; } + oop threadObj() const; + void set_threadObj(oop p); // Prepare thread and add to priority queue. If a priority is // not specified, use the priority of the thread object. Threads_lock @@ -2112,6 +2114,7 @@ public: void interrupt(); bool is_interrupted(bool clear_interrupted); + static OopStorage* thread_oop_storage(); }; // Inline implementation of JavaThread::current diff --git a/src/hotspot/share/runtime/threadSMR.cpp b/src/hotspot/share/runtime/threadSMR.cpp index 2cfac944fa3..41c5af29dc0 100644 --- a/src/hotspot/share/runtime/threadSMR.cpp +++ b/src/hotspot/share/runtime/threadSMR.cpp @@ -41,9 +41,6 @@ #include "utilities/resourceHash.hpp" #include "utilities/vmError.hpp" -// List of exiting threads -ThreadsSMRSupport::Holder* ThreadsSMRSupport::_exiting_threads = NULL; - // The '_cnt', '_max' and '_times" fields are enabled via // -XX:+EnableThreadSMRStatistics: @@ -927,8 +924,6 @@ void ThreadsSMRSupport::release_stable_list_wake_up(bool is_nested) { void ThreadsSMRSupport::remove_thread(JavaThread *thread) { - ThreadsSMRSupport::add_exiting_thread(thread); - if (ThreadIdTable::is_initialized()) { jlong tid = SharedRuntime::get_java_tid(thread); ThreadIdTable::remove_thread(tid); @@ -998,7 +993,6 @@ void ThreadsSMRSupport::wait_until_not_protected(JavaThread *thread) { // This is the common case. ThreadsSMRSupport::clear_delete_notify(); ThreadsSMRSupport::delete_lock()->unlock(); - ThreadsSMRSupport::remove_exiting_thread(thread); break; } if (!has_logged_once) { @@ -1188,47 +1182,3 @@ void ThreadsSMRSupport::print_info_elements_on(outputStream* st, ThreadsList* t_ cnt++; } } - -void ThreadsSMRSupport::add_exiting_thread(JavaThread* thread) { - assert(thread == JavaThread::current(), "invariant"); - assert(Threads_lock->owned_by_self(), "invariant"); - assert(!contains_exiting_thread(thread), "invariant"); - Holder* h = new Holder(thread, _exiting_threads); - _exiting_threads = h; -} - -void ThreadsSMRSupport::remove_exiting_thread(JavaThread* thread) { - assert(thread == JavaThread::current(), "invariant"); - assert(Threads_lock->owned_by_self(), "invariant"); - // If a thread fails to initialize fully it can be deleted immediately - // so we won't remove it from the ThreadsList and so never add it to the - // exiting thread list - so we can't assert(contains_exiting_thread(p)) here. - - for (Holder* current = _exiting_threads, **prev_next = &_exiting_threads; - current != NULL; - prev_next = ¤t->_next, current = current->_next) { - if (current->_thread == thread) { - *prev_next = current->_next; - delete current; - break; - } - } -} - -#ifdef ASSERT -bool ThreadsSMRSupport::contains_exiting_thread(JavaThread* thread) { - for (Holder* current = _exiting_threads; current != NULL; current = current->_next) { - if (current->_thread == thread) { - return true; - } - } - return false; -} -#endif - -void ThreadsSMRSupport::exiting_threads_oops_do(OopClosure* f) { - assert_locked_or_safepoint(Threads_lock); - for (Holder* current = _exiting_threads; current != NULL; current = current->_next) { - f->do_oop((oop*) ¤t->_thread->_threadObj); - } -} diff --git a/src/hotspot/share/runtime/threadSMR.hpp b/src/hotspot/share/runtime/threadSMR.hpp index 6b68353de2a..a8c9d0475a6 100644 --- a/src/hotspot/share/runtime/threadSMR.hpp +++ b/src/hotspot/share/runtime/threadSMR.hpp @@ -82,33 +82,12 @@ class ThreadClosure; // but that target JavaThread * will not be deleted until it is no // longer protected by a ThreadsListHandle. // -// Once a JavaThread has removed itself from the main ThreadsList it is -// no longer visited by GC. To ensure that thread's threadObj() oop remains -// valid while the thread is still accessible from a ThreadsListHandle we -// maintain a special list of exiting threads: -// - In remove() we add the exiting thread to the list (under the Threads_lock). -// - In wait_until_not_protected() we remove it from the list (again under the -// Threads_lock). -// - Universe::oops_do walks the list (at a safepoint so VMThread holds -// Threads_lock) and visits the _threadObj oop of each JavaThread. - // SMR Support for the Threads class. // class ThreadsSMRSupport : AllStatic { friend class VMStructs; friend class SafeThreadsListPtr; // for _nested_thread_list_max, delete_notify(), release_stable_list_wake_up() access - // Helper class for the exiting thread list - class Holder : public CHeapObj { - public: - JavaThread* _thread; - Holder* _next; - Holder(JavaThread* thread, Holder* next) : _thread(thread), _next(next) {} - }; - - // The list of exiting threads - static Holder* _exiting_threads; - // The coordination between ThreadsSMRSupport::release_stable_list() and // ThreadsSMRSupport::smr_delete() uses the delete_lock in order to // reduce the traffic on the Threads_lock. @@ -170,12 +149,6 @@ class ThreadsSMRSupport : AllStatic { static void smr_delete(JavaThread *thread); static void update_tlh_stats(uint millis); - // Exiting thread list maintenance - static void add_exiting_thread(JavaThread* thread); - static void remove_exiting_thread(JavaThread* thread); - DEBUG_ONLY(static bool contains_exiting_thread(JavaThread* thread);) - static void exiting_threads_oops_do(OopClosure* f); - // Logging and printing support: static void log_statistics(); static void print_info_elements_on(outputStream* st, ThreadsList* t_list); diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp index 514aa648049..16d85947f0f 100644 --- a/src/hotspot/share/runtime/vmStructs.cpp +++ b/src/hotspot/share/runtime/vmStructs.cpp @@ -740,7 +740,7 @@ typedef HashtableEntry KlassHashtableEntry; nonstatic_field(Thread, _current_waiting_monitor, ObjectMonitor*) \ nonstatic_field(NamedThread, _name, char*) \ nonstatic_field(NamedThread, _processed_thread, JavaThread*) \ - nonstatic_field(JavaThread, _threadObj, oop) \ + nonstatic_field(JavaThread, _threadObj, OopHandle) \ nonstatic_field(JavaThread, _anchor, JavaFrameAnchor) \ nonstatic_field(JavaThread, _vm_result, oop) \ nonstatic_field(JavaThread, _vm_result_2, Metadata*) \ diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp index c85087e9595..61584ffac71 100644 --- a/src/hotspot/share/services/heapDumper.cpp +++ b/src/hotspot/share/services/heapDumper.cpp @@ -1859,8 +1859,9 @@ void VM_HeapDumper::work(uint worker_id) { // HPROF_GC_ROOT_JNI_GLOBAL JNIGlobalsDumper jni_dumper(writer()); JNIHandles::oops_do(&jni_dumper); - Universe::oops_do(&jni_dumper); // technically not jni roots, but global roots - // for things like preallocated throwable backtraces + // technically not jni roots, but global roots + // for things like preallocated throwable backtraces + Universe::vm_global()->oops_do(&jni_dumper); // HPROF_GC_ROOT_STICKY_CLASS // These should be classes in the NULL class loader data, and not all classes diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java index ec2a4cabfe7..aafd48a89b8 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java @@ -43,7 +43,7 @@ import sun.jvm.hotspot.utilities.Observer; public class JavaThread extends Thread { private static final boolean DEBUG = System.getProperty("sun.jvm.hotspot.runtime.JavaThread.DEBUG") != null; - private static sun.jvm.hotspot.types.OopField threadObjField; + private static long threadObjFieldOffset; private static AddressField anchorField; private static AddressField lastJavaSPField; private static AddressField lastJavaPCField; @@ -85,7 +85,8 @@ public class JavaThread extends Thread { Type type = db.lookupType("JavaThread"); Type anchorType = db.lookupType("JavaFrameAnchor"); - threadObjField = type.getOopField("_threadObj"); + threadObjFieldOffset = type.getField("_threadObj").getOffset(); + anchorField = type.getAddressField("_anchor"); lastJavaSPField = anchorType.getAddressField("_last_Java_sp"); lastJavaPCField = anchorType.getAddressField("_last_Java_pc"); @@ -347,7 +348,9 @@ public class JavaThread extends Thread { public Oop getThreadObj() { Oop obj = null; try { - obj = VM.getVM().getObjectHeap().newOop(threadObjField.getValue(addr)); + Address addr = getAddress().addOffsetTo(threadObjFieldOffset); + VMOopHandle vmOopHandle = VMObjectFactory.newObject(VMOopHandle.class, addr); + obj = vmOopHandle.resolve(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java index e0a7cf15cdb..e2c3d0aad6d 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java @@ -375,7 +375,19 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigAccess { public final int threadTlabOffset = getFieldOffset("Thread::_tlab", Integer.class, "ThreadLocalAllocBuffer"); public final int javaThreadAnchorOffset = getFieldOffset("JavaThread::_anchor", Integer.class, "JavaFrameAnchor"); public final int javaThreadShouldPostOnExceptionsFlagOffset = getFieldOffset("JavaThread::_should_post_on_exceptions_flag", Integer.class, "int", Integer.MIN_VALUE, JVMCI || JDK >= 12); - public final int threadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "oop"); + + public final boolean threadObjectFieldIsHandle; + public final int threadObjectOffset; + { + if (JDK <= 15) { + threadObjectFieldIsHandle = false; + threadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "oop"); + } else { + threadObjectFieldIsHandle = true; + threadObjectOffset = getFieldOffset("JavaThread::_threadObj", Integer.class, "OopHandle"); + } + } + public final int osThreadOffset = getFieldOffset("JavaThread::_osthread", Integer.class, "OSThread*"); public final int threadIsMethodHandleReturnOffset = getFieldOffset("JavaThread::_is_method_handle_return", Integer.class, "int"); public final int threadObjectResultOffset = getFieldOffset("JavaThread::_vm_result", Integer.class, "oop"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java index 0a661accd75..597df07b54a 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java @@ -30,6 +30,7 @@ import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK; import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS; import static org.graalvm.compiler.hotspot.meta.HotSpotAOTProfilingPlugin.Options.TieredAOT; +import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_HANDLE_LOCATION; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION; import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing; @@ -427,12 +428,21 @@ public class HotSpotGraphBuilderPlugins { AddressNode address = b.add(new OffsetAddressNode(thread, offset)); // JavaThread::_threadObj is never compressed ObjectStamp stamp = StampFactory.objectNonNull(TypeReference.create(b.getAssumptions(), metaAccess.lookupJavaType(Thread.class))); - b.addPush(JavaKind.Object, new ReadNode(address, JAVA_THREAD_THREAD_OBJECT_LOCATION, stamp, BarrierType.NONE)); + ReadNode value = b.add(new ReadNode(address, JAVA_THREAD_THREAD_OBJECT_LOCATION, + config.threadObjectFieldIsHandle ? StampFactory.forKind(wordTypes.getWordKind()) : stamp, BarrierType.NONE)); + if (config.threadObjectFieldIsHandle) { + ValueNode handleOffset = ConstantNode.forIntegerKind(wordTypes.getWordKind(), 0, b.getGraph()); + AddressNode handleAddress = b.add(new OffsetAddressNode(value, handleOffset)); + value = b.add(new ReadNode(handleAddress, JAVA_THREAD_THREAD_OBJECT_HANDLE_LOCATION, stamp, BarrierType.NONE)); + } + b.push(JavaKind.Object, value); return true; } }); if (config.osThreadInterruptedOffset != Integer.MAX_VALUE) { + // This substitution is no longer in use when threadObj is a handle + assert !config.threadObjectFieldIsHandle; r.registerMethodSubstitution(ThreadSubstitutions.class, "isInterrupted", Receiver.class, boolean.class); } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java index e0a1f7e0c8b..51384944046 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java @@ -308,6 +308,8 @@ public class HotSpotReplacementsUtil { */ public static final LocationIdentity JAVA_THREAD_THREAD_OBJECT_LOCATION = NamedLocationIdentity.immutable("JavaThread::_threadObj"); + public static final LocationIdentity JAVA_THREAD_THREAD_OBJECT_HANDLE_LOCATION = NamedLocationIdentity.immutable("JavaThread::_threadObj handle"); + @Fold public static int threadObjectOffset(@InjectedParameter GraalHotSpotVMConfig config) { return config.threadObjectOffset; diff --git a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java index 0f5743dc288..3a6eee9528c 100644 --- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java +++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java @@ -121,7 +121,6 @@ public class TestGCLogMessages { new LogMessageWithLevel("LAB Undo Waste", Level.DEBUG), // Ext Root Scan new LogMessageWithLevel("Thread Roots", Level.TRACE), - new LogMessageWithLevel("Universe Roots", Level.TRACE), new LogMessageWithLevel("ObjectSynchronizer Roots", Level.TRACE), new LogMessageWithLevel("CLDG Roots", Level.TRACE), new LogMessageWithLevel("CM RefProcessor Roots", Level.TRACE), diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java index 13bde4901ca..90667c97cd1 100644 --- a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java +++ b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java @@ -91,10 +91,10 @@ public class TestG1ParallelPhases { Set allPhases = of( "ExtRootScan", "ThreadRoots", - "UniverseRoots", "ObjectSynchronizerRoots", "VM Global", "JNI Global", + "Thread OopStorage", "CLDGRoots", "CMRefRoots", "MergeER", From 45c89daf72c37dbb5401f796f033eb33c31d703d Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Fri, 7 Aug 2020 15:09:19 +0100 Subject: [PATCH 024/100] 8249786: java/net/httpclient/websocket/PendingPingTextClose.java fails very infrequently TransportImpl is modified to make sure the CLOSED state is recorded before the channel is closed. The tests are modified to enable their retry mechanism on windows, similar to what was done previously for macOS. Reviewed-by: prappo, chegar --- .../net/http/websocket/TransportImpl.java | 8 +- .../websocket/PendingBinaryPingClose.java | 5 +- .../websocket/PendingBinaryPongClose.java | 5 +- .../websocket/PendingOperations.java | 18 +++- .../websocket/PendingPingBinaryClose.java | 5 +- .../websocket/PendingPingTextClose.java | 83 +++++++++++-------- .../websocket/PendingPongBinaryClose.java | 5 +- .../websocket/PendingPongTextClose.java | 5 +- .../websocket/PendingTextPingClose.java | 5 +- .../websocket/PendingTextPongClose.java | 5 +- .../net/httpclient/websocket/Support.java | 5 ++ 11 files changed, 98 insertions(+), 51 deletions(-) diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java index 8b4a43a8661..4a23ec27fdf 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/TransportImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -308,13 +308,15 @@ public class TransportImpl implements Transport { try { channel.shutdownOutput(); } finally { + writeState.set(CLOSED); if (inputClosed) { channel.close(); } } } } - writeState.set(CLOSED); + ChannelState s = writeState.get(); + assert s == CLOSED : s; sendScheduler.runOrSchedule(); } @@ -335,6 +337,8 @@ public class TransportImpl implements Transport { channel.shutdownInput(); } finally { if (outputClosed) { + ChannelState s = writeState.get(); + assert s == CLOSED : s; channel.close(); } } diff --git a/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java b/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java index 8116e8dc722..f48797da7f5 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingBinaryPingClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -79,8 +79,9 @@ public class PendingBinaryPingClose extends PendingOperations { assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125))); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfBinary); return null; - }, () -> cfBinary.isDone() ? true : false); + }, () -> cfBinary.isDone()); webSocket.abort(); assertFails(IOE, cfBinary); assertFails(IOE, cfPing); diff --git a/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java b/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java index b810a47eaba..81a8e05b496 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingBinaryPongClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -79,8 +79,9 @@ public class PendingBinaryPongClose extends PendingOperations { assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125))); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfBinary); return null; - }, () -> cfBinary.isDone() ? true : false); + }, () -> cfBinary.isDone()); webSocket.abort(); assertFails(IOE, cfBinary); assertFails(IOE, cfPong); diff --git a/test/jdk/java/net/httpclient/websocket/PendingOperations.java b/test/jdk/java/net/httpclient/websocket/PendingOperations.java index d0a7e21db67..ddfc4453e73 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingOperations.java +++ b/test/jdk/java/net/httpclient/websocket/PendingOperations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -27,6 +27,7 @@ import org.testng.annotations.DataProvider; import java.io.IOException; import java.net.http.WebSocket; import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.function.BooleanSupplier; @@ -46,6 +47,7 @@ public class PendingOperations { @AfterTest public void cleanup() { + System.err.println("cleanup: Closing server"); server.close(); webSocket.abort(); } @@ -61,6 +63,10 @@ public class PendingOperations { Support.assertCompletesExceptionally(clazz, stage); } + static void assertNotDone(CompletableFuture future) { + Support.assertNotDone(future); + } + @DataProvider(name = "booleans") public Object[][] booleans() { return new Object[][]{{Boolean.TRUE}, {Boolean.FALSE}}; @@ -69,6 +75,9 @@ public class PendingOperations { static boolean isMacOS() { return System.getProperty("os.name").contains("OS X"); } + static boolean isWindows() { + return System.getProperty("os.name").toLowerCase().startsWith("win"); + } private static final int ITERATIONS = 3; @@ -84,7 +93,12 @@ public class PendingOperations { callable.call(); break; } catch (AssertionError e) { - if (isMacOS() && repeatCondition.getAsBoolean()) { + var isMac = isMacOS(); + var isWindows = isWindows(); + var repeat = repeatCondition.getAsBoolean(); + System.out.printf("repeatable: isMac=%s, isWindows=%s, repeat=%s, iterations=%d%n", + isMac, isWindows, repeat, iterations); + if ((isMac || isWindows) && repeat) { // ## This is loathsome, but necessary because of observed // ## automagic socket buffer resizing on recent macOS platforms continue; diff --git a/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java b/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java index 99d5847a6bd..b7ea161b936 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingPingBinaryClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -77,8 +77,9 @@ public class PendingPingBinaryClose extends PendingOperations { assertHangs(cfBinary); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfPing); return null; - }, () -> cfPing.isDone() ? true : false); + }, () -> cfPing.isDone()); webSocket.abort(); assertFails(IOE, cfPing); assertFails(IOE, cfBinary); diff --git a/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java b/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java index 050f8098d2d..468bb868814 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingPingTextClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -44,44 +44,61 @@ import static java.net.http.HttpClient.newBuilder; public class PendingPingTextClose extends PendingOperations { + static boolean debug = false; // avoid too verbose output CompletableFuture cfText; CompletableFuture cfPing; CompletableFuture cfClose; @Test(dataProvider = "booleans") public void pendingPingTextClose(boolean last) throws Exception { - repeatable( () -> { - server = Support.notReadingServer(); - server.open(); - webSocket = newBuilder().proxy(NO_PROXY).build().newWebSocketBuilder() - .buildAsync(server.getURI(), new WebSocket.Listener() { }) - .join(); - ByteBuffer data = ByteBuffer.allocate(125); - for (int i = 0; ; i++) { // fill up the send buffer - long start = System.currentTimeMillis(); - System.out.printf("begin cycle #%s at %s%n", i, start); - cfPing = webSocket.sendPing(data); - try { - cfPing.get(MAX_WAIT_SEC, TimeUnit.SECONDS); - data.clear(); - } catch (TimeoutException e) { - break; - } finally { - long stop = System.currentTimeMillis(); - System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start); + try { + repeatable(() -> { + server = Support.notReadingServer(); + server.open(); + webSocket = newBuilder().proxy(NO_PROXY).build().newWebSocketBuilder() + .buildAsync(server.getURI(), new WebSocket.Listener() { + }) + .join(); + ByteBuffer data = ByteBuffer.allocate(125); + boolean done = false; + for (int i = 0; ; i++) { // fill up the send buffer + long start = System.currentTimeMillis(); + if (debug) System.out.printf("begin cycle #%s at %s%n", i, start); + cfPing = webSocket.sendPing(data); + try { + cfPing.get(MAX_WAIT_SEC, TimeUnit.SECONDS); + data.clear(); + } catch (TimeoutException e) { + done = true; + System.out.printf("Got expected timeout after %d iterations%n", i); + break; + } finally { + long stop = System.currentTimeMillis(); + if (debug || done || (stop - start) > (MAX_WAIT_SEC * 1000L)/2L) + System.out.printf("end cycle #%s at %s (%s ms)%n", i, stop, stop - start); + } } - } - assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125))); - assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125))); - cfText = webSocket.sendText("hello", last); - assertHangs(cfText); - cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); - assertHangs(cfClose); - return null; - }, () -> cfPing.isDone() ? true : false); - webSocket.abort(); - assertFails(IOE, cfPing); - assertFails(IOE, cfText); - assertFails(IOE, cfClose); + assertFails(ISE, webSocket.sendPing(ByteBuffer.allocate(125))); + assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125))); + System.out.println("asserting that sendText hangs"); + cfText = webSocket.sendText("hello", last); + assertHangs(cfText); + System.out.println("asserting that sendClose hangs"); + cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); + assertHangs(cfClose); + System.out.println("asserting that cfPing is not completed"); + assertNotDone(cfPing); + System.out.println("finishing"); + return null; + }, () -> cfPing.isDone()); // can't use method ref: cfPing not initialized + webSocket.abort(); + assertFails(IOE, cfPing); + assertFails(IOE, cfText); + assertFails(IOE, cfClose); + } catch (Throwable t) { + System.err.printf("pendingPingTextClose(%s) failed: %s%n", last, t); + t.printStackTrace(); + throw t; + } } } diff --git a/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java b/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java index e715a83b7e9..21cd4c9c765 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingPongBinaryClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -77,8 +77,9 @@ public class PendingPongBinaryClose extends PendingOperations { assertHangs(cfBinary); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfPong); return null; - }, () -> cfPong.isDone() ? true : false); + }, () -> cfPong.isDone()); webSocket.abort(); assertFails(IOE, cfPong); assertFails(IOE, cfBinary); diff --git a/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java b/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java index fddec8da4c1..19a7dac9cd6 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingPongTextClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -79,8 +79,9 @@ public class PendingPongTextClose extends PendingOperations { assertHangs(cfText); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfPong); return null; - }, () -> cfPong.isDone() ? true : false); + }, () -> cfPong.isDone()); webSocket.abort(); assertFails(IOE, cfPong); assertFails(IOE, cfText); diff --git a/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java b/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java index c5fc62e018a..e529bc277ae 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingTextPingClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -80,8 +80,9 @@ public class PendingTextPingClose extends PendingOperations { assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125))); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfText); return null; - }, () -> cfText.isDone() ? true : false); + }, () -> cfText.isDone()); webSocket.abort(); assertFails(IOE, cfText); assertFails(IOE, cfPing); diff --git a/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java b/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java index e688d42125e..e16b844f699 100644 --- a/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java +++ b/test/jdk/java/net/httpclient/websocket/PendingTextPongClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -80,8 +80,9 @@ public class PendingTextPongClose extends PendingOperations { assertFails(ISE, webSocket.sendPong(ByteBuffer.allocate(125))); cfClose = webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok"); assertHangs(cfClose); + assertNotDone(cfText); return null; - }, () -> cfText.isDone() ? true : false); + }, () -> cfText.isDone()); webSocket.abort(); assertFails(IOE, cfText); assertFails(IOE, cfPong); diff --git a/test/jdk/java/net/httpclient/websocket/Support.java b/test/jdk/java/net/httpclient/websocket/Support.java index ca847c26cea..9f7f5c43578 100644 --- a/test/jdk/java/net/httpclient/websocket/Support.java +++ b/test/jdk/java/net/httpclient/websocket/Support.java @@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static org.testng.Assert.assertThrows; +import static org.testng.Assert.assertFalse; public class Support { @@ -43,6 +44,10 @@ public class Support { Support.assertCompletesExceptionally(clazz, stage); } + public static void assertNotDone(CompletableFuture future) { + assertFalse(future.isDone()); + } + public static void assertCompletesExceptionally(Class clazz, CompletionStage stage) { CompletableFuture cf = From 77c46ea9112b0c2632b4af1d899d59a132878da3 Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Fri, 7 Aug 2020 16:16:45 +0100 Subject: [PATCH 025/100] 8229822: ThrowingPushPromises tests sometimes fail due to EOF SocketTube is fixed to cater for errors caused by pausing/resuming events on an asynchronously closed connection, from within the selector's manager thread. Http2Connection and Stream are fixed to prevent sending a DataFrame on a stream after Reset has been sent. Reviewed-by: chegar --- .../internal/net/http/Http2Connection.java | 44 ++++-- .../jdk/internal/net/http/SocketTube.java | 13 +- .../classes/jdk/internal/net/http/Stream.java | 134 +++++++++++++++--- ...rowingPushPromisesAsInputStreamCustom.java | 1 + .../ThrowingPushPromisesAsInputStreamIO.java | 1 + .../ThrowingPushPromisesAsLinesCustom.java | 1 + .../ThrowingPushPromisesAsLinesIO.java | 1 + .../ThrowingPushPromisesAsStringCustom.java | 1 + .../ThrowingPushPromisesAsStringIO.java | 1 + .../ThrowingPushPromisesSanity.java | 1 + 10 files changed, 169 insertions(+), 29 deletions(-) diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java index 004ca5656a8..f7e6117c7c0 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java @@ -329,7 +329,11 @@ class Http2Connection { Log.logTrace("Connection send window size {0} ", windowController.connectionWindowSize()); Stream initialStream = createStream(exchange); - initialStream.registerStream(1); + boolean opened = initialStream.registerStream(1, true); + if (debug.on() && !opened) { + debug.log("Initial stream was cancelled - but connection is maintained: " + + "reset frame will need to be sent later"); + } windowController.registerStream(1, getInitialSendWindowSize()); initialStream.requestSent(); // Upgrading: @@ -338,6 +342,11 @@ class Http2Connection { this.initial = initial; connectFlows(connection); sendConnectionPreface(); + if (!opened) { + debug.log("ensure reset frame is sent to cancel initial stream"); + initialStream.sendCancelStreamFrame(); + } + } // Used when upgrading an HTTP/1.1 connection to HTTP/2 after receiving @@ -849,7 +858,7 @@ class Http2Connection { Exchange pushExch = new Exchange<>(pushReq, parent.exchange.multi); Stream.PushedStream pushStream = createPushStream(parent, pushExch); pushExch.exchImpl = pushStream; - pushStream.registerStream(promisedStreamid); + pushStream.registerStream(promisedStreamid, true); parent.incoming_pushPromise(pushReq, pushStream); } @@ -874,7 +883,7 @@ class Http2Connection { } } - void resetStream(int streamid, int code) throws IOException { + void resetStream(int streamid, int code) { try { if (connection.channel().isOpen()) { // no need to try & send a reset frame if the @@ -882,6 +891,7 @@ class Http2Connection { Log.logError( "Resetting stream {0,number,integer} with error code {1,number,integer}", streamid, code); + markStream(streamid, code); ResetFrame frame = new ResetFrame(streamid, code); sendFrame(frame); } else if (debug.on()) { @@ -894,6 +904,11 @@ class Http2Connection { } } + private void markStream(int streamid, int code) { + Stream s = streams.get(streamid); + if (s != null) s.markStream(code); + } + // reduce count of streams by 1 if stream still exists synchronized void decrementStreamsCount(int streamid) { Stream s = streams.get(streamid); @@ -1192,12 +1207,19 @@ class Http2Connection { Stream stream = oh.getAttachment(); assert stream.streamid == 0; int streamid = nextstreamid; - nextstreamid += 2; - stream.registerStream(streamid); - // set outgoing window here. This allows thread sending - // body to proceed. - windowController.registerStream(streamid, getInitialSendWindowSize()); - return stream; + if (stream.registerStream(streamid, false)) { + // set outgoing window here. This allows thread sending + // body to proceed. + nextstreamid += 2; + windowController.registerStream(streamid, getInitialSendWindowSize()); + return stream; + } else { + stream.cancelImpl(new IOException("Request cancelled")); + if (finalStream() && streams.isEmpty()) { + close(); + } + return null; + } } private final Object sendlock = new Object(); @@ -1211,7 +1233,9 @@ class Http2Connection { OutgoingHeaders> oh = (OutgoingHeaders>) frame; Stream stream = registerNewStream(oh); // provide protection from inserting unordered frames between Headers and Continuation - publisher.enqueue(encodeHeaders(oh, stream)); + if (stream != null) { + publisher.enqueue(encodeHeaders(oh, stream)); + } } else { publisher.enqueue(encodeFrame(frame)); } diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java b/src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java index 666251da6ab..2ff82bb6a91 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/SocketTube.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -246,7 +246,7 @@ final class SocketTube implements FlowTube { } @Override public final void abort(IOException error) { - debug().log(() -> "abort: " + error); + debug().log(() -> this.getClass().getSimpleName() + " abort: " + error); pause(); // pause, then signal signalError(error); // should not be resumed after abort (not checked) } @@ -724,10 +724,12 @@ final class SocketTube implements FlowTube { @Override public final void cancel() { pauseReadEvent(); + if (debug.on()) debug.log("Read subscription cancelled"); if (Log.channel()) { Log.logChannel("Read subscription cancelled for channel {0}", channelDescr()); } + if (debug.on()) debug.log("Stopping read scheduler"); readScheduler.stop(); } @@ -748,6 +750,7 @@ final class SocketTube implements FlowTube { } final void signalError(Throwable error) { + if (debug.on()) debug.log("signal read error: " + error); if (!errorRef.compareAndSet(null, error)) { return; } @@ -808,6 +811,7 @@ final class SocketTube implements FlowTube { } current.errorRef.compareAndSet(null, error); current.signalCompletion(); + if (debug.on()) debug.log("Stopping read scheduler"); readScheduler.stop(); debugState("leaving read() loop with error: "); return; @@ -831,6 +835,7 @@ final class SocketTube implements FlowTube { // anyway. pauseReadEvent(); current.signalCompletion(); + if (debug.on()) debug.log("Stopping read scheduler"); readScheduler.stop(); } debugState("leaving read() loop after EOF: "); @@ -850,6 +855,7 @@ final class SocketTube implements FlowTube { // waiting for this event to terminate. // So resume the read event and return now... resumeReadEvent(); + if (errorRef.get() != null) continue; debugState("leaving read() loop after onNext: "); return; } else { @@ -861,6 +867,7 @@ final class SocketTube implements FlowTube { // readable again. demand.increase(1); resumeReadEvent(); + if (errorRef.get() != null) continue; debugState("leaving read() loop with no bytes"); return; } @@ -879,6 +886,7 @@ final class SocketTube implements FlowTube { // Trying to pause the event here would actually // introduce a race condition between this loop and // request(n). + if (errorRef.get() != null) continue; debugState("leaving read() loop with no demand"); break; } @@ -946,6 +954,7 @@ final class SocketTube implements FlowTube { @Override protected final void signalError(Throwable error) { + if (debug.on()) debug.log("signalError to %s (%s)", sub, error); sub.signalError(error); } diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java index b65294a8367..0fafa0dba5b 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java @@ -28,6 +28,8 @@ package jdk.internal.net.http; import java.io.EOFException; import java.io.IOException; import java.io.UncheckedIOException; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.VarHandle; import java.net.URI; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -133,12 +135,18 @@ class Stream extends ExchangeImpl { private volatile boolean remotelyClosed; private volatile boolean closed; private volatile boolean endStreamSent; - - final AtomicBoolean deRegistered = new AtomicBoolean(false); + // Indicates the first reason that was invoked when sending a ResetFrame + // to the server. A streamState of 0 indicates that no reset was sent. + // (see markStream(int code) + private volatile int streamState; // assigned using STREAM_STATE varhandle. + private volatile boolean deRegistered; // assigned using DEREGISTERED varhandle. // state flags private boolean requestSent, responseReceived; + // send lock: prevent sending DataFrames after reset occurred. + private final Object sendLock = new Object(); + /** * A reference to this Stream's connection Send Window controller. The * stream MUST acquire the appropriate amount of Send Window before @@ -292,7 +300,7 @@ class Stream extends ExchangeImpl { } boolean deRegister() { - return deRegistered.compareAndSet(false, true); + return DEREGISTERED.compareAndSet(this, false, true); } @Override @@ -338,6 +346,36 @@ class Stream extends ExchangeImpl { sched.runOrSchedule(); } + /** + * Records the first reason which was invoked when sending a ResetFrame + * to the server in the streamState, and return the previous value + * of the streamState. This is an atomic operation. + * A possible use of this method would be to send a ResetFrame only + * if no previous reset frame has been sent. + * For instance: 

    {@code
+     *  if (markStream(ResetFrame.CANCEL) == 0) {
+     *      connection.sendResetFrame(streamId, ResetFrame.CANCEL);
+     *  }
+     *  }
    + * @param code the reason code as per HTTP/2 protocol + * @return the previous value of the stream state. + */ + int markStream(int code) { + if (code == 0) return streamState; + synchronized (sendLock) { + return (int) STREAM_STATE.compareAndExchange(this, 0, code); + } + } + + private void sendDataFrame(DataFrame frame) { + synchronized (sendLock) { + // must not send DataFrame after reset. + if (streamState == 0) { + connection.sendDataFrame(frame); + } + } + } + // pushes entire response body into response subscriber // blocking when required by local or remote flow control CompletableFuture receiveData(BodySubscriber bodySubscriber, Executor executor) { @@ -384,6 +422,7 @@ class Stream extends ExchangeImpl { */ void incoming(Http2Frame frame) throws IOException { if (debug.on()) debug.log("incoming: %s", frame); + var cancelled = closed || streamState != 0; if ((frame instanceof HeaderFrame)) { HeaderFrame hframe = (HeaderFrame)frame; if (hframe.endHeaders()) { @@ -395,9 +434,10 @@ class Stream extends ExchangeImpl { receiveDataFrame(new DataFrame(streamid, DataFrame.END_STREAM, List.of())); } } else if (frame instanceof DataFrame) { - receiveDataFrame((DataFrame)frame); + if (cancelled) connection.dropDataFrame((DataFrame) frame); + else receiveDataFrame((DataFrame) frame); } else { - otherFrame(frame); + if (!cancelled) otherFrame(frame); } } @@ -720,6 +760,16 @@ class Stream extends ExchangeImpl { } else { requestContentLen = 0; } + + // At this point the stream doesn't have a streamid yet. + // It will be allocated if we send the request headers. + Throwable t = errorRef.get(); + if (t != null) { + if (debug.on()) debug.log("stream already cancelled, headers not sent: %s", (Object)t); + return MinimalFuture.failedFuture(t); + } + + // sending the headers will cause the allocation of the stream id OutgoingHeaders> f = headerFrame(requestContentLen); connection.sendFrame(f); CompletableFuture> cf = new MinimalFuture<>(); @@ -745,10 +795,17 @@ class Stream extends ExchangeImpl { // been already closed (or will be closed shortly after). } - void registerStream(int id) { - this.streamid = id; - connection.putStream(this, streamid); - if (debug.on()) debug.log("Registered stream %d", id); + boolean registerStream(int id, boolean registerIfCancelled) { + boolean cancelled = closed; + if (!cancelled || registerIfCancelled) { + this.streamid = id; + connection.putStream(this, streamid); + if (debug.on()) { + debug.log("Stream %d registered (cancelled: %b, registerIfCancelled: %b)", + streamid, cancelled, registerIfCancelled); + } + } + return !cancelled; } void signalWindowUpdate() { @@ -853,6 +910,7 @@ class Stream extends ExchangeImpl { cancelImpl(t); return; } + int state = streamState; do { // handle COMPLETED; @@ -865,7 +923,7 @@ class Stream extends ExchangeImpl { } // handle bytes to send downstream - while (item.hasRemaining()) { + while (item.hasRemaining() && state == 0) { if (debug.on()) debug.log("trySend: %d", item.remaining()); assert !endStreamSent : "internal error, send data after END_STREAM flag"; DataFrame df = getDataFrame(item); @@ -884,6 +942,7 @@ class Stream extends ExchangeImpl { + "Too many bytes in request body. Expected: " + contentLength + ", got: " + (contentLength - remainingContentLength); + assert streamid > 0; connection.resetStream(streamid, ResetFrame.PROTOCOL_ERROR); throw new IOException(msg); } else if (remainingContentLength == 0) { @@ -891,15 +950,26 @@ class Stream extends ExchangeImpl { endStreamSent = true; } } + if ((state = streamState) != 0) { + if (debug.on()) debug.log("trySend: cancelled: %s", String.valueOf(t)); + break; + } if (debug.on()) debug.log("trySend: sending: %d", df.getDataLength()); - connection.sendDataFrame(df); + sendDataFrame(df); } + if (state != 0) break; assert !item.hasRemaining(); ByteBuffer b = outgoing.removeFirst(); assert b == item; } while (outgoing.peekFirst() != null); + if (state != 0) { + t = errorRef.get(); + if (t == null) t = new IOException(ResetFrame.stringForCode(streamState)); + throw t; + } + if (debug.on()) debug.log("trySend: request 1"); subscription.request(1); } catch (Throwable ex) { @@ -1102,7 +1172,11 @@ class Stream extends ExchangeImpl { @Override void cancel() { - cancel(new IOException("Stream " + streamid + " cancelled")); + if ((streamid == 0)) { + cancel(new IOException("Stream cancelled before streamid assigned")); + } else { + cancel(new IOException("Stream " + streamid + " cancelled")); + } } void onSubscriptionError(Throwable t) { @@ -1135,9 +1209,13 @@ class Stream extends ExchangeImpl { // This method sends a RST_STREAM frame void cancelImpl(Throwable e) { errorRef.compareAndSet(null, e); - if (debug.on()) debug.log("cancelling stream {0}: {1}", streamid, e); + if (debug.on()) { + if (streamid == 0) debug.log("cancelling stream: %s", (Object)e); + else debug.log("cancelling stream %d: %s", streamid, e); + } if (Log.trace()) { - Log.logTrace("cancelling stream {0}: {1}\n", streamid, e); + if (streamid == 0) Log.logTrace("cancelling stream: {0}\n", e); + else Log.logTrace("cancelling stream {0}: {1}\n", streamid, e); } boolean closing; if (closing = !closed) { // assigning closing to !closed @@ -1160,14 +1238,15 @@ class Stream extends ExchangeImpl { } try { // will send a RST_STREAM frame - if (streamid != 0) { - connection.decrementStreamsCount(streamid); + if (streamid != 0 && streamState == 0) { e = Utils.getCompletionCause(e); if (e instanceof EOFException) { // read EOF: no need to try & send reset + connection.decrementStreamsCount(streamid); connection.closeStream(streamid); } else { - connection.resetStream(streamid, ResetFrame.CANCEL); + // no use to send CANCEL if already closed. + sendCancelStreamFrame(); } } } catch (Throwable ex) { @@ -1175,6 +1254,14 @@ class Stream extends ExchangeImpl { } } + void sendCancelStreamFrame() { + // do not reset a stream until it has a streamid. + if (streamid > 0 && markStream(ResetFrame.CANCEL) == 0) { + connection.resetStream(streamid, ResetFrame.CANCEL); + } + close(); + } + // This method doesn't send any frame void close() { if (closed) return; @@ -1390,4 +1477,17 @@ class Stream extends ExchangeImpl { } } } + + private static final VarHandle STREAM_STATE; + private static final VarHandle DEREGISTERED; + static { + try { + STREAM_STATE = MethodHandles.lookup() + .findVarHandle(Stream.class, "streamState", int.class); + DEREGISTERED = MethodHandles.lookup() + .findVarHandle(Stream.class, "deRegistered", boolean.class); + } catch (Exception x) { + throw new ExceptionInInitializerError(x); + } + } } diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java index c3801a0c429..95671d6a3ff 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java index f11c31421a1..7f22bdf4961 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java index 847bc382838..e17a72a21dc 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java index 7b7ffab49a2..678a58530c1 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java index eb6f2a7c8f9..be94c2fa4ff 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java index 24d38f1a6df..a7120964869 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java index b2ffd374d2e..d064c322599 100644 --- a/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java +++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java @@ -23,6 +23,7 @@ /* * @test + * @bug 8229822 * @summary Tests what happens when push promise handlers and their * response body handlers and subscribers throw unexpected exceptions. * @library /test/lib http2/server From e800cc2d2dd3c1290754c6e2c305976afec095ff Mon Sep 17 00:00:00 2001 From: Andy Herrick Date: Fri, 7 Aug 2020 11:42:42 -0400 Subject: [PATCH 026/100] 8251184: File association without description causes exception Reviewed-by: asemenyuk, almatvee --- .../incubator/jpackage/internal/FileAssociation.java | 10 +++++++--- .../jpackage/internal/StandardBundlerParam.java | 4 ++-- .../helpers/jdk/jpackage/test/FileAssociations.java | 6 ++++-- .../tools/jpackage/share/FileAssociationsTest.java | 11 +++++++++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java index 20d9ed9c121..b4b9be9f150 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java +++ b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java @@ -79,11 +79,15 @@ final class FileAssociation { FileAssociation assoc = new FileAssociation(); assoc.launcherPath = Path.of(launcherName); - assoc.description = FA_DESCRIPTION.fetchFrom(fa); + assoc.description = Optional.ofNullable( + FA_DESCRIPTION.fetchFrom(fa)) + .orElse(launcherName + " association"); assoc.extensions = Optional.ofNullable( - FA_EXTENSIONS.fetchFrom(fa)).orElse(Collections.emptyList()); + FA_EXTENSIONS.fetchFrom(fa)) + .orElse(Collections.emptyList()); assoc.mimeTypes = Optional.ofNullable( - FA_CONTENT_TYPE.fetchFrom(fa)).orElse(Collections.emptyList()); + FA_CONTENT_TYPE.fetchFrom(fa)) + .orElse(Collections.emptyList()); Path icon = FA_ICON.fetchFrom(fa); if (icon != null) { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java index d36b08baafa..173e5183f94 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java +++ b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java @@ -338,8 +338,8 @@ class StandardBundlerParam extends BundlerParamInfo { new StandardBundlerParam<>( "fileAssociation.description", String.class, - params -> APP_NAME.fetchFrom(params) + " Path", - null + p -> null, + (s, p) -> s ); static final StandardBundlerParam FA_ICON = diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java index 91fefc91c06..732cbb9240f 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java @@ -38,9 +38,11 @@ final public class FileAssociations { private void createFile() { Map entries = new HashMap<>(Map.of( "extension", suffixName, - "mime-type", getMime(), - "description", description + "mime-type", getMime() )); + if (description != null) { + entries.put("description", description); + } if (icon != null) { if (TKit.isWindows()) { entries.put("icon", icon.toString().replace("\\", "/")); diff --git a/test/jdk/tools/jpackage/share/FileAssociationsTest.java b/test/jdk/tools/jpackage/share/FileAssociationsTest.java index 0b0a97c057b..fcad5e7d15d 100644 --- a/test/jdk/tools/jpackage/share/FileAssociationsTest.java +++ b/test/jdk/tools/jpackage/share/FileAssociationsTest.java @@ -29,6 +29,7 @@ import jdk.jpackage.test.PackageTest; import jdk.jpackage.test.PackageType; import jdk.jpackage.test.FileAssociations; import jdk.jpackage.test.Annotations.Test; +import jdk.jpackage.test.Annotations.Parameter; /** * Test --file-associations parameter. Output of the test should be @@ -81,13 +82,19 @@ import jdk.jpackage.test.Annotations.Test; public class FileAssociationsTest { @Test - public static void test() { + @Parameter("true") + @Parameter("false") + public static void test(boolean includeDescription) { PackageTest packageTest = new PackageTest(); // Not supported packageTest.excludeTypes(PackageType.MAC_DMG); - new FileAssociations("jptest1").applyTo(packageTest); + FileAssociations fa = new FileAssociations("jptest1"); + if (!includeDescription) { + fa.setDescription(null); + } + fa.applyTo(packageTest); Path icon = TKit.TEST_SRC_ROOT.resolve(Path.of("resources", "icon" + TKit.ICON_SUFFIX)); From 1ad165941313bbaa9e886946081c321f35374f6e Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Fri, 7 Aug 2020 10:16:19 -0700 Subject: [PATCH 027/100] 8251260: two MD5 tests fail "RuntimeException: Unexpected count of intrinsic" Do not run intrinsics/sha/sanity tests with AOTed java.base Reviewed-by: vlivanov --- test/hotspot/jtreg/ProblemList-aot.txt | 7 ------- .../compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java | 3 +++ .../intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java | 3 +++ .../compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java | 3 +++ .../sha/sanity/TestSHA1MultiBlockIntrinsics.java | 3 +++ .../intrinsics/sha/sanity/TestSHA256Intrinsics.java | 3 +++ .../sha/sanity/TestSHA256MultiBlockIntrinsics.java | 3 +++ .../intrinsics/sha/sanity/TestSHA512Intrinsics.java | 3 +++ .../sha/sanity/TestSHA512MultiBlockIntrinsics.java | 3 +++ 9 files changed, 24 insertions(+), 7 deletions(-) diff --git a/test/hotspot/jtreg/ProblemList-aot.txt b/test/hotspot/jtreg/ProblemList-aot.txt index e584c647175..8e05a74457d 100644 --- a/test/hotspot/jtreg/ProblemList-aot.txt +++ b/test/hotspot/jtreg/ProblemList-aot.txt @@ -78,12 +78,5 @@ serviceability/sa/TestRevPtrsForInvokeDynamic.java 8216181 generic-all serviceability/sa/TestType.java 8216181 generic-all serviceability/sa/TestUniverse.java 8216181 generic-all -compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java 8167430 generic-all -compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java 8167430 generic-all -compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java 8167430 generic-all -compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java 8167430 generic-all -compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java 8167430 generic-all -compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java 8167430 generic-all - vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSiteFreq/Test.java 8226689 generic-all vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSiteFreq/Test.java 8226689 generic-all diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java index 4c712b1afdc..e75a875d666 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that MD5 intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java index bbce5531d71..e3be4116368 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that MD5 multi block intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java index 04963960d95..786881dd9f8 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that SHA-1 intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java index 7c239bbc641..7300d28f9b6 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that SHA-1 multi block intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java index cfca8fa1e13..6dbb686e61a 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that SHA-256 intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java index cdaaf049adb..1fe5160e84f 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that SHA-256 multi block intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java index 42427c0c6ea..bc9f001f8f8 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that SHA-512 intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java index 7521337b222..c825512c489 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java @@ -25,6 +25,9 @@ * @test * @bug 8035968 * @summary Verify that SHA-512 multi block intrinsic is actually used. + * @comment the test verifies compilation of java.base methods, so it can't be run w/ AOT'ed java.base + * @requires !vm.aot.enabled + * * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management From 9852a6f75c1449392b46e64db5f9913e8bdef50e Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Fri, 7 Aug 2020 19:23:53 +0200 Subject: [PATCH 028/100] 8248401: Refactor/unify RMI gc support functionality Move recent timestamp of most recent whole heap liveness analysis into CollectedHeap, removing the duplicates in all collectors Reviewed-by: kbarrett, ayang, stefank --- src/hotspot/share/gc/epsilon/epsilonHeap.hpp | 5 --- src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 25 ++++++-------- src/hotspot/share/gc/g1/g1CollectedHeap.hpp | 10 ++++-- .../share/gc/g1/g1ConcurrentMarkThread.cpp | 3 +- src/hotspot/share/gc/g1/g1Policy.cpp | 3 -- src/hotspot/share/gc/g1/g1Policy.hpp | 4 --- .../gc/g1/g1YoungRemSetSamplingThread.cpp | 5 +-- .../gc/parallel/parallelScavengeHeap.cpp | 4 --- .../gc/parallel/parallelScavengeHeap.hpp | 2 -- .../share/gc/parallel/psParallelCompact.cpp | 24 ++----------- .../share/gc/parallel/psParallelCompact.hpp | 7 ---- .../share/gc/serial/defNewGeneration.cpp | 6 ---- src/hotspot/share/gc/serial/genMarkSweep.cpp | 9 ++--- src/hotspot/share/gc/shared/collectedHeap.cpp | 9 +++++ src/hotspot/share/gc/shared/collectedHeap.hpp | 19 ++++++++--- .../share/gc/shared/genCollectedHeap.cpp | 34 ------------------- .../share/gc/shared/genCollectedHeap.hpp | 10 ------ src/hotspot/share/gc/shared/generation.hpp | 20 ----------- .../gc/shenandoah/shenandoahControlThread.cpp | 3 ++ .../share/gc/shenandoah/shenandoahHeap.cpp | 6 ---- .../share/gc/shenandoah/shenandoahHeap.hpp | 3 -- src/hotspot/share/gc/z/zCollectedHeap.cpp | 4 --- src/hotspot/share/gc/z/zCollectedHeap.hpp | 2 -- src/hotspot/share/gc/z/zDriver.cpp | 3 ++ src/hotspot/share/prims/jvm.cpp | 2 +- 25 files changed, 56 insertions(+), 166 deletions(-) diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp index 8cf9c97187a..f08c67a3c89 100644 --- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp @@ -129,11 +129,6 @@ public: virtual void prepare_for_verify() {} virtual void verify(VerifyOption option) {} - virtual jlong millis_since_last_gc() { - // Report time since the VM start - return os::elapsed_counter() / NANOSECS_PER_MILLISEC; - } - MemRegion reserved_region() const { return _reserved; } bool is_in_reserved(const void* addr) const { return _reserved.contains(addr); } diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp index 87f290fa609..d97463c406f 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp @@ -1417,6 +1417,7 @@ G1CollectedHeap::G1CollectedHeap() : _young_gen_sampling_thread(NULL), _workers(NULL), _card_table(NULL), + _collection_pause_end(Ticks::now()), _soft_ref_policy(), _old_set("Old Region Set", new OldRegionSetChecker()), _archive_set("Archive Region Set", new ArchiveRegionSetChecker()), @@ -1966,7 +1967,8 @@ void G1CollectedHeap::increment_old_marking_cycles_started() { _old_marking_cycles_started++; } -void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent) { +void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent, + bool whole_heap_examined) { MonitorLocker ml(G1OldGCCount_lock, Mutex::_no_safepoint_check_flag); // We assume that if concurrent == true, then the caller is a @@ -1998,6 +2000,10 @@ void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent) { _old_marking_cycles_started, _old_marking_cycles_completed); _old_marking_cycles_completed += 1; + if (whole_heap_examined) { + // Signal that we have completed a visit to all live objects. + record_whole_heap_examined_timestamp(); + } // We need to clear the "in_progress" flag in the CM thread before // we wake up any waiters (especially when ExplicitInvokesConcurrent @@ -2366,19 +2372,6 @@ size_t G1CollectedHeap::max_reserved_capacity() const { return _hrm->max_length() * HeapRegion::GrainBytes; } -jlong G1CollectedHeap::millis_since_last_gc() { - // See the notes in GenCollectedHeap::millis_since_last_gc() - // for more information about the implementation. - jlong ret_val = (os::javaTimeNanos() / NANOSECS_PER_MILLISEC) - - _policy->collection_pause_end_millis(); - if (ret_val < 0) { - log_warning(gc)("millis_since_last_gc() would return : " JLONG_FORMAT - ". returning zero instead.", ret_val); - return 0; - } - return ret_val; -} - void G1CollectedHeap::deduplicate_string(oop str) { assert(java_lang_String::is_instance(str), "invariant"); @@ -2641,7 +2634,7 @@ void G1CollectedHeap::gc_epilogue(bool full) { // Update common counters. if (full) { // Update the number of full collections that have been completed. - increment_old_marking_cycles_completed(false /* concurrent */); + increment_old_marking_cycles_completed(false /* concurrent */, true /* liveness_completed */); } // We are at the end of the GC. Total collections has already been increased. @@ -2665,6 +2658,8 @@ void G1CollectedHeap::gc_epilogue(bool full) { // Print NUMA statistics. _numa->print_statistics(); + + _collection_pause_end = Ticks::now(); } void G1CollectedHeap::verify_numa_regions(const char* desc) { diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp index 84874367a7c..7aeb775df4d 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp @@ -159,6 +159,8 @@ private: WorkGang* _workers; G1CardTable* _card_table; + Ticks _collection_pause_end; + SoftRefPolicy _soft_ref_policy; static size_t _humongous_object_threshold_in_words; @@ -644,7 +646,10 @@ public: // the G1OldGCCount_lock in case a Java thread is waiting for a full // GC to happen (e.g., it called System.gc() with // +ExplicitGCInvokesConcurrent). - void increment_old_marking_cycles_completed(bool concurrent); + // whole_heap_examined should indicate that during that old marking + // cycle the whole heap has been examined for live objects (as opposed + // to only parts, or aborted before completion). + void increment_old_marking_cycles_completed(bool concurrent, bool whole_heap_examined); uint old_marking_cycles_completed() { return _old_marking_cycles_completed; @@ -1288,8 +1293,7 @@ public: // Return the size of reserved memory. Returns different value than max_capacity() when AllocateOldGenAt is used. virtual size_t max_reserved_capacity() const; - virtual jlong millis_since_last_gc(); - + Tickspan time_since_last_collection() const { return Ticks::now() - _collection_pause_end; } // Convenience function to be used in situations where the heap type can be // asserted to be this type. diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp index 445b4906e50..d297af36b07 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp @@ -268,7 +268,8 @@ void G1ConcurrentMarkThread::run_service() { // called System.gc() with +ExplicitGCInvokesConcurrent). { SuspendibleThreadSetJoiner sts_join; - g1h->increment_old_marking_cycles_completed(true /* concurrent */); + g1h->increment_old_marking_cycles_completed(true /* concurrent */, + !_cm->has_aborted() /* liveness_completed */); _cm->concurrent_cycle_end(); ConcurrentGCBreakpoints::notify_active_to_idle(); diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp index f3f1edb2dd3..083da52ad84 100644 --- a/src/hotspot/share/gc/g1/g1Policy.cpp +++ b/src/hotspot/share/gc/g1/g1Policy.cpp @@ -60,7 +60,6 @@ G1Policy::G1Policy(STWGCTimer* gc_timer) : _ihop_control(create_ihop_control(&_predictor)), _policy_counters(new GCPolicyCounters("GarbageFirst", 1, 2)), _full_collection_start_sec(0.0), - _collection_pause_end_millis(os::javaTimeNanos() / NANOSECS_PER_MILLISEC), _young_list_target_length(0), _young_list_fixed_length(0), _young_list_max_length(0), @@ -648,8 +647,6 @@ void G1Policy::record_collection_pause_end(double pause_time_ms) { record_pause(this_pause, end_time_sec - pause_time_ms / 1000.0, end_time_sec); - _collection_pause_end_millis = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; - if (is_concurrent_start_pause(this_pause)) { record_concurrent_mark_init_end(0.0); } else { diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp index 526717c569d..1f2702d641e 100644 --- a/src/hotspot/share/gc/g1/g1Policy.hpp +++ b/src/hotspot/share/gc/g1/g1Policy.hpp @@ -74,8 +74,6 @@ class G1Policy: public CHeapObj { double _full_collection_start_sec; - jlong _collection_pause_end_millis; - uint _young_list_target_length; uint _young_list_fixed_length; @@ -260,8 +258,6 @@ public: // percentage of the current heap capacity. double reclaimable_bytes_percent(size_t reclaimable_bytes) const; - jlong collection_pause_end_millis() { return _collection_pause_end_millis; } - private: void clear_collection_set_candidates(); // Sets up marking if proper conditions are met. diff --git a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp index c57f3d7ce07..5b240c26d9f 100644 --- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp +++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp @@ -56,14 +56,15 @@ void G1YoungRemSetSamplingThread::sleep_before_next_cycle() { } bool G1YoungRemSetSamplingThread::should_start_periodic_gc() { + G1CollectedHeap* g1h = G1CollectedHeap::heap(); // If we are currently in a concurrent mark we are going to uncommit memory soon. - if (G1CollectedHeap::heap()->concurrent_mark()->cm_thread()->during_cycle()) { + if (g1h->concurrent_mark()->cm_thread()->during_cycle()) { log_debug(gc, periodic)("Concurrent cycle in progress. Skipping."); return false; } // Check if enough time has passed since the last GC. - uintx time_since_last_gc = (uintx)Universe::heap()->millis_since_last_gc(); + uintx time_since_last_gc = (uintx)g1h->time_since_last_collection().milliseconds(); if ((time_since_last_gc < G1PeriodicGCInterval)) { log_debug(gc, periodic)("Last GC occurred " UINTX_FORMAT "ms before which is below threshold " UINTX_FORMAT "ms. Skipping.", time_since_last_gc, G1PeriodicGCInterval); diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp index b2645223d87..edb1ca8a2d0 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp @@ -559,10 +559,6 @@ bool ParallelScavengeHeap::block_is_obj(const HeapWord* addr) const { return block_start(addr) == addr; } -jlong ParallelScavengeHeap::millis_since_last_gc() { - return PSParallelCompact::millis_since_last_gc(); -} - void ParallelScavengeHeap::prepare_for_verify() { ensure_parsability(false); // no need to retire TLABs for verification } diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp index 34321547b7b..b470d5303f2 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp @@ -213,8 +213,6 @@ class ParallelScavengeHeap : public CollectedHeap { HeapWord* block_start(const void* addr) const; bool block_is_obj(const HeapWord* addr) const; - jlong millis_since_last_gc(); - void prepare_for_verify(); PSHeapSummary create_ps_heap_summary(); virtual void print_on(outputStream* st) const; diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index b7bb059d77f..ad50935c0c3 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -843,7 +843,6 @@ ParallelOldTracer PSParallelCompact::_gc_tracer; elapsedTimer PSParallelCompact::_accumulated_time; unsigned int PSParallelCompact::_total_invocations = 0; unsigned int PSParallelCompact::_maximum_compaction_gc_num = 0; -jlong PSParallelCompact::_time_of_last_gc = 0; CollectorCounters* PSParallelCompact::_counters = NULL; ParMarkBitMap PSParallelCompact::_mark_bitmap; ParallelCompactData PSParallelCompact::_summary_data; @@ -1070,8 +1069,8 @@ void PSParallelCompact::post_compact() heap->gen_mangle_unused_area(); } - // Update time of last GC - reset_millis_since_last_gc(); + // Signal that we have completed a visit to all live objects. + Universe::heap()->record_whole_heap_examined_timestamp(); } HeapWord* @@ -3192,25 +3191,6 @@ void PSParallelCompact::fill_blocks(size_t region_idx) } } -jlong PSParallelCompact::millis_since_last_gc() { - // We need a monotonically non-decreasing time in ms but - // os::javaTimeMillis() does not guarantee monotonicity. - jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; - jlong ret_val = now - _time_of_last_gc; - // XXX See note in genCollectedHeap::millis_since_last_gc(). - if (ret_val < 0) { - NOT_PRODUCT(log_warning(gc)("time warp: " JLONG_FORMAT, ret_val);) - return 0; - } - return ret_val; -} - -void PSParallelCompact::reset_millis_since_last_gc() { - // We need a monotonically non-decreasing time in ms but - // os::javaTimeMillis() does not guarantee monotonicity. - _time_of_last_gc = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; -} - ParMarkBitMap::IterationStatus MoveAndUpdateClosure::copy_until_full() { if (source() != copy_destination()) { diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 12443939b98..c14dffb2334 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -1009,7 +1009,6 @@ class PSParallelCompact : AllStatic { static elapsedTimer _accumulated_time; static unsigned int _total_invocations; static unsigned int _maximum_compaction_gc_num; - static jlong _time_of_last_gc; // ms static CollectorCounters* _counters; static ParMarkBitMap _mark_bitmap; static ParallelCompactData _summary_data; @@ -1123,9 +1122,6 @@ class PSParallelCompact : AllStatic { static void enqueue_dense_prefix_tasks(TaskQueue& task_queue, uint parallel_gc_threads); - // Reset time since last full gc - static void reset_millis_since_last_gc(); - #ifndef PRODUCT // Print generic summary data static void print_generic_summary_data(ParallelCompactData& summary_data, @@ -1249,9 +1245,6 @@ class PSParallelCompact : AllStatic { // Return the SpaceId for the given address. static SpaceId space_id(HeapWord* addr); - // Time since last full gc (in milliseconds). - static jlong millis_since_last_gc(); - static void print_on_error(outputStream* st); #ifndef PRODUCT diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp index 06bb7c21971..5f9a88a0900 100644 --- a/src/hotspot/share/gc/serial/defNewGeneration.cpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp @@ -680,12 +680,6 @@ void DefNewGeneration::collect(bool full, from()->set_concurrent_iteration_safe_limit(from()->top()); to()->set_concurrent_iteration_safe_limit(to()->top()); - // We need to use a monotonically non-decreasing time in ms - // or we will see time-warp warnings and os::javaTimeMillis() - // does not guarantee monotonicity. - jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; - update_time_of_last_gc(now); - heap->trace_heap_after_gc(&gc_tracer); _gc_timer->register_gc_end(); diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp index 28c5990c66e..33afe2666ee 100644 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp @@ -137,13 +137,8 @@ void GenMarkSweep::invoke_at_safepoint(ReferenceProcessor* rp, bool clear_all_so // input to soft ref clearing policy at the next gc. Universe::update_heap_info_at_gc(); - // Update time of last gc for all generations we collected - // (which currently is all the generations in the heap). - // We need to use a monotonically non-decreasing time in ms - // or we will see time-warp warnings and os::javaTimeMillis() - // does not guarantee monotonicity. - jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; - gch->update_time_of_last_gc(now); + // Signal that we have completed a visit to all live objects. + Universe::heap()->record_whole_heap_examined_timestamp(); gch->trace_heap_after_gc(_gc_tracer); } diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp index 0b7c47ea859..fedb9d3fe88 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.cpp +++ b/src/hotspot/share/gc/shared/collectedHeap.cpp @@ -191,6 +191,7 @@ bool CollectedHeap::is_oop(oop object) const { CollectedHeap::CollectedHeap() : _is_gc_active(false), + _last_whole_heap_examined_time_ns(os::javaTimeNanos()), _total_collections(0), _total_full_collections(0), _gc_cause(GCCause::_no_gc), @@ -488,6 +489,14 @@ void CollectedHeap::resize_all_tlabs() { } } +jlong CollectedHeap::millis_since_last_whole_heap_examined() { + return (os::javaTimeNanos() - _last_whole_heap_examined_time_ns) / NANOSECS_PER_MILLISEC; +} + +void CollectedHeap::record_whole_heap_examined_timestamp() { + _last_whole_heap_examined_time_ns = os::javaTimeNanos(); +} + void CollectedHeap::full_gc_dump(GCTimer* timer, bool before) { assert(timer != NULL, "timer is null"); if ((HeapDumpBeforeFullGC && before) || (HeapDumpAfterFullGC && !before)) { diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp index 71a3235ba72..b9675eb75b2 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.hpp @@ -112,6 +112,12 @@ class CollectedHeap : public CHeapObj { // Used for filler objects (static, but initialized in ctor). static size_t _filler_array_max_size; + // Last time the whole heap has been examined in support of RMI + // MaxObjectInspectionAge. + // This timestamp must be monotonically non-decreasing to avoid + // time-warp warnings. + jlong _last_whole_heap_examined_time_ns; + unsigned int _total_collections; // ... started unsigned int _total_full_collections; // ... started NOT_PRODUCT(volatile size_t _promotion_failure_alot_count;) @@ -404,15 +410,18 @@ class CollectedHeap : public CHeapObj { // Keep alive an object that was loaded with AS_NO_KEEPALIVE. virtual void keep_alive(oop obj) {} - // Returns the longest time (in ms) that has elapsed since the last - // time that any part of the heap was examined by a garbage collection. - virtual jlong millis_since_last_gc() = 0; - // Perform any cleanup actions necessary before allowing a verification. virtual void prepare_for_verify() = 0; - // Generate any dumps preceding or following a full gc + // Returns the longest time (in ms) that has elapsed since the last + // time that the whole heap has been examined by a garbage collection. + jlong millis_since_last_whole_heap_examined(); + // GC should call this when the next whole heap analysis has completed to + // satisfy above requirement. + void record_whole_heap_examined_timestamp(); + private: + // Generate any dumps preceding or following a full gc void full_gc_dump(GCTimer* timer, bool before); virtual void initialize_serviceability() = 0; diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp index 06df00ce324..da133f07d8a 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp @@ -1354,37 +1354,3 @@ oop GenCollectedHeap::handle_failed_promotion(Generation* old_gen, } return oop(result); } - -class GenTimeOfLastGCClosure: public GenCollectedHeap::GenClosure { - jlong _time; // in ms - jlong _now; // in ms - - public: - GenTimeOfLastGCClosure(jlong now) : _time(now), _now(now) { } - - jlong time() { return _time; } - - void do_generation(Generation* gen) { - _time = MIN2(_time, gen->time_of_last_gc(_now)); - } -}; - -jlong GenCollectedHeap::millis_since_last_gc() { - // javaTimeNanos() is guaranteed to be monotonically non-decreasing - // provided the underlying platform provides such a time source - // (and it is bug free). So we still have to guard against getting - // back a time later than 'now'. - jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; - GenTimeOfLastGCClosure tolgc_cl(now); - // iterate over generations getting the oldest - // time that a generation was collected - generation_iterate(&tolgc_cl, false); - - jlong retVal = now - tolgc_cl.time(); - if (retVal < 0) { - log_warning(gc)("millis_since_last_gc() would return : " JLONG_FORMAT - ". returning zero instead.", retVal); - return 0; - } - return retVal; -} diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp index af96e618544..e3ab3742fe4 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp @@ -289,10 +289,6 @@ public: // Ensure parsability: override virtual void ensure_parsability(bool retire_tlabs); - // Time in ms since the longest time a collector ran in - // in any generation. - virtual jlong millis_since_last_gc(); - // Total number of full collections completed. unsigned int total_full_collections_completed() { assert(_full_collections_completed <= _total_full_collections, @@ -305,12 +301,6 @@ public: // Update above counter, as appropriate, at the end of a concurrent GC cycle unsigned int update_full_collections_completed(unsigned int count); - // Update "time of last gc" for all generations to "now". - void update_time_of_last_gc(jlong now) { - _young_gen->update_time_of_last_gc(now); - _old_gen->update_time_of_last_gc(now); - } - // Update the gc statistics for each generation. void update_gc_stats(Generation* current_generation, bool full) { _old_gen->update_gc_stats(current_generation, full); diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp index b9ea9f60be0..196f83be83d 100644 --- a/src/hotspot/share/gc/shared/generation.hpp +++ b/src/hotspot/share/gc/shared/generation.hpp @@ -75,7 +75,6 @@ struct ScratchBlock { class Generation: public CHeapObj { friend class VMStructs; private: - jlong _time_of_last_gc; // time when last gc on this generation happened (ms) MemRegion _prev_used_region; // for collectors that want to "remember" a value for // used region at some specific point during collection. @@ -363,25 +362,6 @@ class Generation: public CHeapObj { // activity to make them parsable again. The default is to do nothing. virtual void ensure_parsability() {} - // Time (in ms) when we were last collected or now if a collection is - // in progress. - virtual jlong time_of_last_gc(jlong now) { - // Both _time_of_last_gc and now are set using a time source - // that guarantees monotonically non-decreasing values provided - // the underlying platform provides such a source. So we still - // have to guard against non-monotonicity. - NOT_PRODUCT( - if (now < _time_of_last_gc) { - log_warning(gc)("time warp: " JLONG_FORMAT " to " JLONG_FORMAT, _time_of_last_gc, now); - } - ) - return _time_of_last_gc; - } - - virtual void update_time_of_last_gc(jlong now) { - _time_of_last_gc = now; - } - // Generations may keep statistics about collection. This method // updates those statistics. current_generation is the generation // that was most recently collected. This allows the generation to diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp index dd8134a0774..c0fae236f6e 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp @@ -235,6 +235,9 @@ void ShenandoahControlThread::run_service() { // global soft refs policy, and we better report it every time heap // usage goes down. Universe::update_heap_info_at_gc(); + + // Signal that we have completed a visit to all live objects. + Universe::heap()->record_whole_heap_examined_timestamp(); } // Disable forced counters update, and update counters one more time diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp index 0a1350e524f..f5a0579d0c3 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp @@ -1193,12 +1193,6 @@ bool ShenandoahHeap::print_location(outputStream* st, void* addr) const { return BlockLocationPrinter::print_location(st, addr); } -jlong ShenandoahHeap::millis_since_last_gc() { - double v = heuristics()->time_since_last_gc() * 1000; - assert(0 <= v && v <= max_jlong, "value should fit: %f", v); - return (jlong)v; -} - void ShenandoahHeap::prepare_for_verify() { if (SafepointSynchronize::is_at_safepoint() && UseTLAB) { labs_make_parsable(); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index 41f9060b7bc..38cc96b37c7 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -556,9 +556,6 @@ public: // Keep alive an object that was loaded with AS_NO_KEEPALIVE. void keep_alive(oop obj); - // Used by RMI - jlong millis_since_last_gc(); - // ---------- Safepoint interface hooks // public: diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp index bb7734d707e..ce6b196c28b 100644 --- a/src/hotspot/share/gc/z/zCollectedHeap.cpp +++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp @@ -277,10 +277,6 @@ WorkGang* ZCollectedHeap::get_safepoint_workers() { return _runtime_workers.workers(); } -jlong ZCollectedHeap::millis_since_last_gc() { - return ZStatCycle::time_since_last() / MILLIUNITS; -} - void ZCollectedHeap::gc_threads_do(ThreadClosure* tc) const { tc->do_thread(_director); tc->do_thread(_driver); diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp index a2851e67c3a..b54c70c083d 100644 --- a/src/hotspot/share/gc/z/zCollectedHeap.hpp +++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp @@ -107,8 +107,6 @@ public: virtual WorkGang* get_safepoint_workers(); - virtual jlong millis_since_last_gc(); - virtual void gc_threads_do(ThreadClosure* tc) const; virtual VirtualSpaceSummary create_heap_space_summary(); diff --git a/src/hotspot/share/gc/z/zDriver.cpp b/src/hotspot/share/gc/z/zDriver.cpp index ee25c5ca006..5367d04c4b2 100644 --- a/src/hotspot/share/gc/z/zDriver.cpp +++ b/src/hotspot/share/gc/z/zDriver.cpp @@ -381,6 +381,9 @@ public: // Update data used by soft reference policy Universe::update_heap_info_at_gc(); + + // Signal that we have completed a visit to all live objects + Universe::heap()->record_whole_heap_examined_timestamp(); } }; diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp index 52ce0042526..f1c29aaf068 100644 --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -502,7 +502,7 @@ JVM_END JVM_LEAF(jlong, JVM_MaxObjectInspectionAge(void)) JVMWrapper("JVM_MaxObjectInspectionAge"); - return Universe::heap()->millis_since_last_gc(); + return Universe::heap()->millis_since_last_whole_heap_examined(); JVM_END From c8c4d8377a0acbe1e1059cfc0aacf416e91df0fc Mon Sep 17 00:00:00 2001 From: Patrick Concannon Date: Fri, 7 Aug 2020 20:39:10 +0100 Subject: [PATCH 029/100] 8250886: java/net/DatagramSocket/SendReceiveMaxSize.java fails in timeout SO_RCVBUF was previously set to match the SO_SNDBUF, however the kernel value for SO_RCVBUF is much larger. This mismatch caused the test to fail, and the fix removes this issue. Reviewed-by: alanb, dfuchs --- src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c | 7 ------- test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c b/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c index dc4abafcd68..7c9c5bf4693 100644 --- a/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c +++ b/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c @@ -908,13 +908,6 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env, close(fd); return; } - if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, - (char *)&arg, sizeof(arg)) < 0) { - getErrorString(errno, tmpbuf, sizeof(tmpbuf)); - JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", tmpbuf); - close(fd); - return; - } #endif /* __APPLE__ */ if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof (int)) < 0) { diff --git a/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java b/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java index 9cb7ddae866..535c4551d85 100644 --- a/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java +++ b/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8242885 + * @bug 8242885 8250886 * @summary This test verifies that on macOS, the send buffer size is configured * by default so that none of our implementations of the UDP protocol * will fail with a "packet too large" exception when trying to send a @@ -37,6 +37,7 @@ * @run testng/othervm -Djava.net.preferIPv4Stack=true SendReceiveMaxSize * @run testng/othervm -Djava.net.preferIPv6Addresses=true SendReceiveMaxSize * @run testng/othervm -Djdk.net.usePlainDatagramSocketImpl SendReceiveMaxSize + * @run testng/othervm -Djdk.net.usePlainDatagramSocketImpl -Djava.net.preferIPv4Stack=true SendReceiveMaxSize * @run testng/othervm -Djdk.net.usePlainDatagramSocketImpl -Djava.net.preferIPv6Addresses=true SendReceiveMaxSize */ From 4ac45a3b505d35ccfc1d5ebddb879e693f77e026 Mon Sep 17 00:00:00 2001 From: Raffaello Giulietti Date: Fri, 7 Aug 2020 12:58:40 -0700 Subject: [PATCH 030/100] 8245036: DataInputStream.readFully(byte[], int, int) does not throw expected IndexOutOfBoundsExceptions Reviewed-by: bpb --- .../classes/java/io/DataInputStream.java | 7 +- .../java/io/DataInputStream/ReadFully.java | 116 +++++++++++++++--- 2 files changed, 101 insertions(+), 22 deletions(-) diff --git a/src/java.base/share/classes/java/io/DataInputStream.java b/src/java.base/share/classes/java/io/DataInputStream.java index 5bd76c27466..401a9764c62 100644 --- a/src/java.base/share/classes/java/io/DataInputStream.java +++ b/src/java.base/share/classes/java/io/DataInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2020, 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,6 +25,8 @@ package java.io; +import java.util.Objects; + /** * A data input stream lets an application read primitive Java data * types from an underlying input stream in a machine-independent @@ -192,8 +194,7 @@ public class DataInputStream extends FilterInputStream implements DataInput { * @see java.io.FilterInputStream#in */ public final void readFully(byte b[], int off, int len) throws IOException { - if (len < 0) - throw new IndexOutOfBoundsException(); + Objects.checkFromIndexSize(off, len, b.length); int n = 0; while (n < len) { int count = in.read(b, off + n, len - n); diff --git a/test/jdk/java/io/DataInputStream/ReadFully.java b/test/jdk/java/io/DataInputStream/ReadFully.java index 48408ca4ffa..137655af324 100644 --- a/test/jdk/java/io/DataInputStream/ReadFully.java +++ b/test/jdk/java/io/DataInputStream/ReadFully.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, 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 @@ -22,30 +22,108 @@ */ /* @test - * @bug 4214513 - * @summary Passing a negative length argument for readFully must throw - * IndexOutOfBoundsException. + * @bug 4214513 8245036 + * @summary Passing a negative offset or length, + * or passing a combination of offset and length too big + * for readFully must throw IndexOutOfBoundsException. */ - import java.io.*; + public class ReadFully { - public static final void main(String[] args) throws Exception { - byte[] buffer = new byte[100]; + + private static final void testNegativeOffset() throws Exception { File file = new File(System.getProperty("test.src"), "ReadFully.java"); - FileInputStream in = new FileInputStream(file); - DataInputStream dis = new DataInputStream(in); - - boolean caughtException = false; - try { - dis.readFully(buffer, 0, -20); - } catch (IndexOutOfBoundsException ie) { - caughtException = true; - } finally { - dis.close(); - if (!caughtException) - throw new RuntimeException("Test failed"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, -1, buffer.length); + throw new RuntimeException("Test testNegativeOffset() failed"); + } catch (IndexOutOfBoundsException ignore) { } } + + private static final void testNegativeLength() throws Exception { + File file = new File(System.getProperty("test.src"), + "ReadFully.java"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, 0, -1); + throw new RuntimeException("Test testNegativeLength() failed"); + } catch (IndexOutOfBoundsException ignore) { + } + } + + private static final void testNegativeOffsetZeroLength() throws Exception { + File file = new File(System.getProperty("test.src"), + "ReadFully.java"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, -1, 0); + throw new RuntimeException("Test testNegativeOffsetZeroLength() failed"); + } catch (IndexOutOfBoundsException ignore) { + } + } + + private static final void testBigOffsetLength1() throws Exception { + File file = new File(System.getProperty("test.src"), + "ReadFully.java"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, 0, buffer.length + 1); + throw new RuntimeException("Test testBigOffsetLength1() failed"); + } catch (IndexOutOfBoundsException ignore) { + } + } + + private static final void testBigOffsetLength2() throws Exception { + File file = new File(System.getProperty("test.src"), + "ReadFully.java"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, 1, buffer.length); + throw new RuntimeException("Test testBigOffsetLength2() failed"); + } catch (IndexOutOfBoundsException ignore) { + } + } + + private static final void testBigOffsetLength3() throws Exception { + File file = new File(System.getProperty("test.src"), + "ReadFully.java"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, buffer.length, 1); + throw new RuntimeException("Test testBigOffsetLength3() failed"); + } catch (IndexOutOfBoundsException ignore) { + } + } + + private static final void testBigOffsetLength4() throws Exception { + File file = new File(System.getProperty("test.src"), + "ReadFully.java"); + try (FileInputStream in = new FileInputStream(file); + DataInputStream dis = new DataInputStream(in);) { + byte[] buffer = new byte[100]; + dis.readFully(buffer, buffer.length + 1, 0); + throw new RuntimeException("Test testBigOffsetLength4() failed"); + } catch (IndexOutOfBoundsException ignore) { + } + } + + public static final void main(String[] args) throws Exception { + testNegativeOffset(); + testNegativeLength(); + testNegativeOffsetZeroLength(); + testBigOffsetLength1(); + testBigOffsetLength2(); + testBigOffsetLength3(); + testBigOffsetLength4(); + } + } From 3c276ce1fec17ed0238cc977320f2c82965fc45b Mon Sep 17 00:00:00 2001 From: Evgeny Nikitin Date: Mon, 27 Jul 2020 21:17:44 +0200 Subject: [PATCH 031/100] 8067651: LevelTransitionTest.java, fix trivial methods levels logic Make test method really trivial, adjust trivial logic, make logic independent of background compilation. Reviewed-by: iignatyev, thartmann, kvn --- .../ConstantGettersTransitionsTest.java | 4 +- .../compiler/tiered/LevelTransitionTest.java | 61 ++++-------------- .../jtreg/compiler/tiered/MethodHelper.java | 64 +++++++++++++++++++ 3 files changed, 80 insertions(+), 49 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/tiered/MethodHelper.java diff --git a/test/hotspot/jtreg/compiler/tiered/ConstantGettersTransitionsTest.java b/test/hotspot/jtreg/compiler/tiered/ConstantGettersTransitionsTest.java index 6503f4d5b9b..52c466aa3f1 100644 --- a/test/hotspot/jtreg/compiler/tiered/ConstantGettersTransitionsTest.java +++ b/test/hotspot/jtreg/compiler/tiered/ConstantGettersTransitionsTest.java @@ -106,8 +106,8 @@ public class ConstantGettersTransitionsTest extends LevelTransitionTest { private ConstantGettersTestCase() { String name = "make" + this.name(); - this.executable = LevelTransitionTest.Helper.getMethod(TrivialMethods.class, name); - this.callable = LevelTransitionTest.Helper.getCallable(new TrivialMethods(), name); + this.executable = MethodHelper.getMethod(TrivialMethods.class, name); + this.callable = MethodHelper.getCallable(new TrivialMethods(), name); } /** diff --git a/test/hotspot/jtreg/compiler/tiered/LevelTransitionTest.java b/test/hotspot/jtreg/compiler/tiered/LevelTransitionTest.java index 2019f2ec0bb..c5d8e3b6258 100644 --- a/test/hotspot/jtreg/compiler/tiered/LevelTransitionTest.java +++ b/test/hotspot/jtreg/compiler/tiered/LevelTransitionTest.java @@ -23,6 +23,7 @@ /** * @test LevelTransitionTest + * @requires vm.compMode != "Xcomp" * @summary Test the correctness of compilation level transitions for different methods * @library /test/lib / * @modules java.base/jdk.internal.misc @@ -33,6 +34,7 @@ * @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:+TieredCompilation -XX:-UseCounterDecay + * -XX:-BackgroundCompilation * -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* * -XX:CompileCommand=compileonly,compiler.tiered.LevelTransitionTest$ExtendedTestCase$CompileMethodHolder::* * compiler.tiered.LevelTransitionTest @@ -42,11 +44,11 @@ package compiler.tiered; import compiler.whitebox.CompilerWhiteBoxTest; import compiler.whitebox.SimpleTestCase; +import jdk.test.lib.Platform; import jtreg.SkippedException; import java.lang.reflect.Executable; import java.lang.reflect.Method; -import java.util.Objects; import java.util.concurrent.Callable; public class LevelTransitionTest extends TieredLevelsTest { @@ -98,6 +100,7 @@ public class LevelTransitionTest extends TieredLevelsTest { int newLevel; int current = getCompLevel(); int expected = getNextLevel(current); + System.out.println("Levels, current: " + current + ", expected: " + expected); if (current == expected) { // if we are on expected level, just execute it more // to ensure that the level won't change @@ -107,9 +110,10 @@ public class LevelTransitionTest extends TieredLevelsTest { finish = true; } else { newLevel = changeCompLevel(); + System.out.printf("Method %s has been compiled to level %d. Expected level is %d%n", + method, newLevel, expected); finish = false; } - System.out.printf("Method %s is compiled on level %d. Expected level is %d%n", method, newLevel, expected); checkLevel(expected, newLevel); printInfo(); } @@ -126,8 +130,9 @@ public class LevelTransitionTest extends TieredLevelsTest { int nextLevel = currentLevel; switch (currentLevel) { case CompilerWhiteBoxTest.COMP_LEVEL_NONE: - nextLevel = isMethodProfiled ? CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION - : CompilerWhiteBoxTest.COMP_LEVEL_FULL_PROFILE; + nextLevel = isTrivial() ? CompilerWhiteBoxTest.COMP_LEVEL_SIMPLE : + isMethodProfiled ? CompilerWhiteBoxTest.COMP_LEVEL_FULL_OPTIMIZATION : + CompilerWhiteBoxTest.COMP_LEVEL_FULL_PROFILE; break; case CompilerWhiteBoxTest.COMP_LEVEL_LIMITED_PROFILE: case CompilerWhiteBoxTest.COMP_LEVEL_FULL_PROFILE: @@ -148,7 +153,7 @@ public class LevelTransitionTest extends TieredLevelsTest { return testCase == ExtendedTestCase.ACCESSOR_TEST || testCase == SimpleTestCase.METHOD_TEST || testCase == SimpleTestCase.STATIC_TEST - || (testCase == ExtendedTestCase.TRIVIAL_CODE_TEST && isMethodProfiled); + || testCase == ExtendedTestCase.TRIVIAL_CODE_TEST; } /** @@ -170,42 +175,6 @@ public class LevelTransitionTest extends TieredLevelsTest { return newLevel; } - protected static class Helper { - /** - * Gets method from a specified class using its name - * - * @param aClass type method belongs to - * @param name the name of the method - * @return {@link Method} that represents corresponding class method - */ - public static Method getMethod(Class aClass, String name) { - Method method; - try { - method = aClass.getDeclaredMethod(name); - } catch (NoSuchMethodException e) { - throw new Error("TESTBUG: Unable to get method " + name, e); - } - return method; - } - - /** - * Gets {@link Callable} that invokes given method from the given object - * - * @param object the object the specified method is invoked from - * @param name the name of the method - */ - public static Callable getCallable(Object object, String name) { - Method method = getMethod(object.getClass(), name); - return () -> { - try { - return Objects.hashCode(method.invoke(object)); - } catch (ReflectiveOperationException e) { - throw new Error("TESTBUG: Invocation failure", e); - } - }; - } - } - private static enum ExtendedTestCase implements CompilerWhiteBoxTest.TestCase { ACCESSOR_TEST("accessor"), NONTRIVIAL_METHOD_TEST("nonTrivialMethod"), @@ -230,8 +199,8 @@ public class LevelTransitionTest extends TieredLevelsTest { } private ExtendedTestCase(String methodName) { - this.executable = LevelTransitionTest.Helper.getMethod(CompileMethodHolder.class, methodName); - this.callable = LevelTransitionTest.Helper.getCallable(new CompileMethodHolder(), methodName); + this.executable = MethodHelper.getMethod(CompileMethodHolder.class, methodName); + this.callable = MethodHelper.getCallable(new CompileMethodHolder(), methodName); } private static class CompileMethodHolder { @@ -257,12 +226,10 @@ public class LevelTransitionTest extends TieredLevelsTest { } /** - * Method considered as trivial by amount of code + * Method considered as trivial by type (constant getter) */ public int trivialCode() { - int var = 0xBAAD_C0DE; - var *= field; - return var; + return 0x42; } } } diff --git a/test/hotspot/jtreg/compiler/tiered/MethodHelper.java b/test/hotspot/jtreg/compiler/tiered/MethodHelper.java new file mode 100644 index 00000000000..ee2fd570e0b --- /dev/null +++ b/test/hotspot/jtreg/compiler/tiered/MethodHelper.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler.tiered; + +import java.lang.reflect.Method; +import java.util.Objects; +import java.util.concurrent.Callable; + +public class MethodHelper { + /** + * Gets method from a specified class using its name + * + * @param aClass type method belongs to + * @param name the name of the method + * @return {@link Method} that represents corresponding class method + */ + public static Method getMethod(Class aClass, String name) { + Method method; + try { + method = aClass.getDeclaredMethod(name); + } catch (NoSuchMethodException e) { + throw new Error("TESTBUG: Unable to get method " + name, e); + } + return method; + } + + /** + * Gets {@link Callable} that invokes given method from the given object + * + * @param object the object the specified method is invoked from + * @param name the name of the method + */ + public static Callable getCallable(Object object, String name) { + Method method = getMethod(object.getClass(), name); + return () -> { + try { + return Objects.hashCode(method.invoke(object)); + } catch (ReflectiveOperationException e) { + throw new Error("TESTBUG: Invocation failure", e); + } + }; + } +} From 7efa6090e81cc1c105cd1b44e81e7f4168eb50b4 Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Wed, 29 Jul 2020 18:24:00 -0700 Subject: [PATCH 032/100] Added tag jdk-15+34 for changeset b0817631d2f4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c1ea965a6e2..312324e8778 100644 --- a/.hgtags +++ b/.hgtags @@ -648,3 +648,4 @@ b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29 a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31 2dad000726b8d5db9f3df647fb4949d88f269dd4 jdk-15+32 6b65f4e7a975628df51ef755b02642075390041d jdk-15+33 +b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34 From 11a8c9c13ed9b5614a46c3b65de2b4f7f42b8281 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Wed, 29 Jul 2020 12:56:02 +0200 Subject: [PATCH 033/100] 8250770: Net.java translateToSocketException does not handle IOException Reviewed-by: alanb, dfuchs --- src/java.base/share/classes/sun/nio/ch/Net.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/java.base/share/classes/sun/nio/ch/Net.java b/src/java.base/share/classes/sun/nio/ch/Net.java index f820035686f..1a796dff453 100644 --- a/src/java.base/share/classes/sun/nio/ch/Net.java +++ b/src/java.base/share/classes/sun/nio/ch/Net.java @@ -185,8 +185,10 @@ public class Net { nx = new SocketException("Socket is not bound yet"); else if (x instanceof UnsupportedAddressTypeException) nx = new SocketException("Unsupported address type"); - else if (x instanceof UnresolvedAddressException) { + else if (x instanceof UnresolvedAddressException) nx = new SocketException("Unresolved address"); + else if (x instanceof IOException) { + nx = new SocketException(x.getMessage()); } if (nx != x) nx.initCause(x); From 6986d53af92b7ad788a450a1ac8ed3b1b32b8900 Mon Sep 17 00:00:00 2001 From: Dean Long Date: Wed, 29 Jul 2020 23:15:48 -0700 Subject: [PATCH 034/100] 8248597: [Graal] api/java_security/SignatureSpi/DelegationTests.html fails with Method "javasoft.sqe.tests.api.java.security.SignatureSpi.JCKSignatureSpi.clear" doesn't exist Reviewed-by: kvn --- .../core/test/ConditionalNodeTest.java | 73 ++++++++++++++++++- .../org/graalvm/compiler/nodes/IfNode.java | 14 ++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java index 88191e683ec..fc1cde8cf5b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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,7 +24,9 @@ package org.graalvm.compiler.core.test; +import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; +import org.graalvm.compiler.phases.OptimisticOptimizations; import org.junit.Test; public class ConditionalNodeTest extends GraalCompilerTest { @@ -126,4 +128,73 @@ public class ConditionalNodeTest extends GraalCompilerTest { node.a = a; return a; } + + @SuppressWarnings("all") + static int lastIndexOf(char[] source, int sourceOffset, int sourceCount, + char[] target, int targetOffset, int targetCount, + int fromIndex) { + /* + * Check arguments; return immediately where possible. For consistency, don't check for null + * str. + */ + int rightIndex = sourceCount - targetCount; + if (fromIndex < 0) { + return -1; + } + if (fromIndex > rightIndex) { + fromIndex = rightIndex; + } + /* Empty string always matches. */ + if (targetCount == 0) { + return fromIndex; + } + + int strLastIndex = targetOffset + targetCount - 1; + char strLastChar = target[strLastIndex]; + int min = sourceOffset + targetCount - 1; + int i = min + fromIndex; + + startSearchForLastChar: while (true) { + while (i >= min && source[i] != strLastChar) { + i--; + } + if (i < min) { + return -1; + } + int j = i - 1; + int start = j - (targetCount - 1); + int k = strLastIndex - 1; + + while (j > start) { + if (source[j--] != target[k--]) { + i--; + continue startSearchForLastChar; + } + } + return start - sourceOffset + 1; + } + } + + public static String simple(String simpleName) { + char[] value = simpleName.toCharArray(); + char[] target = ".".toCharArray(); + int lastDotIndex = lastIndexOf(value, 0, value.length, + target, 0, target.length, value.length); + if (lastDotIndex < 0) { + return null; + } + GraalDirectives.deoptimize(); + return simpleName.substring(0, lastDotIndex); + } + + @Override + protected OptimisticOptimizations getOptimisticOptimizations() { + // Disable profile based optimizations + return OptimisticOptimizations.NONE; + } + + @Test + public void testConditionalExit() { + test("simple", Object.class.getName()); + } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java index 3fdbe593b80..5beb631720b 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java @@ -549,6 +549,10 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL return false; } + if (falseSuccessor instanceof LoopExitNode && ((LoopExitNode) falseSuccessor).stateAfter != null) { + return false; + } + PhiNode phi = merge.phis().first(); ValueNode falseValue = phi.valueAt(falseEnd); ValueNode trueValue = phi.valueAt(trueEnd); @@ -868,6 +872,11 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL AbstractEndNode trueEnd = (AbstractEndNode) trueSuccessor().next(); AbstractEndNode falseEnd = (AbstractEndNode) falseSuccessor().next(); AbstractMergeNode merge = trueEnd.merge(); + + if (falseSuccessor instanceof LoopExitNode && ((LoopExitNode) falseSuccessor).stateAfter != null) { + return false; + } + if (merge == falseEnd.merge() && trueSuccessor().anchored().isEmpty() && falseSuccessor().anchored().isEmpty()) { PhiNode singlePhi = null; int distinct = 0; @@ -986,6 +995,11 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL } protected void removeThroughFalseBranch(SimplifierTool tool, AbstractMergeNode merge) { + // If the LoopExitNode and the Merge still have states then it's incorrect to arbitrarily + // pick one side of the branch the represent the control flow. The state on the merge is the + // real after state but it would need to be adjusted to represent the effects of the + // conditional conversion. + assert !(falseSuccessor instanceof LoopExitNode) || ((LoopExitNode) falseSuccessor).stateAfter == null; AbstractBeginNode trueBegin = trueSuccessor(); LogicNode conditionNode = condition(); graph().removeSplitPropagate(this, trueBegin); From 846d21961c45f296a76c60be787013257d35c4e6 Mon Sep 17 00:00:00 2001 From: Huang Wang Date: Tue, 28 Jul 2020 10:38:04 +0800 Subject: [PATCH 035/100] 8250609: C2 crash in IfNode::fold_compares Reviewed-by: kvn, chagedorn --- src/hotspot/share/opto/ifnode.cpp | 4 + .../jtreg/compiler/c2/TestFoldCompares.java | 81 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 test/hotspot/jtreg/compiler/c2/TestFoldCompares.java diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp index 925ec06a0cb..f082b6cee33 100644 --- a/src/hotspot/share/opto/ifnode.cpp +++ b/src/hotspot/share/opto/ifnode.cpp @@ -993,11 +993,15 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f } if (lo && hi) { + Node* hook = new Node(1); + hook->init_req(0, lo); // Add a use to lo to prevent him from dying // Merge the two compares into a single unsigned compare by building (CmpU (n - lo) (hi - lo)) Node* adjusted_val = igvn->transform(new SubINode(n, lo)); if (adjusted_lim == NULL) { adjusted_lim = igvn->transform(new SubINode(hi, lo)); } + hook->del_req(0); // Just yank bogus edge + hook->destruct(); Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim)); Node* newbool = igvn->transform(new BoolNode(newcmp, cond)); diff --git a/test/hotspot/jtreg/compiler/c2/TestFoldCompares.java b/test/hotspot/jtreg/compiler/c2/TestFoldCompares.java new file mode 100644 index 00000000000..735ecf76b49 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestFoldCompares.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2020, Huawei Technologies Co. Ltd. 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8250609 + * @summary C2 crash in IfNode::fold_compares + * + * @run main/othervm -XX:CompileOnly=compiler.c2.TestFoldCompares::test + * -XX:-BackgroundCompilation compiler.c2.TestFoldCompares + */ + +package compiler.c2; + +public class TestFoldCompares { + + public int test() { + byte by = -37; + int result = 1; + int iArr[] = new int[6]; + + for (int i = 0; i < iArr.length; i++) { + iArr[i] = 0; + } + + for (int i = 16; i < 308; i++) { + result *= i; + if ((result--) <= (++by)) { + continue; + } + + for (int j = 3; j < 86; j++) { + for (int k = 1; k < 2; k++) { + result >>= 25; + } + + for (int k = 1; k < 2; k += 3) { + try { + iArr[k] = (16986 / result); + } catch (ArithmeticException a_e) { + } + result = k; + } + } + } + + return result; + } + + public static void main(String[] args) { + TestFoldCompares obj = new TestFoldCompares(); + for (int i = 0; i < 10; i++) { + int result = obj.test(); + if (result != 1) { + throw new RuntimeException("Test failed."); + } + } + System.out.println("Test passed."); + } + +} From aab365f7463014be658dd55626f1628048642a13 Mon Sep 17 00:00:00 2001 From: Thomas Stuefe Date: Sun, 2 Aug 2020 09:54:33 +0200 Subject: [PATCH 036/100] 8250911: [windows] os::pd_map_memory() error detection broken Reviewed-by: iklam, kbarrett --- src/hotspot/os/windows/os_windows.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp index ab528ef583b..83e27166ad1 100644 --- a/src/hotspot/os/windows/os_windows.cpp +++ b/src/hotspot/os/windows/os_windows.cpp @@ -4987,7 +4987,7 @@ char* os::pd_map_memory(int fd, const char* file_name, size_t file_offset, hFile = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == NULL) { + if (hFile == INVALID_HANDLE_VALUE) { log_info(os)("CreateFile() failed: GetLastError->%ld.", GetLastError()); return NULL; } From ddb726d4a09ec6c87d4c2035c9d4f3642d9a151b Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Sun, 2 Aug 2020 16:58:14 +0200 Subject: [PATCH 037/100] 8250844: Make sure {type,obj}ArrayOopDesc accessors check the bounds Reviewed-by: rrich, coleenp --- src/hotspot/share/oops/objArrayOop.inline.hpp | 6 +++-- .../share/oops/typeArrayOop.inline.hpp | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/oops/objArrayOop.inline.hpp b/src/hotspot/share/oops/objArrayOop.inline.hpp index f7771ad6f09..5862edcc48c 100644 --- a/src/hotspot/share/oops/objArrayOop.inline.hpp +++ b/src/hotspot/share/oops/objArrayOop.inline.hpp @@ -35,21 +35,23 @@ inline HeapWord* objArrayOopDesc::base() const { return (HeapWord*) arrayOopDesc inline HeapWord* objArrayOopDesc::base_raw() const { return (HeapWord*) arrayOopDesc::base_raw(T_OBJECT); } template T* objArrayOopDesc::obj_at_addr(int index) const { - assert(is_within_bounds(index), "index out of bounds"); + assert(is_within_bounds(index), "index %d out of bounds %d", index, length()); return &((T*)base())[index]; } template T* objArrayOopDesc::obj_at_addr_raw(int index) const { - assert(is_within_bounds(index), "index out of bounds"); + assert(is_within_bounds(index), "index %d out of bounds %d", index, length()); return &((T*)base_raw())[index]; } inline oop objArrayOopDesc::obj_at(int index) const { + assert(is_within_bounds(index), "index %d out of bounds %d", index, length()); ptrdiff_t offset = UseCompressedOops ? obj_at_offset(index) : obj_at_offset(index); return HeapAccess::oop_load_at(as_oop(), offset); } inline void objArrayOopDesc::obj_at_put(int index, oop value) { + assert(is_within_bounds(index), "index %d out of bounds %d", index, length()); ptrdiff_t offset = UseCompressedOops ? obj_at_offset(index) : obj_at_offset(index); HeapAccess::oop_store_at(as_oop(), offset, value); } diff --git a/src/hotspot/share/oops/typeArrayOop.inline.hpp b/src/hotspot/share/oops/typeArrayOop.inline.hpp index 8b3f64b95e9..6215acc69ed 100644 --- a/src/hotspot/share/oops/typeArrayOop.inline.hpp +++ b/src/hotspot/share/oops/typeArrayOop.inline.hpp @@ -90,91 +90,111 @@ inline jdouble* typeArrayOopDesc::double_at_addr(int which) const { } inline jbyte typeArrayOopDesc::byte_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::byte_at_put(int which, jbyte contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jboolean typeArrayOopDesc::bool_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::bool_at_put(int which, jboolean contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, jboolean(contents & 1)); } inline jchar typeArrayOopDesc::char_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::char_at_put(int which, jchar contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jint typeArrayOopDesc::int_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::int_at_put(int which, jint contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jshort typeArrayOopDesc::short_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::short_at_put(int which, jshort contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jushort typeArrayOopDesc::ushort_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::ushort_at_put(int which, jushort contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jlong typeArrayOopDesc::long_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::long_at_put(int which, jlong contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jfloat typeArrayOopDesc::float_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::float_at_put(int which, jfloat contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jdouble typeArrayOopDesc::double_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::double_at_put(int which, jdouble contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } inline jbyte typeArrayOopDesc::byte_at_acquire(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::release_byte_at_put(int which, jbyte contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, contents); } @@ -184,19 +204,23 @@ inline void typeArrayOopDesc::release_byte_at_put(int which, jbyte contents) { // casting #ifdef _LP64 inline Symbol* typeArrayOopDesc::symbol_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return (Symbol*)(jlong) HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::symbol_at_put(int which, Symbol* contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, (jlong)contents); } #else inline Symbol* typeArrayOopDesc::symbol_at(int which) const { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); return (Symbol*)(jint) HeapAccess::load_at(as_oop(), offset); } inline void typeArrayOopDesc::symbol_at_put(int which, Symbol* contents) { + assert(is_within_bounds(which), "index %d out of bounds %d", which, length()); ptrdiff_t offset = element_offset(which); HeapAccess::store_at(as_oop(), offset, (jint)contents); } From d9abf606d9a3156574ca87846e7580a4092c815b Mon Sep 17 00:00:00 2001 From: Monica Beckwith Date: Mon, 3 Aug 2020 00:16:49 -0400 Subject: [PATCH 038/100] 8250824: AArch64: follow up for JDK-8248414 The original change missed to update an assert. Co-authored-by: Ludovic Henry Co-authored-by: Bernhard Urban-Forster Reviewed-by: dholmes --- src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp index bbc13589e33..2f4947c0cb6 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp @@ -1507,7 +1507,7 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) { block_comment(buffer); } #endif - assert(imm64 < (1ul << 48), "48-bit overflow in address constant"); + assert(imm64 < (1ull << 48), "48-bit overflow in address constant"); movz(r, imm64 & 0xffff); imm64 >>= 16; movk(r, imm64 & 0xffff, 16); From 696b9e1847d9c3000621f9722a29dcace00296ee Mon Sep 17 00:00:00 2001 From: Christian Hagedorn Date: Mon, 3 Aug 2020 09:21:45 +0200 Subject: [PATCH 039/100] 8249605: C2: assert(no_dead_loop) failed: dead loop detected Fixed dead loop detection in PhiNode::Ideal() to additionally account for dead MergeMemNodes Reviewed-by: kvn, thartmann --- src/hotspot/share/opto/cfgnode.cpp | 21 ++++-- .../compiler/c2/TestDeadPhiMergeMemLoop.java | 66 +++++++++++++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestDeadPhiMergeMemLoop.java diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp index 4bf4f4066fc..ee3cd30eea5 100644 --- a/src/hotspot/share/opto/cfgnode.cpp +++ b/src/hotspot/share/opto/cfgnode.cpp @@ -2229,23 +2229,30 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) { } else { // We know that at least one MergeMem->base_memory() == this // (saw_self == true). If all other inputs also references this phi - // (directly or through data nodes) - it is dead loop. + // (directly or through data nodes) - it is a dead loop. bool saw_safe_input = false; for (uint j = 1; j < req(); ++j) { - Node *n = in(j); - if (n->is_MergeMem() && n->as_MergeMem()->base_memory() == this) - continue; // skip known cases + Node* n = in(j); + if (n->is_MergeMem()) { + MergeMemNode* mm = n->as_MergeMem(); + if (mm->base_memory() == this || mm->base_memory() == mm->empty_memory()) { + // Skip this input if it references back to this phi or if the memory path is dead + continue; + } + } if (!is_unsafe_data_reference(n)) { saw_safe_input = true; // found safe input break; } } - if (!saw_safe_input) - return top; // all inputs reference back to this phi - dead loop + if (!saw_safe_input) { + // There is a dead loop: All inputs are either dead or reference back to this phi + return top; + } // Phi(...MergeMem(m0, m1:AT1, m2:AT2)...) into // MergeMem(Phi(...m0...), Phi:AT1(...m1...), Phi:AT2(...m2...)) - PhaseIterGVN *igvn = phase->is_IterGVN(); + PhaseIterGVN* igvn = phase->is_IterGVN(); Node* hook = new Node(1); PhiNode* new_base = (PhiNode*) clone(); // Must eagerly register phis, since they participate in loops. diff --git a/test/hotspot/jtreg/compiler/c2/TestDeadPhiMergeMemLoop.java b/test/hotspot/jtreg/compiler/c2/TestDeadPhiMergeMemLoop.java new file mode 100644 index 00000000000..9bed4ed4b45 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestDeadPhiMergeMemLoop.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8249605 + * @summary A dead memory loop is detected when replacing an actually dead memory phi node in PhiNode::Ideal() + * by a dead MergeMemNode which builds a cycle with one of its slices. + * + * @run main/othervm -Xcomp -XX:-TieredCompilation + * -XX:CompileCommand=compileonly,compiler.c2.TestDeadPhiMergeMemLoop::main + * -XX:CompileCommand=dontinline,compiler.c2.TestDeadPhiMergeMemLoop::dontInline + * compiler.c2.TestDeadPhiMergeMemLoop + */ + +package compiler.c2; + +public class TestDeadPhiMergeMemLoop { + + public static boolean bFld = false; + public static double dArrFld[] = new double[400]; + + public static void main(String[] strArr) { + int x = 1; + int i = 0; + int iArr[] = new int[400]; + dontInline(); + + if (bFld) { + x += x; + } else if (bFld) { + float f = 1; + while (++f < 132) { + if (bFld) { + dArrFld[5] = 3; + for (i = (int)(f); i < 12; i++) { + } + } + } + } + } + + // Not inlined + public static void dontInline() { + } +} From 9385203fbdce0742c98fcedafb90304d226dab43 Mon Sep 17 00:00:00 2001 From: Albert Mingkun Yang Date: Mon, 3 Aug 2020 14:01:00 +0200 Subject: [PATCH 040/100] 8250628: ZGC: `fixup_partial_loads` was removed, but still are referenced Reviewed-by: eosterlund, kbarrett, lkorinth --- src/hotspot/share/gc/z/zArguments.cpp | 8 -------- src/hotspot/share/gc/z/zHeap.hpp | 1 - 2 files changed, 9 deletions(-) diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp index ce786cc30fd..05b295c0c7f 100644 --- a/src/hotspot/share/gc/z/zArguments.cpp +++ b/src/hotspot/share/gc/z/zArguments.cpp @@ -99,18 +99,10 @@ void ZArguments::initialize() { FLAG_SET_DEFAULT(VerifyDuringStartup, false); FLAG_SET_DEFAULT(VerifyBeforeExit, false); - // Verification before heap iteration not (yet) supported, for the - // same reason we need fixup_partial_loads - FLAG_SET_DEFAULT(VerifyBeforeIteration, false); - if (VerifyBeforeGC || VerifyDuringGC || VerifyAfterGC) { FLAG_SET_DEFAULT(ZVerifyRoots, true); FLAG_SET_DEFAULT(ZVerifyObjects, true); } - - // Verification of stacks not (yet) supported, for the same reason - // we need fixup_partial_loads - DEBUG_ONLY(FLAG_SET_DEFAULT(VerifyStack, false)); } size_t ZArguments::conservative_max_heap_alignment() { diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp index 2f488bfca68..f8505274ebb 100644 --- a/src/hotspot/share/gc/z/zHeap.hpp +++ b/src/hotspot/share/gc/z/zHeap.hpp @@ -64,7 +64,6 @@ private: void flip_to_remapped(); void out_of_memory(); - void fixup_partial_loads(); public: static ZHeap* heap(); From 1e535dfa53db807ef7b624fea93614530f35d443 Mon Sep 17 00:00:00 2001 From: Rajan Halade Date: Mon, 3 Aug 2020 11:35:24 -0700 Subject: [PATCH 041/100] 8243320: Add SSL root certificates to Oracle Root CA program Reviewed-by: mullan --- make/data/cacerts/sslrooteccca | 23 + make/data/cacerts/sslrootevrsaca | 41 ++ make/data/cacerts/sslrootrsaca | 41 ++ .../certification/SSLCA.java | 489 ++++++++++++++++++ .../security/lib/cacerts/VerifyCACerts.java | 12 +- 5 files changed, 603 insertions(+), 3 deletions(-) create mode 100644 make/data/cacerts/sslrooteccca create mode 100644 make/data/cacerts/sslrootevrsaca create mode 100644 make/data/cacerts/sslrootrsaca create mode 100644 test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java diff --git a/make/data/cacerts/sslrooteccca b/make/data/cacerts/sslrooteccca new file mode 100644 index 00000000000..9943012ed8e --- /dev/null +++ b/make/data/cacerts/sslrooteccca @@ -0,0 +1,23 @@ +Owner: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US +Issuer: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US +Serial number: 75e6dfcbc1685ba8 +Valid from: Fri Feb 12 18:14:03 GMT 2016 until: Tue Feb 12 18:14:03 GMT 2041 +Signature algorithm name: SHA256withECDSA +Subject Public Key Algorithm: 384-bit EC key +Version: 3 +-----BEGIN CERTIFICATE----- +MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMC +VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T +U0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0 +aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNDAzWhcNNDEwMjEyMTgxNDAz +WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0 +b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBS +b290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB +BAAiA2IABEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI +7Z4INcgn64mMU1jrYor+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPg +CemB+vNH06NjMGEwHQYDVR0OBBYEFILRhXMw5zUE044CkvvlpNHEIejNMA8GA1Ud +EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTTjgKS++Wk0cQh6M0wDgYD +VR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCWe+0F+S8T +kdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+ +gA0z5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl +-----END CERTIFICATE----- diff --git a/make/data/cacerts/sslrootevrsaca b/make/data/cacerts/sslrootevrsaca new file mode 100644 index 00000000000..c009aa081e1 --- /dev/null +++ b/make/data/cacerts/sslrootevrsaca @@ -0,0 +1,41 @@ +Owner: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US +Issuer: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US +Serial number: 56b629cd34bc78f6 +Valid from: Wed May 31 18:14:37 GMT 2017 until: Fri May 30 18:14:37 GMT 2042 +Signature algorithm name: SHA256withRSA +Subject Public Key Algorithm: 4096-bit RSA key +Version: 3 +-----BEGIN CERTIFICATE----- +MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNV +BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UE +CgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMB4XDTE3MDUzMTE4MTQzN1oXDTQy +MDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4G +A1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQD +DC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvq +M0fNTPl9fb69LT3w23jhhqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssuf +OePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7wcXHswxzpY6IXFJ3vG2fThVUCAtZJycxa +4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTOZw+oz12WGQvE43LrrdF9 +HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+B6KjBSYR +aZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcA +b9ZhCBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQ +Gp8hLH94t2S42Oim9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQV +PWKchjgGAGYS5Fl2WlPAApiiECtoRHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMO +pgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+SlmJuwgUHfbSguPvuUCYHBBXtSu +UDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48+qvWBkofZ6aY +MBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV +HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa4 +9QaAJadz20ZpqJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBW +s47LCp1Jjr+kxJG7ZhcFUZh1++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5 +Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nxY/hoLVUE0fKNsKTPvDxeH3jnpaAg +cLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2GguDKBAdRUNf/ktUM +79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDzOFSz +/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXt +ll9ldDz7CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEm +Kf7GUmG6sXP/wwyc5WxqlD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKK +QbNmC1r7fSOl8hqw/96bg5Qu0T/fkreRrwU7ZcegbLHNYhLDkBvjJc40vG93drEQ +w/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1hlMYegouCRw2n5H9gooi +S9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX9hwJ1C07 +mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w== +-----END CERTIFICATE----- diff --git a/make/data/cacerts/sslrootrsaca b/make/data/cacerts/sslrootrsaca new file mode 100644 index 00000000000..b7982751e24 --- /dev/null +++ b/make/data/cacerts/sslrootrsaca @@ -0,0 +1,41 @@ +Owner: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US +Issuer: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US +Serial number: 7b2c9bd316803299 +Valid from: Fri Feb 12 17:39:39 GMT 2016 until: Tue Feb 12 17:39:39 GMT 2041 +Signature algorithm name: SHA256withRSA +Subject Public Key Algorithm: 4096-bit RSA key +Version: 3 +-----BEGIN CERTIFICATE----- +MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE +BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK +DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTczOTM5WhcNNDEwMjEyMTcz +OTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv +dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv +bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2R +xFdHaxh3a3by/ZPkPQ/CFp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aX +qhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcC +C52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/geoeOy3ZExqysdBP+lSgQ3 +6YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkpk8zruFvh +/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrF +YD3ZfBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93E +JNyAKoFBbZQ+yODJgUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVc +US4cK38acijnALXRdMbX5J+tB5O2UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8 +ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi81xtZPCvM8hnIk2snYxnP/Okm ++Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4sbE6x/c+cCbqi +M+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV +HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4G +A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGV +cpNxJK1ok1iOMq8bs3AD/CUrdIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBc +Hadm47GUBwwyOabqG7B52B2ccETjit3E+ZUfijhDPwGFpUenPUayvOUiaPd7nNgs +PgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAslu1OJD7OAUN5F7kR/ +q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjqerQ0 +cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jr +a6x+3uxjMxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90I +H37hVZkLId6Tngr75qNJvTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/Y +K9f1JmzJBjSWFupwWRoyeXkLtoh/D1JIPb9s2KJELtFOt3JY04kTlf5Eq/jXixtu +nLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406ywKBjYZC6VWg3dGq2ktuf +oYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NIWuuA8ShY +Ic2wBlX7Jz9TkHCpBB5XJ7k= +-----END CERTIFICATE----- diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java new file mode 100644 index 00000000000..1d31833398b --- /dev/null +++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java @@ -0,0 +1,489 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8243320 + * @summary Interoperability tests with SSL.com's RSA, EV RSA, and ECC CA + * @build ValidatePathWithParams + * @run main/othervm -Djava.security.debug=certpath SSLCA OCSP + * @run main/othervm -Djava.security.debug=certpath SSLCA CRL + */ + +/* + * Obtain TLS test artifacts for SSL.com CAs from: + * + * SSL.com RSA CA + * Valid - https://test-dv-rsa.ssl.com + * Revoked - https://revoked-rsa-dv.ssl.com/ + * SSL.com EV RSA CA + * Valid - https://test-ev-rsa.ssl.com + * Revoked - https://revoked-rsa-ev.ssl.com/ + * SSL.com ECC CA + * Valid - https://test-dv-ecc.ssl.com + * Revoked - https://revoked-ecc-dv.ssl.com/ + */ +public class SSLCA { + + public static void main(String[] args) throws Exception { + + ValidatePathWithParams pathValidator = new ValidatePathWithParams(null); + boolean ocspEnabled = false; + + if (args.length >= 1 && "CRL".equalsIgnoreCase(args[0])) { + pathValidator.enableCRLCheck(); + } else { + // OCSP check by default + pathValidator.enableOCSPCheck(); + ocspEnabled = true; + } + + new SSLCA_RSA().runTest(pathValidator, ocspEnabled); + new SSLCA_EV_RSA().runTest(pathValidator, ocspEnabled); + new SSLCA_ECC().runTest(pathValidator, ocspEnabled); + } +} + +class SSLCA_RSA { + + // Owner: CN=SSL.com RSA SSL subCA, O=SSL Corporation, L=Houston, ST=Texas, C=US + // Issuer: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US + // Serial number: 997ed109d1f07fc + // Valid from: Fri Feb 12 10:48:52 PST 2016 until: Wed Feb 12 10:48:52 PST 2031 + private static final String INT = "-----BEGIN CERTIFICATE-----\n" + + "MIIGbzCCBFegAwIBAgIICZftEJ0fB/wwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE\n" + + "BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK\n" + + "DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp\n" + + "Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTg0ODUyWhcNMzEwMjEyMTg0\n" + + "ODUyWjBpMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv\n" + + "dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjEeMBwGA1UEAwwVU1NMLmNv\n" + + "bSBSU0EgU1NMIHN1YkNBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA\n" + + "hPYpOunhcxiF6xNzl6Tsm/Q89rnu2jVTXTBOZPaBkSD1Ic4lm7qkYwlZ/UgV5nn1\n" + + "5ohhceYDC2AlR9RvGbP+26qrNcuE0XOdHJOB4SoY4d6OqLAQ6ZB0LdERK1Saa5lp\n" + + "QlqHE8936dpr3hGWyqMb2LsdUuhQIzwNkLU/n9HO35irKCbKgS3FeejqkdqK5l6B\n" + + "b11693o4bz9UZCUdBcQ/Xz06tA5cfnHvYkmmjxhj1lLTKwkQhWuIDrpbwWLO0QVO\n" + + "c29s9ieomRKm8sYMyiBG4QqRQ/+bXwp48cF0qAByGWD6b8/gG4Xq1IBgO5p+aWFS\n" + + "0mszkk5rsh4b3XbTHohP3oWQIOV20WWdtVWXiQuBB8RocAl0Ga//b+epiGgME5JX\n" + + "LWXD1aDg/xHy8MUsaMlh6jDfVIFepkPnkwXDpR/n36hpgKa9dErMkgbYeEaPanLH\n" + + "Yd0kv4xQ36PlMMs9WhoDErGcEG9KxAXN4Axr5wl6PTDn/lXcUFvQoIq/5CSP+Kt5\n" + + "jq9tK/gRrAc4AWqRugDvQPYUm00Rqzj5Oxm5NVQYDzbyoA66CD68LETuVrfa9GuW\n" + + "9MAZRO6CDzonAezIdNHsslDb1H8VN/k0zMxjI+0ub4IAmc3I5GfZtvYcpjtMj8L4\n" + + "2TDS34/COov/Pf2HZ/XXGlzjZ7WPmLl4fdB6hhjs2BsCAwEAAaOCAQYwggECMDAG\n" + + "CCsGAQUFBwEBBCQwIjAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20w\n" + + "HQYDVR0OBBYEFCYUfuDc16b34tQEJ99h8cLs5zLKMA8GA1UdEwEB/wQFMAMBAf8w\n" + + "HwYDVR0jBBgwFoAU3QQJB6L1en1SUxKSle44gCUNplkwEQYDVR0gBAowCDAGBgRV\n" + + "HSAAMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmxzLnNzbC5jb20vc3NsLmNv\n" + + "bS1yc2EtUm9vdENBLmNybDAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYB\n" + + "BQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4ICAQAi6e/iSV5DEqDO6XjQ\n" + + "SIIzXgc255yv6Oc2sqZnvRyVBHtHvo62jMoHY3Xunc/EofbeS4aHdYBvgkn6CNTj\n" + + "VkCU+psWwcT3Pg83uP4k4Thu7bXvrClfS+XBlbJiCF/PSJxLrKnxRn+XIGiYl62H\n" + + "glBhq9K8/fZrI2Qh1mZJmWE0FlxEDCb4i8SBNi8lmDogaFi8/yl32Z9ahmhxcLit\n" + + "DU/XyKA0yOqvIrOGKH95v+/l8fQkzE1VEFvj+iyv4TXd7mRZDOsfqfIDZhrpou02\n" + + "kXH/hcXlrR++t8kjj9wt8HHQ+FkryWI6bU3KPRJR6N8EH2EHi23Rp8/kyMs+gwaz\n" + + "zMqnkNPbMME723rXk6/85sjOUaZCmhmRIx9rgqIWQesU962J0FruGOOasLT7WbZi\n" + + "FsmSblmpjUAo49sIRi7X493qegyCEAa412ynybhQ7LVsTLEPxVbdmGVih3jVTif/\n" + + "Nztr2Isaaz4LpMEo4mGCiGxec5mKr1w8AE9n6D91CvxR5/zL1VU1JCVC7sAtkdki\n" + + "vnN1/6jEKFJvlUr5/FX04JXeomIjXTI8ciruZ6HIkbtJup1n9Zxvmr9JQcFTsP2c\n" + + "bRbjaT7JD6MBidAWRCJWClR/5etTZwWwWrRCrzvIHC7WO6rCzwu69a+l7ofCKlWs\n" + + "y702dmPTKEdEfwhgLx0LxJr/Aw==\n" + + "-----END CERTIFICATE-----"; + + // Owner: CN=test-dv-rsa.ssl.com + // Issuer: CN=SSL.com RSA SSL subCA, O=SSL Corporation, L=Houston, ST=Texas, C=US + // Serial number: 4ceada4ade82a6ccd0b2ae32c0dbfd62 + // Valid from: Fri Jun 28 07:06:50 PDT 2019 until: Sun Jun 27 07:06:50 PDT 2021 + private static final String VALID = "-----BEGIN CERTIFICATE-----\n" + + "MIIHTjCCBTagAwIBAgIQTOraSt6CpszQsq4ywNv9YjANBgkqhkiG9w0BAQsFADBp\n" + + "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" + + "GDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjEeMBwGA1UEAwwVU1NMLmNvbSBSU0Eg\n" + + "U1NMIHN1YkNBMB4XDTE5MDYyODE0MDY1MFoXDTIxMDYyNzE0MDY1MFowHjEcMBoG\n" + + "A1UEAwwTdGVzdC1kdi1yc2Euc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP\n" + + "ADCCAQoCggEBAKlOrYr8fnHN8REfJDwgsBhJvnsU4beQIYYaOAzR8pmo8eq1U/K0\n" + + "uwRrgJ5K61V78zBO5qmZNiivBobViftObWrq2H6QhQsYdMYXld3SEnEotIIriRHY\n" + + "2PcqlgnFYXkqI0ZKs4kNs+j3GS0IwncJJwKtypmtLTCLK5J/kG7qB2MNfXZTIzKI\n" + + "iZza4RUM1j67Hv3fPJzNEJ9urfjaI4xcRh5airlzBWOBU9pW87P7BgQN7cNzJQji\n" + + "4DSvb1pSXv8sBbZk5fmG+81PyUxcfqj7Dbih0J1Aoq0YysHugsrK/kLz+CvqL9B2\n" + + "a1JMZfob9jzcA7XPjpggLc3az2Wvv3XKqokCAwEAAaOCAzswggM3MB8GA1UdIwQY\n" + + "MBaAFCYUfuDc16b34tQEJ99h8cLs5zLKMHwGCCsGAQUFBwEBBHAwbjBKBggrBgEF\n" + + "BQcwAoY+aHR0cDovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkvU1NMY29tLVN1YkNB\n" + + "LVNTTC1SU0EtNDA5Ni1SMS5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nwcy5z\n" + + "c2wuY29tMDcGA1UdEQQwMC6CE3Rlc3QtZHYtcnNhLnNzbC5jb22CF3d3dy50ZXN0\n" + + "LWR2LXJzYS5zc2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwGDCsGAQQBgqkw\n" + + "AQMBATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29tL3JlcG9zaXRv\n" + + "cnkwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMDoGA1UdHwQzMDEwL6At\n" + + "oCuGKWh0dHA6Ly9jcmxzLnNzbC5jb20vU1NMY29tUlNBU1NMc3ViQ0EuY3JsMB0G\n" + + "A1UdDgQWBBQD/cmwQI853u0mOlmCjNRsAZOlEDAOBgNVHQ8BAf8EBAMCBaAwggF+\n" + + "BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AO5Lvbd1zmC64UJpH6vhnmajD35fsHLY\n" + + "gwDEe4l6qP3LAAABa55yL0QAAAQDAEcwRQIgWo8UQY3EYwyzkGLBLS0Zxu7oMmB7\n" + + "dnpzsEcoexWzZrQCIQCR6FkAe5ns84x2phRkn6nV7a0anjnxjpJUNeCfc3/pxAB2\n" + + "AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa55yLzsAAAQDAEcw\n" + + "RQIhAKhGKQIpSd59tJm/Yac7Xo05u93CWbnDwoDgSMS+HBs5AiAfOSOc3BzY/2MF\n" + + "AM4GWrkK5Ehs9JMafo/+VBM0OrwVKQB2AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1\n" + + "YMG06v9eoIMPAAABa55yL4IAAAQDAEcwRQIhANcF26iGoUuzZL6rGKduPtyyYusf\n" + + "03lBKSyvxabB9WuvAiBNbxR210L+JP89s/ONw53lYVr+1m/c3u9/9Wpu7c3n5jAN\n" + + "BgkqhkiG9w0BAQsFAAOCAgEACX2CbVM8MCIJ+2Wsap1v6VU2kpCS/FBIsLSTWNEf\n" + + "dREv1nh93qQ2CPIxj5kP/0EOUfq7tmQCJHMODVgz3iHrdxRB1E58nXHlZ6vUdrCo\n" + + "pD9d6Cp+AwvrOdv6MndVJgel9tVOAqAUblwdLzPNQHEcXoKnFEVv2SVQCmAYLlkP\n" + + "xX2RS73gseiit4QnVZOWi/wDhqMm7/iq8n7rL/f7+ly2+7e3LVjxd24HZkgxNgbn\n" + + "JDjYvIla+EvyrY8514Ru3Pf1UICY03VpYjE8R7SxrqcvOLtwvOVew6TuCUl6RNpl\n" + + "xeC9Oa1dgf+QRXN7LvmBXUP2nOCnwJE1ENvThPLw9BXLatVJgkA/v/mYWE5VjzIL\n" + + "hboPH2fNWemUv5QMzxUkqhgHgrhr8wnhI6xYIYciGDbmmfnItHex7bxktT7axoCD\n" + + "3dTQQe01YfK/LlkHtnBmJf/t0F33m8KXcQ51fic/TR2U5Tampxp2kdFdTyvRRqMl\n" + + "igqo3EhiPmB9bKsnXDA2AnvdjZT9uFwbUu5lNxjiMQcSZikjQAjJPgjCZ9BQOGbL\n" + + "eqgZcw2CxWMxFSTLL3TIBlNL/0GpRlTvr3IGyvHEr7EESXKD+Ar8XW+4VlMc1s8F\n" + + "cdtnus71s7wm+JUSXcM0WJUkRUvWqHlPi3Ucfe7k6x6BG9Mb42ECjorefPXvFu7v\n" + + "OT4=\n" + + "-----END CERTIFICATE-----"; + + // Owner: CN=revoked-rsa-dv.ssl.com + // Issuer: CN=SSL.com RSA SSL subCA, O=SSL Corporation, L=Houston, ST=Texas, C=US + // Serial number: 3f527e677d00558272ac90d1620b67f4 + // Valid from: Fri Jun 28 07:13:48 PDT 2019 until: Sun Jun 27 07:13:48 PDT 2021 + private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" + + "MIIHVzCCBT+gAwIBAgIQP1J+Z30AVYJyrJDRYgtn9DANBgkqhkiG9w0BAQsFADBp\n" + + "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" + + "GDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjEeMBwGA1UEAwwVU1NMLmNvbSBSU0Eg\n" + + "U1NMIHN1YkNBMB4XDTE5MDYyODE0MTM0OFoXDTIxMDYyNzE0MTM0OFowITEfMB0G\n" + + "A1UEAwwWcmV2b2tlZC1yc2EtZHYuc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD\n" + + "ggEPADCCAQoCggEBAMKtMVeo+fMoeu1nLrcwxNAdfUysNKEhNZbMUOu9pzCChEvJ\n" + + "QHUicdrIZYl9m59uKUMh3Dj2nJLZ3a0pP4iWKcOEfCVMtA83/GDJl/BVj3XFbsMl\n" + + "+HSIu7R0vQM4enOztLabnOzvE4pQOFUp8u5SKO+hmB0zQ1iWkevYjJOf5DBZ7Zsa\n" + + "uF4qy9JqSF07gj/7FNqmqnfy6Z8yc8WAMjoUJrVrvmHQZeX/bCWxczFhYmAtYlwO\n" + + "7a914VP79b3Jq60HbLbYBdILnuU1Uu5L/JbG+hm/fH2meY30aWUaKcGY04ej6xuM\n" + + "hWsLhOrmcl3P7/E5UUojaR1Zvdtsn7jkQ8Y3iOsCAwEAAaOCA0EwggM9MB8GA1Ud\n" + + "IwQYMBaAFCYUfuDc16b34tQEJ99h8cLs5zLKMHwGCCsGAQUFBwEBBHAwbjBKBggr\n" + + "BgEFBQcwAoY+aHR0cDovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkvU1NMY29tLVN1\n" + + "YkNBLVNTTC1SU0EtNDA5Ni1SMS5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nw\n" + + "cy5zc2wuY29tMD0GA1UdEQQ2MDSCFnJldm9rZWQtcnNhLWR2LnNzbC5jb22CGnd3\n" + + "dy5yZXZva2VkLXJzYS1kdi5zc2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwG\n" + + "DCsGAQQBgqkwAQMBATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29t\n" + + "L3JlcG9zaXRvcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMDoGA1Ud\n" + + "HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmxzLnNzbC5jb20vU1NMY29tUlNBU1NMc3Vi\n" + + "Q0EuY3JsMB0GA1UdDgQWBBSTrHG0Sh+8BEp+oP+avIGAtSdyajAOBgNVHQ8BAf8E\n" + + "BAMCBaAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AESUZS6w7s6vxEAH2Kj+\n" + + "KMDa5oK+2MsxtT/TM5a1toGoAAABa554kQsAAAQDAEcwRQIhAIfU+5HWDnqZdlMN\n" + + "Z+CEkBE8wBFUWzG0ixSQ5S1Tryt4AiAQevLU7OF3N90zIt2QpwVAIGve5lBElhMH\n" + + "fRqXTkeZZwB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa554\n" + + "jJQAAAQDAEcwRQIhAPd8mNiDFHA74Bl16nwOPehQZmiFltzCYDsd0uHv5qCfAiB+\n" + + "S43G7Yhq62Ofma6wXsag+UEl/tttzfbfASGz1WPBOQB2AKS5CZC0GFgUh7sTosxn\n" + + "cAo8NZgE+RvfuON3zQ7IDdwQAAABa554kDoAAAQDAEcwRQIgUs8O4gQ34Sp0K4Dn\n" + + "Wh7FRFJWwZ6cGYvqmKT+UyCeVisCIQDl0AYXsn4ILMafvmJwnXlcduZ3z6P0jwGK\n" + + "Cjh26ETDFzANBgkqhkiG9w0BAQsFAAOCAgEAAtTlh2YMwe6E0+EWKU3H79NmgLjK\n" + + "xoR3VtT56ILRt0qJuJ+z1iqq/IxZBe7wnUUWU46SWmBfDEQcGI7Hdomr67QBZNZz\n" + + "+wvnatMzrCPM7jPsb05Motz99NSk6yzQzR2c030sy1d78mRKJ/4wpidNDHpjuYL9\n" + + "cBp2gKf2/RxU74+BhugCjLqB1gojGO0CT1/g5a1QMtqRMM0EPrJrrtcEM0zG48yI\n" + + "P3b57Nl2ZbshRvY9bVi3of2SaPFQgu99/zAlerPUThz4O2CskOgKt77y6KOgCbBp\n" + + "7fQF6vh/aOm0Xba2Z0CtB+uVN2g4+LwyuovOy+JyjGKv7GxRKEQmGZsRLDVpxOs5\n" + + "W47K+iuOEhTRWRkStfuk2LcCLwTrgxHv2/Wo+80ME/7wxGKs1IzlkcFtFLhaeN4p\n" + + "QsmADpcyBfeWmvTdKgaVBOE2F/nenIiKpo+0jcoMAW6JgMD+otn8gofBq+Za1N4X\n" + + "xckvLWbMDAj4lELBHXu7gLHHLJCL9GGPD5HKjH/RyLtKKaRgT/AV6jl/woKTAzGF\n" + + "SPqgNQsu+sCdUbO0nDONkXDxhfan8XNrd32KMPGucJySiyjpHkurobMuGbs/LQzd\n" + + "JLTSTIIIPpEHBk7PHRGPSFewIhi0aDhupgZLU9UGrLRw/xV/KlGqTcGFWBvvOC+I\n" + + "CSZFRr0hWBv/dfw=\n" + + "-----END CERTIFICATE-----"; + + public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception { + // Validate valid + pathValidator.validate(new String[]{VALID, INT}, + ValidatePathWithParams.Status.GOOD, null, System.out); + + // Validate Revoked + pathValidator.validate(new String[]{REVOKED, INT}, + ValidatePathWithParams.Status.REVOKED, + "Fri Jun 28 07:25:02 PDT 2019", System.out); + } +} + +class SSLCA_EV_RSA { + + // Owner: CN=SSL.com EV SSL Intermediate CA RSA R3, O=SSL Corp, L=Houston, ST=Texas, C=US + // Issuer: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US + // Serial number: 56b629cd34bc78f6 + // Valid from: Wed May 31 11:14:37 PDT 2017 until: Fri May 30 11:14:37 PDT 2042 + private static final String INT = "-----BEGIN CERTIFICATE-----\n" + + "MIIG4DCCBMigAwIBAgIQA6P00GAwUqM3zjgKiDAxjDANBgkqhkiG9w0BAQsFADCB\n" + + "gjELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9u\n" + + "MRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNzA1BgNVBAMMLlNTTC5jb20gRVYg\n" + + "Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EgUjIwHhcNMTkwMzI2MTc0\n" + + "NjUzWhcNMzQwMzIyMTc0NjUzWjByMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4\n" + + "YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMS4wLAYDVQQD\n" + + "DCVTU0wuY29tIEVWIFNTTCBJbnRlcm1lZGlhdGUgQ0EgUlNBIFIzMIICIjANBgkq\n" + + "hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkby+CNUTyO0wakMc6VeJxQLGcTtfwJG6\n" + + "W9MYhMBWW22YUMtfCL7at/ey89eCc0cNy9uekJqitJe78Ion5qHBLfSpahYWttzr\n" + + "LflXkdlPz6xsZuw7F/tp6oYrcUpRIX92ci0EhORtb5xoX7rwzrBnG2Jv7fPn8JGj\n" + + "wmvYPS0meVkuKGtdR/s3dkl0tDraq2xti8cN7W9VawzLDL9yNyEw2GWAp3M5Uqex\n" + + "Yjh9HY5w/4bgk7K0KSw+2njaXCEa2MugM6txHDKjocVFBe7G8JPMKkCcbbrgZo/q\n" + + "ygTnIY8q7B1XQG2wrdsu4LTo9ijIYmoZHBAKN/XCdPecQYF9cHrv6NjVUcMrNmHT\n" + + "B43NrIvrXmm3lZJU4PZNUhb7YrDtpN+rV6zSaKAu/EArGDzYv8iHKT2E+wjhwqOC\n" + + "WnXv1qSa//xvN6RSoDMpj7q7iTxfdrQqRFsr70hyPrUmnoJLrBBg1+IqFTkaNtuk\n" + + "misP4Bd0zeqkEuxYCmhKcCTM2iS9RMCIot5HI5qeAcVs63WzM+ax0zbHK1F9AIOG\n" + + "gwrVRrdwXRSXO4TlvamsL6klJMnjSCs7E1l8xeE403nZPp4RGr5ZQFrhfdG9nL7w\n" + + "66osGX+dGHGZkFjASS3Bw0RCiz4oCJxFGE+FAD7pJaV8GP6XTkaZp9n1ooYzCC48\n" + + "vq0OtfRS62MCAwEAAaOCAV8wggFbMBIGA1UdEwEB/wQIMAYBAf8CAQAwHwYDVR0j\n" + + "BBgwFoAU+WC71OPVNPa49QaAJadz20ZpqJ4wfAYIKwYBBQUHAQEEcDBuMEoGCCsG\n" + + "AQUFBzAChj5odHRwOi8vd3d3LnNzbC5jb20vcmVwb3NpdG9yeS9TU0xjb20tUm9v\n" + + "dENBLUVWLVJTQS00MDk2LVIyLmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3Bz\n" + + "LnNzbC5jb20wEQYDVR0gBAowCDAGBgRVHSAAMB0GA1UdJQQWMBQGCCsGAQUFBwMC\n" + + "BggrBgEFBQcDATBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vY3Jscy5zc2wuY29t\n" + + "L1NTTGNvbS1Sb290Q0EtRVYtUlNBLTQwOTYtUjIuY3JsMB0GA1UdDgQWBBS/wVqH\n" + + "/yj6QT39t0/kHa+gYVgpvTAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD\n" + + "ggIBAAoTAGRea1Lg+Rlvnhj6lHbvhn9mjUlXZuI1b4d4jDDk5X29gNKhW7Rg97Qt\n" + + "oBoJaLb9gZkJ2MkUbCE1x2jIghjLmmFvaIq+nAZEMtWWEi0ycqQm8rVUHioZ2Mfn\n" + + "2SoFtQeY+5MFLO9l8IeDaNZ+LV3su8YTsh/453vExhiNhPVEqLyGlkkW0B2gNW8z\n" + + "bsRy6L5QW0cZ4gZrY86MvHB0Gl299mTJ4jcgic+Oalbz9SZJ+EiW/aUDSpZ2zawi\n" + + "ackPWmAbk0y0gouOymrwOJZTuq+AJEJ6M+WSVdknwE7YwDpVMszHXS38BS1A5N1i\n" + + "rzW3BcARHbtCb00vEy2mzW5JPM2LjkzfgJ0lBiyDCE3ZeBeUtKmcdFUFrHwHl3gV\n" + + "aRipD+xMa1hGOTh33eMzwWoRxvk6o7y73Sy6XBfycN+8LhXUZT0X8STmWtBtLSMp\n" + + "blWMjuuFyUVQvIj05N7hORY/LhdQhEx8kVwS5RkLVSpRnohdk+nI69yIA7EwZKlw\n" + + "kKEsDqlVOeDYWVWQANDC55kJ7nOyJbqtGJqImwWXdQcf37fi80cf+mKOYs5vNmkx\n" + + "D9bwFWsKnP71x0liSlv8z79vRAo8FJwTgXRNO1c0ACf0rXEJy3GRAXRWiTvuGahR\n" + + "JVM3Jnn0G6o3+vTfwa7CKR/9Jc4t25iRU3xmSgiusg4u8i5x\n" + + "-----END CERTIFICATE-----"; + + // Owner: OID.1.3.6.1.4.1.311.60.2.1.3=US, OID.1.3.6.1.4.1.311.60.2.1.2=Nevada, STREET=3100 Richmond Ave, + // OID.2.5.4.15=Private Organization, OID.2.5.4.17=77098, CN=test-ev-rsa.ssl.com, SERIALNUMBER=NV20081614243, + // O=SSL Corp, L=Houston, ST=Texas, C=US + // Issuer: CN=SSL.com EV SSL Intermediate CA RSA R3, O=SSL Corp, L=Houston, ST=Texas, C=US + // Serial number: 558089b221d7cd9c7a4bc4a7fd7e2969 + // Valid from: Mon Jul 01 13:28:01 PDT 2019 until: Wed Jun 30 13:28:01 PDT 2021 + private static final String VALID = "-----BEGIN CERTIFICATE-----\n" + + "MIIISTCCBjGgAwIBAgIQVYCJsiHXzZx6S8Sn/X4paTANBgkqhkiG9w0BAQsFADBy\n" + + "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" + + "ETAPBgNVBAoMCFNTTCBDb3JwMS4wLAYDVQQDDCVTU0wuY29tIEVWIFNTTCBJbnRl\n" + + "cm1lZGlhdGUgQ0EgUlNBIFIzMB4XDTE5MDcwMTIwMjgwMVoXDTIxMDYzMDIwMjgw\n" + + "MVowgfExCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91\n" + + "c3RvbjERMA8GA1UECgwIU1NMIENvcnAxFjAUBgNVBAUTDU5WMjAwODE2MTQyNDMx\n" + + "HDAaBgNVBAMME3Rlc3QtZXYtcnNhLnNzbC5jb20xDjAMBgNVBBEMBTc3MDk4MR0w\n" + + "GwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjEaMBgGA1UECQwRMzEwMCBSaWNo\n" + + "bW9uZCBBdmUxFzAVBgsrBgEEAYI3PAIBAgwGTmV2YWRhMRMwEQYLKwYBBAGCNzwC\n" + + "AQMTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsmMOHfREGN48\n" + + "nlgxYiF0EJsytoM98UAslRRlGHJyZw3SLcPx9u/I82h0KKjLtnY3/o62mCoEZYlc\n" + + "1UKKEIi3NgByU8yJ0yynm3I0LJHEZqOKoahtzwP787/OtqsSsWeblrTnfxVO7G1J\n" + + "bPYrPtNuQ9ZnmByyhA+hlTIY48kJh5WtmBeftBSynuKCgpVnkv2y2LKZJc4t6JQX\n" + + "XO6Geev8LPUd2uPVjatZv0se2YKdixFQQKwWcLJV5LZqjZDhZtPomCN0sp+wle4p\n" + + "rRTZPSWRB98mI1X+UBTFGFKS9cxzO2NwmVcbgN2WYR+FpWbatoS/RThGC7mKQB7i\n" + + "5BEQHNZMawIDAQABo4IDWTCCA1UwHwYDVR0jBBgwFoAUv8Fah/8o+kE9/bdP5B2v\n" + + "oGFYKb0wfwYIKwYBBQUHAQEEczBxME0GCCsGAQUFBzAChkFodHRwOi8vd3d3LnNz\n" + + "bC5jb20vcmVwb3NpdG9yeS9TU0xjb20tU3ViQ0EtRVYtU1NMLVJTQS00MDk2LVIz\n" + + "LmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20wNwYDVR0RBDAw\n" + + "LoITdGVzdC1ldi1yc2Euc3NsLmNvbYIXd3d3LnRlc3QtZXYtcnNhLnNzbC5jb20w\n" + + "XwYDVR0gBFgwVjAHBgVngQwBATANBgsqhGgBhvZ3AgUBATA8BgwrBgEEAYKpMAED\n" + + "AQQwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cuc3NsLmNvbS9yZXBvc2l0b3J5\n" + + "MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBIBgNVHR8EQTA/MD2gO6A5\n" + + "hjdodHRwOi8vY3Jscy5zc2wuY29tL1NTTGNvbS1TdWJDQS1FVi1TU0wtUlNBLTQw\n" + + "OTYtUjMuY3JsMB0GA1UdDgQWBBTIDVTF3DDhdwudatuodPyHe1jcOzAOBgNVHQ8B\n" + + "Af8EBAMCBaAwggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB1AG9Tdqwx8DEZ2JkA\n" + + "pFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa69CQcUAAAQDAEYwRAIgEYzpfp8v+gG3\n" + + "S9cgZIuFCKPeoSM85gag8/iBJhNIb9oCIDcq+2Pi8+E3LAVmZfgcMhg30t821LNn\n" + + "PWATU5+gAmmzAHUAh3W/51l8+IxDmV+9827/Vo1HVjb/SrVgwbTq/16ggw8AAAFr\n" + + "r0JCCQAABAMARjBEAiAzeyNw/2osk+xktY8VpFTsROj7jRODS2G3G2MDV6ZmMwIg\n" + + "bwuFbNxSEqUfKhveZJVVLYzZtzXcjkhflaazupumZrkAdwC72d+8H4pxtZOUI5eq\n" + + "kntHOFeVCqtS6BqQlmQ2jh7RhQAAAWuvQkGUAAAEAwBIMEYCIQCEfoPIKoy0Rv/d\n" + + "DXOVm0FzKDH2zWHN/oQZ/7gwd21hvAIhAL2gDESf+tcjCkbjdj9NpDa/fVWO9VZD\n" + + "uPPnAZ6jf2G3MA0GCSqGSIb3DQEBCwUAA4ICAQAcYH/+o9N0E3H9h0GfohGElfRw\n" + + "XPUnQI3/CZwuG0ShCbpVspvUkuR/P0Hjr9XgDVy39R9SOaEDK3/coG8/Ry56Lrm0\n" + + "17v+yeEzAVK51eQeinHoCYc9TIwmyrwt36JE/zIwnDB623Y4ccxYN5LZxjVx668/\n" + + "xj3JffaY5185qPjAqkjLUzj9TeeAJk/ws1YXbQJvO4CZV2QXrishC+dEoqvfOe/u\n" + + "sMHcMJy+cFrPhe4cC7s9fHeYTpF36yvfWrgjGwDki/9zgRhOvDuM72dIMkrcHkZi\n" + + "OvZMgyoXz/Nw3D514K9BSt6xRB2qGzI8fx0EOGzEEjX1Zdie2uVDy9aC8k8TjQAM\n" + + "v/YT7Bggpv300hWvBGw0QT8l7Nk1PZFBagAhqRCKRsR1pUZ8CyZzwNkNyUSYV4Or\n" + + "n0vYwVEgpMeSMu/ObWwWPM7QKSNcSSIV5lxmsZX+wS76OpDMHm27P94RTEePF4sG\n" + + "QmvY6hgHSlREJUL0vyGGY2Rbm3cL3zaM4qTquN18v61uUVKakELYIcRZwVTyBj5M\n" + + "KxOkjGXnLYpDOLFHD4WB1q7J+SorG43V+nbmTEN5fshGUjjWoz5ykfErnyJa1+Py\n" + + "FXWoPFb425DelhuDe94btROuJELRfzhqDXoKrhDgSQGV2qM3sk6uIPOaoH4N31ko\n" + + "C41bezSdJ5r4mif8iA==\n" + + "-----END CERTIFICATE-----"; + + // Owner: OID.1.3.6.1.4.1.311.60.2.1.3=US, OID.1.3.6.1.4.1.311.60.2.1.2=Nevada, STREET=3100 Richmond Ave, + // OID.2.5.4.15=Private Organization, OID.2.5.4.17=77098, CN=revoked-rsa-ev.ssl.com, SERIALNUMBER=NV20081614243, + // O=SSL Corp, L=Houston, ST=Texas, C=US + // Issuer: CN=SSL.com EV SSL Intermediate CA RSA R3, O=SSL Corp, L=Houston, ST=Texas, C=US + // Serial number: 1ea7f53492bded2d425135bdf525889f + // Valid from: Mon Jul 01 13:29:02 PDT 2019 until: Wed Jun 30 13:29:02 PDT 2021 + private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" + + "MIIIUzCCBjugAwIBAgIQHqf1NJK97S1CUTW99SWInzANBgkqhkiG9w0BAQsFADBy\n" + + "MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24x\n" + + "ETAPBgNVBAoMCFNTTCBDb3JwMS4wLAYDVQQDDCVTU0wuY29tIEVWIFNTTCBJbnRl\n" + + "cm1lZGlhdGUgQ0EgUlNBIFIzMB4XDTE5MDcwMTIwMjkwMloXDTIxMDYzMDIwMjkw\n" + + "MlowgfQxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91\n" + + "c3RvbjERMA8GA1UECgwIU1NMIENvcnAxFjAUBgNVBAUTDU5WMjAwODE2MTQyNDMx\n" + + "HzAdBgNVBAMMFnJldm9rZWQtcnNhLWV2LnNzbC5jb20xDjAMBgNVBBEMBTc3MDk4\n" + + "MR0wGwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjEaMBgGA1UECQwRMzEwMCBS\n" + + "aWNobW9uZCBBdmUxFzAVBgsrBgEEAYI3PAIBAgwGTmV2YWRhMRMwEQYLKwYBBAGC\n" + + "NzwCAQMTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlqZwW2n7\n" + + "Ot8ujRGyCkzf/FqkiIi6+mq7QXlBMsZVNmLcWzatoS9K8WOviU+lmYpdV3rkrX1v\n" + + "e/FZBwtBR/x1FRN3CPoGcO0Yu6CZjknHtyyNQ36mwUy7UW+rQKYjDfU4aXme4bP8\n" + + "Dk2rUYQtM/xpYHKDk9x7Vg4zAmk+L0LQmSU0103DRuANnxOszEK196UbLE4W+2+i\n" + + "Xat40jHW3KU2PxVfCajgB1mdrDt2b5j/qDAL+Wo2DzCtE62UPJvI6UyEqJ24jinS\n" + + "A4l4NgkMPDMWNU5QIkV/EhQvZMUKCvNUv+Gsq8pcOeDXxKpBIe/KoQSMH18mym1U\n" + + "vIaTjAzDDsWjqwIDAQABo4IDYDCCA1wwHwYDVR0jBBgwFoAUv8Fah/8o+kE9/bdP\n" + + "5B2voGFYKb0wfwYIKwYBBQUHAQEEczBxME0GCCsGAQUFBzAChkFodHRwOi8vd3d3\n" + + "LnNzbC5jb20vcmVwb3NpdG9yeS9TU0xjb20tU3ViQ0EtRVYtU1NMLVJTQS00MDk2\n" + + "LVIzLmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20wPQYDVR0R\n" + + "BDYwNIIWcmV2b2tlZC1yc2EtZXYuc3NsLmNvbYIad3d3LnJldm9rZWQtcnNhLWV2\n" + + "LnNzbC5jb20wXwYDVR0gBFgwVjAHBgVngQwBATANBgsqhGgBhvZ3AgUBATA8Bgwr\n" + + "BgEEAYKpMAEDAQQwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cuc3NsLmNvbS9y\n" + + "ZXBvc2l0b3J5MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBIBgNVHR8E\n" + + "QTA/MD2gO6A5hjdodHRwOi8vY3Jscy5zc2wuY29tL1NTTGNvbS1TdWJDQS1FVi1T\n" + + "U0wtUlNBLTQwOTYtUjMuY3JsMB0GA1UdDgQWBBQnclOL04VraXmRZEkhwgMbajmy\n" + + "YTAOBgNVHQ8BAf8EBAMCBaAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB3AG9T\n" + + "dqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa69DLjEAAAQDAEgwRgIh\n" + + "AMd3B9Gt/hpTCZ+2xsOTTKBaDjh+EsMcKuwZkEpO6UN0AiEA8yiZ9ZIrCOUxsdQp\n" + + "FJi+MtsNQxvgu8igdv+l34jHZA0AdgCHdb/nWXz4jEOZX73zbv9WjUdWNv9KtWDB\n" + + "tOr/XqCDDwAAAWuvQy52AAAEAwBHMEUCIQCFPALMZd6xk4NgYuTXoJGo/FRX0Wub\n" + + "VWSgTZQwld5fTQIgDDp8vajs+7R7XyKOv41xP26NQ3zR4EegwOGeb0paiIIAdQC7\n" + + "2d+8H4pxtZOUI5eqkntHOFeVCqtS6BqQlmQ2jh7RhQAAAWuvQy4MAAAEAwBGMEQC\n" + + "IGFiEQ8fMrjm1bV/mbT35bvJWf4mUbb92/NkHkQvHcaQAiBcS4CclZmzQLj4w6CV\n" + + "JsLf1P6+OhCDtvxWZdndGwJRczANBgkqhkiG9w0BAQsFAAOCAgEAFwE/RMAk871D\n" + + "acLlB0Jb29+WBmCgIu1pA+bh5/lMxn5KoPxkbHPFVHlfenDgZHUNU6DKH4HdCUG7\n" + + "GSAyajLiYRkcrDtBfp5MtNUAqnOJbh2NWiJ3FgSdAjfeSXPhhGfQ3U+0YCWarBfO\n" + + "xZ49eyhTzhHMoW+caJV3jC442Ebzh2X243MwcxqIkjgzWs6duiHnpHfT9gZBl3ou\n" + + "eu85LVFwzxNdrrAx1yG9PA05wCsYYlzwx7fC8ycfbvs+2ORIztiEScyr9VCg5sho\n" + + "YGuBFuP38sWRwiV5K7+EqpGjY+4R3BLWol7lzWsqWJC1J4zkd6Df5reSGBt0wlbx\n" + + "7MdUTXzHMtP8NDIYpdMBrPbkzOKIDzO6bDMsBWWFz7rWCmxUI6sSf0yknPtmBgCd\n" + + "rJAq25V/DqSRGrkaY4Dx1CPGtwYN34fCDLxKeN69rG5mkR2w7HRR5eMXek6oi3Pr\n" + + "hQrKt5NgrYjO6HJ6ABI5xoDM9doXy9BYbz5RX43RTU399aIqyXZh0d3W0rr7wggt\n" + + "+PFRU1OJqhpPQgKsB5zFT3G2HgVBD0hawHS+0Hu+CHpngiDziH+eyvTk3tdhIq2x\n" + + "oDZXs7SSZK6hf/im+7OFSkROy6CwhAn3nxRI9lpag1tTgF4kVSctBv+301ev0twX\n" + + "0w6RymKcvEbcuSDHkzOYWxc1cqwOxjA=\n" + + "-----END CERTIFICATE-----"; + + public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception { + // Validate valid + pathValidator.validate(new String[]{VALID, INT}, + ValidatePathWithParams.Status.GOOD, null, System.out); + + // Validate Revoked + pathValidator.validate(new String[]{REVOKED, INT}, + ValidatePathWithParams.Status.REVOKED, + "Mon Jul 01 20:53:13 PDT 2019", System.out); + } +} + +class SSLCA_ECC { + + // Owner: CN=SSL.com SSL Intermediate CA ECC R2, O=SSL Corp, L=Houston, ST=Texas, C=US + // Issuer: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US + // Serial number: 75e6dfcbc1685ba8 + // Valid from: Fri Feb 12 10:14:03 PST 2016 until: Tue Feb 12 10:14:03 PST 2041 + private static final String INT = "-----BEGIN CERTIFICATE-----\n" + + "MIIDejCCAv+gAwIBAgIQHNcSEt4VENkSgtozEEoQLzAKBggqhkjOPQQDAzB8MQsw\n" + + "CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xGDAW\n" + + "BgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBSb290IENl\n" + + "cnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzAeFw0xOTAzMDcxOTQyNDJaFw0zNDAz\n" + + "MDMxOTQyNDJaMG8xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UE\n" + + "BwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxKzApBgNVBAMMIlNTTC5jb20g\n" + + "U1NMIEludGVybWVkaWF0ZSBDQSBFQ0MgUjIwdjAQBgcqhkjOPQIBBgUrgQQAIgNi\n" + + "AASEOWn30uEYKDLFu4sCjFQ1VupFaeMtQjqVWyWSA7+KFljnsVaFQ2hgs4cQk1f/\n" + + "RQ2INSwdVCYU0i5qsbom20rigUhDh9dM/r6bEZ75eFE899kSCI14xqThYVLPdLEl\n" + + "+dyjggFRMIIBTTASBgNVHRMBAf8ECDAGAQH/AgEAMB8GA1UdIwQYMBaAFILRhXMw\n" + + "5zUE044CkvvlpNHEIejNMHgGCCsGAQUFBwEBBGwwajBGBggrBgEFBQcwAoY6aHR0\n" + + "cDovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkvU1NMY29tLVJvb3RDQS1FQ0MtMzg0\n" + + "LVIxLmNydDAgBggrBgEFBQcwAYYUaHR0cDovL29jc3BzLnNzbC5jb20wEQYDVR0g\n" + + "BAowCDAGBgRVHSAAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATA7BgNV\n" + + "HR8ENDAyMDCgLqAshipodHRwOi8vY3Jscy5zc2wuY29tL3NzbC5jb20tZWNjLVJv\n" + + "b3RDQS5jcmwwHQYDVR0OBBYEFA10Zgpen+Is7NXCXSUEf3Uyuv99MA4GA1UdDwEB\n" + + "/wQEAwIBhjAKBggqhkjOPQQDAwNpADBmAjEAxYt6Ylk/N8Fch/3fgKYKwI5A011Q\n" + + "MKW0h3F9JW/NX/F7oYtWrxljheH8n2BrkDybAjEAlCxkLE0vQTYcFzrR24oogyw6\n" + + "VkgTm92+jiqJTO5SSA9QUa092S5cTKiHkH2cOM6m\n" + + "-----END CERTIFICATE-----"; + + // Owner: CN=test-dv-ecc.ssl.com + // Issuer: CN=SSL.com SSL Intermediate CA ECC R2, O=SSL Corp, L=Houston, ST=Texas, C=US + // Serial number: 1bfbd8e4bea894f3d1887c50e7d366d7 + // Valid from: Fri Jun 28 06:58:27 PDT 2019 until: Sun Jun 27 06:58:27 PDT 2021 + private static final String VALID = "-----BEGIN CERTIFICATE-----\n" + + "MIIE9TCCBHqgAwIBAgIQG/vY5L6olPPRiHxQ59Nm1zAKBggqhkjOPQQDAzBvMQsw\n" + + "CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAP\n" + + "BgNVBAoMCFNTTCBDb3JwMSswKQYDVQQDDCJTU0wuY29tIFNTTCBJbnRlcm1lZGlh\n" + + "dGUgQ0EgRUNDIFIyMB4XDTE5MDYyODEzNTgyN1oXDTIxMDYyNzEzNTgyN1owHjEc\n" + + "MBoGA1UEAwwTdGVzdC1kdi1lY2Muc3NsLmNvbTBZMBMGByqGSM49AgEGCCqGSM49\n" + + "AwEHA0IABJ5u0b8BID+8+TKxn+os0rdwvWB7mUJ4lcCthTADMhnr1VUWBbmBEelB\n" + + "666WbvbVXooPMUbhE5JvhXCTDyI7RRmjggNHMIIDQzAfBgNVHSMEGDAWgBQNdGYK\n" + + "Xp/iLOzVwl0lBH91Mrr/fTB7BggrBgEFBQcBAQRvMG0wSQYIKwYBBQUHMAKGPWh0\n" + + "dHA6Ly93d3cuc3NsLmNvbS9yZXBvc2l0b3J5L1NTTGNvbS1TdWJDQS1TU0wtRUND\n" + + "LTM4NC1SMi5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nwcy5zc2wuY29tMDcG\n" + + "A1UdEQQwMC6CE3Rlc3QtZHYtZWNjLnNzbC5jb22CF3d3dy50ZXN0LWR2LWVjYy5z\n" + + "c2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwGDCsGAQQBgqkwAQMBATAsMCoG\n" + + "CCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29tL3JlcG9zaXRvcnkwHQYDVR0l\n" + + "BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6\n" + + "Ly9jcmxzLnNzbC5jb20vU1NMY29tLVN1YkNBLVNTTC1FQ0MtMzg0LVIyLmNybDAd\n" + + "BgNVHQ4EFgQUGCTbprTbVmmNOgJjUgiHonbu8b8wDgYDVR0PAQH/BAQDAgeAMIIB\n" + + "gQYKKwYBBAHWeQIEAgSCAXEEggFtAWsAdwCHdb/nWXz4jEOZX73zbv9WjUdWNv9K\n" + + "tWDBtOr/XqCDDwAAAWueaoEnAAAEAwBIMEYCIQCdy3N9w0pem1XShE/rkVSpHxQb\n" + + "8QdUu3E6R+oncxOGXgIhAJoWg2gJYc9DWDl5ImnrqsmVS6OPgSQRvDsjRIN9gH7a\n" + + "AHcAu9nfvB+KcbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YUAAAFrnmqArQAABAMA\n" + + "SDBGAiEAs2yfi9e1h6dTQbe4WPd7+5qf7kvP7Vr2k0nAtBS1IgECIQCQYL9he9J4\n" + + "Bh5cpQezTVPgLAOGcf5xIcCrBs1QJe66/AB3AFWB1MIWkDYBSuoLm1c8U/DA5Dh4\n" + + "cCUIFy+jqh0HE9MMAAABa55qgaEAAAQDAEgwRgIhAI/27txsvzpbBXkMICi/UOzE\n" + + "t8uZidbF9KSwmGRPT/6gAiEAhm/VeWHDeWK8gFMU+f0/x4jK7UbzySGBvPzbPpNd\n" + + "EDwwCgYIKoZIzj0EAwMDaQAwZgIxAJKn8Hr68Z/2rA+VHfZo8eeIFaZ3nvSvQO92\n" + + "1Byl6cPAm8DsdCnYT16uNSL8Zb5IQAIxAOFLsqPDCSAYkpgutAnVgwI+c549SIRU\n" + + "k8ol+wUx6zgMmt8VHYagyj6IO0GRDjm/eA==\n" + + "-----END CERTIFICATE-----"; + + // Owner: CN=revoked-ecc-dv.ssl.com + // Issuer: CN=SSL.com SSL Intermediate CA ECC R2, O=SSL Corp, L=Houston, ST=Texas, C=US + // Serial number: 423c2b57dfa379d0c45ffceb6284ed99 + // Valid from: Fri Jun 28 07:09:30 PDT 2019 until: Sun Jun 27 07:09:30 PDT 2021 + private static final String REVOKED = "-----BEGIN CERTIFICATE-----\n" + + "MIIE+TCCBH+gAwIBAgIQQjwrV9+jedDEX/zrYoTtmTAKBggqhkjOPQQDAzBvMQsw\n" + + "CQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAP\n" + + "BgNVBAoMCFNTTCBDb3JwMSswKQYDVQQDDCJTU0wuY29tIFNTTCBJbnRlcm1lZGlh\n" + + "dGUgQ0EgRUNDIFIyMB4XDTE5MDYyODE0MDkzMFoXDTIxMDYyNzE0MDkzMFowITEf\n" + + "MB0GA1UEAwwWcmV2b2tlZC1lY2MtZHYuc3NsLmNvbTBZMBMGByqGSM49AgEGCCqG\n" + + "SM49AwEHA0IABH4nWtnAwPIdcQOSNI72IJJ/I1ZL2XQUAfa3ox5taFQQAalng6N9\n" + + "Od9t9de1vIMDzUvs5sMWw4YrqAlywFKMraajggNJMIIDRTAfBgNVHSMEGDAWgBQN\n" + + "dGYKXp/iLOzVwl0lBH91Mrr/fTB7BggrBgEFBQcBAQRvMG0wSQYIKwYBBQUHMAKG\n" + + "PWh0dHA6Ly93d3cuc3NsLmNvbS9yZXBvc2l0b3J5L1NTTGNvbS1TdWJDQS1TU0wt\n" + + "RUNDLTM4NC1SMi5jcnQwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3Nwcy5zc2wuY29t\n" + + "MD0GA1UdEQQ2MDSCFnJldm9rZWQtZWNjLWR2LnNzbC5jb22CGnd3dy5yZXZva2Vk\n" + + "LWVjYy1kdi5zc2wuY29tMFEGA1UdIARKMEgwCAYGZ4EMAQIBMDwGDCsGAQQBgqkw\n" + + "AQMBATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5zc2wuY29tL3JlcG9zaXRv\n" + + "cnkwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMEQGA1UdHwQ9MDswOaA3\n" + + "oDWGM2h0dHA6Ly9jcmxzLnNzbC5jb20vU1NMY29tLVN1YkNBLVNTTC1FQ0MtMzg0\n" + + "LVIyLmNybDAdBgNVHQ4EFgQUY7q+xN9nV1nPQ/dJ5rUC8OKgaoMwDgYDVR0PAQH/\n" + + "BAQDAgeAMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdQBElGUusO7Or8RAB9io\n" + + "/ijA2uaCvtjLMbU/0zOWtbaBqAAAAWuedJ/tAAAEAwBGMEQCIGPBF546Tn/lzB22\n" + + "ICpFLOWOIyIOPwL9S4ikS8Vt1aFTAiBe8mp/WCJnV7WxMIVWEUSLVOYn7erwyu6D\n" + + "hWNIST4W8wB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABa550\n" + + "oQEAAAQDAEcwRQIhAJ3nwLI7kLP2SKicFKuJoqRYKE/FR2Ff65WL+iWxm/6nAiAJ\n" + + "cd9EKnBETwM9qQfKoSSs2oTQL4QjSKJZi/sPfKQaagB2ALvZ37wfinG1k5Qjl6qS\n" + + "e0c4V5UKq1LoGpCWZDaOHtGFAAABa550oH4AAAQDAEcwRQIhAIo6k5BMSFN3FnD4\n" + + "UFbyJJG/Bujh+OFTYzVM8vuIBoU0AiAhBe+air4wHvd68ykK6xOPv9Qshje9F6LC\n" + + "gxTqbMOEkDAKBggqhkjOPQQDAwNoADBlAjEAyayBtbcCQB0fE+cCc7OHLuNvb9tl\n" + + "uiHWy/Ika6IA72WJLLmED971ik08OMa2mGt4AjAklxdElQ5Z/nSeJ2CNEwD7pcYz\n" + + "468kkrMoGU2lk3QmwcXZscPIoh4Pwew6QteY4J0=\n" + + "-----END CERTIFICATE-----"; + + public void runTest(ValidatePathWithParams pathValidator, boolean ocspEnabled) throws Exception { + // Validate valid + pathValidator.validate(new String[]{VALID, INT}, + ValidatePathWithParams.Status.GOOD, null, System.out); + + // Validate Revoked + pathValidator.validate(new String[]{REVOKED, INT}, + ValidatePathWithParams.Status.REVOKED, + "Fri Jun 28 07:59:20 PDT 2019", System.out); + } +} diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java index b7b51d91b64..5e73bd9a602 100644 --- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java +++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java @@ -26,7 +26,7 @@ * @test * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779 * 8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136 - * 8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 + * 8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320 * @summary Check root CA entries in cacerts file */ import java.io.ByteArrayInputStream; @@ -52,12 +52,12 @@ public class VerifyCACerts { + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. - private static final int COUNT = 92; + private static final int COUNT = 95; // SHA-256 of cacerts, can be generated with // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 private static final String CHECKSUM - = "44:AE:94:16:D1:2A:5B:CB:C3:89:19:D5:7A:87:C9:4A:E1:D4:ED:24:81:25:0A:0F:70:75:08:2A:D5:90:93:8B"; + = "84:BB:36:9E:B0:07:A7:C5:7F:38:EC:36:82:5C:0F:46:C0:35:3B:B1:1F:06:C2:D0:47:B9:39:FA:87:64:E5:9D"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") @@ -247,6 +247,12 @@ public class VerifyCACerts { "E3:5D:28:41:9E:D0:20:25:CF:A6:90:38:CD:62:39:62:45:8D:A5:C6:95:FB:DE:A3:C2:2B:0B:FB:25:89:70:92"); put("entrustrootcag4 [jdk]", "DB:35:17:D1:F6:73:2A:2D:5A:B9:7C:53:3E:C7:07:79:EE:32:70:A6:2F:B4:AC:42:38:37:24:60:E6:F0:1E:88"); + put("sslrootrsaca [jdk]", + "85:66:6A:56:2E:E0:BE:5C:E9:25:C1:D8:89:0A:6F:76:A8:7E:C1:6D:4D:7D:5F:29:EA:74:19:CF:20:12:3B:69"); + put("sslrootevrsaca [jdk]", + "2E:7B:F1:6C:C2:24:85:A7:BB:E2:AA:86:96:75:07:61:B0:AE:39:BE:3B:2F:E9:D0:CC:6D:4E:F7:34:91:42:5C"); + put("sslrooteccca [jdk]", + "34:17:BB:06:CC:60:07:DA:1B:96:1C:92:0B:8A:B4:CE:3F:AD:82:0E:4A:A3:0B:9A:CB:C4:A7:4E:BD:CE:BC:65"); } }; From d12fdfa3b75a72c7f78a625f3774a35ac147960e Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Mon, 3 Aug 2020 16:11:41 -0700 Subject: [PATCH 042/100] 8250750: JDK-8247515 fix for OSX pc_to_symbol() lookup fails with some symbols Reviewed-by: sspitsyn, kevinw --- .../macosx/native/libsaproc/libproc_impl.c | 13 ++++++------- .../macosx/native/libsaproc/libproc_impl.h | 6 +++--- .../macosx/native/libsaproc/ps_core.c | 2 +- .../macosx/native/libsaproc/symtab.c | 14 +++++++++++++- .../macosx/native/libsaproc/symtab.h | 4 ++-- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c index ed61b6d1cac..9c902c6450f 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c @@ -208,12 +208,12 @@ void Prelease(struct ps_prochandle* ph) { free(ph); } -lib_info* add_lib_info(struct ps_prochandle* ph, const char* libname, uintptr_t base, size_t memsz) { - return add_lib_info_fd(ph, libname, -1, base, memsz); +lib_info* add_lib_info(struct ps_prochandle* ph, const char* libname, uintptr_t base) { + return add_lib_info_fd(ph, libname, -1, base); } -lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, uintptr_t base, size_t memsz) { - lib_info* newlib; +lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, uintptr_t base) { + lib_info* newlib; print_debug("add_lib_info_fd %s\n", libname); if ( (newlib = (lib_info*) calloc(1, sizeof(struct lib_info))) == NULL) { @@ -229,7 +229,6 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, strcpy(newlib->name, libname); newlib->base = base; - newlib->memsz = memsz; if (fd == -1) { if ( (newlib->fd = pathmap_open(newlib->name)) < 0) { @@ -259,11 +258,11 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, } #endif // __APPLE__ - newlib->symtab = build_symtab(newlib->fd); + newlib->symtab = build_symtab(newlib->fd, &newlib->memsz); if (newlib->symtab == NULL) { print_debug("symbol table build failed for %s\n", newlib->name); } else { - print_debug("built symbol table for 0x%lx %s\n", newlib, newlib->name); + print_debug("built symbol table for 0x%lx memsz=0x%lx %s\n", newlib, newlib->memsz, newlib->name); } // even if symbol table building fails, we add the lib_info. diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h index 51694673fe0..8c60e445d36 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h @@ -36,6 +36,7 @@ #include #include #include +#include #ifndef register_t #define register_t uint64_t @@ -171,11 +172,10 @@ typedef bool (*thread_info_callback)(struct ps_prochandle* ph, pthread_t pid, lw bool read_thread_info(struct ps_prochandle* ph, thread_info_callback cb); // adds a new shared object to lib list, returns NULL on failure -lib_info* add_lib_info(struct ps_prochandle* ph, const char* libname, uintptr_t base, size_t memsz); +lib_info* add_lib_info(struct ps_prochandle* ph, const char* libname, uintptr_t base); // adds a new shared object to lib list, supply open lib file descriptor as well -lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, - uintptr_t base, size_t memsz); +lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, uintptr_t base); sa_thread_info* add_thread_info(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id); // a test for ELF signature without using libelf diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c index 336124f67c8..fe70b0b78d4 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c @@ -507,7 +507,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) { } else { break; // Ignore non-relative paths, which are system libs. See JDK-8249779. } - add_lib_info(ph, name, iter->vaddr, iter->memsz); + add_lib_info(ph, name, iter->vaddr); break; } } diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c index df70737392c..52fd791117d 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.c @@ -93,11 +93,12 @@ void build_search_table(symtab_t *symtab) { } // read symbol table from given fd. -struct symtab* build_symtab(int fd) { +struct symtab* build_symtab(int fd, size_t *p_max_offset) { symtab_t* symtab = NULL; int i, j; mach_header_64 header; off_t image_start; + size_t max_offset = 0; print_debug("build_symtab\n"); if (!get_arch_off(fd, CPU_TYPE_X86_64, &image_start)) { @@ -187,6 +188,11 @@ struct symtab* build_symtab(int fd) { if (stridx == 0 || offset == 0) { continue; // Skip this entry. It's not a reference to code or data } + if (lentry.n_type == N_OSO) { + // This is an object file name/path. These entries have something other than + // an offset in lentry.n_value, so we need to ignore them. + continue; + } symtab->symbols[i].offset = offset; symtab->symbols[i].name = symtab->strs + stridx; symtab->symbols[i].size = strlen(symtab->symbols[i].name); @@ -195,6 +201,11 @@ struct symtab* build_symtab(int fd) { continue; // Skip this entry. It points to an empty string. } + // Track the maximum offset we've seen. This is used to determine the address range + // that the library covers. + if (offset > max_offset) { + max_offset = (offset + 4096) & ~0xfff; // Round up to next page boundary + } print_debug("symbol read: %d %d n_type=0x%x n_sect=0x%x n_desc=0x%x n_strx=0x%lx offset=0x%lx %s\n", j, i, lentry.n_type, lentry.n_sect, lentry.n_desc, stridx, offset, symtab->symbols[i].name); i++; @@ -212,6 +223,7 @@ struct symtab* build_symtab(int fd) { // build a hashtable for fast query build_search_table(symtab); + *p_max_offset = max_offset; return symtab; quit: if (symtab) destroy_symtab(symtab); diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h index f5f8645dabc..a55fbaa1467 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/symtab.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -32,7 +32,7 @@ struct symtab; // build symbol table for a given ELF or MachO file escriptor -struct symtab* build_symtab(int fd); +struct symtab* build_symtab(int fd, size_t *p_max_offset); // destroy the symbol table void destroy_symtab(struct symtab* symtab); From 54bed60bfeb0870bcbc438fdead7fcbfbbaeed29 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Mon, 3 Aug 2020 17:38:22 -0700 Subject: [PATCH 043/100] 8250750: JDK-8247515 fix for OSX pc_to_symbol() lookup fails with some symbols 8249150: SA core file tests sometimes time out on OSX with "java.io.IOException: App waiting timeout" Reviewed-by: sspitsyn, amenkov --- test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java | 2 +- test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java | 2 +- test/lib/jdk/test/lib/apps/LingeredApp.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java index 0e0cc487adc..ef9d3e056ed 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java @@ -45,7 +45,7 @@ import jtreg.SkippedException; * @summary Test clhsdb pmap command on a core file * @requires vm.hasSA * @library /test/lib - * @run main/othervm ClhsdbPmap true + * @run main/othervm/timeout=240 ClhsdbPmap true */ public class ClhsdbPmap { diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java index 4bb3de814ff..b8409ec6eb8 100644 --- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java @@ -45,7 +45,7 @@ import jtreg.SkippedException; * @summary Test clhsdb pstack command on a core file * @requires vm.hasSA * @library /test/lib - * @run main/othervm ClhsdbPstack true + * @run main/othervm/timeout=240 ClhsdbPstack true */ public class ClhsdbPstack { diff --git a/test/lib/jdk/test/lib/apps/LingeredApp.java b/test/lib/jdk/test/lib/apps/LingeredApp.java index 6ff7ce6b00a..68381053aa9 100644 --- a/test/lib/jdk/test/lib/apps/LingeredApp.java +++ b/test/lib/jdk/test/lib/apps/LingeredApp.java @@ -92,6 +92,7 @@ public class LingeredApp { protected Process appProcess; protected OutputBuffer output; protected static final int appWaitTime = 100; + protected static final int appCoreWaitTime = 240; protected final String lockFileName; protected boolean forceCrash = false; // set true to force a crash and core file @@ -291,7 +292,7 @@ public class LingeredApp { * Waits for the application to start with the default timeout. */ public void waitAppReady() throws IOException { - waitAppReady(appWaitTime); + waitAppReady(forceCrash ? appCoreWaitTime : appWaitTime); } /** From 4bd94fb9ea928892e410ceeede113b6b476d76d9 Mon Sep 17 00:00:00 2001 From: Mikhailo Seledtsov Date: Mon, 3 Aug 2020 18:58:53 -0700 Subject: [PATCH 044/100] 8250986: Problem list docker/TestMemoryAwareness.java and docker/TestDockerMemoryMetrics.java for linux-5.4.0-1019-oracle Problem listed the tests Reviewed-by: dholmes --- test/hotspot/jtreg/ProblemList.txt | 1 + test/jdk/ProblemList.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 1b43ac6acc7..990114dd245 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -85,6 +85,7 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64 runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64 runtime/ReservedStack/ReservedStackTest.java 8231031 generic-all +containers/docker/TestMemoryAwareness.java 8250984 linux-5.4.0-1019-oracle ############################################################################# diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index a27a12e5c5d..cc99f6146b2 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -916,6 +916,8 @@ jdk/jfr/event/os/TestThreadContextSwitches.java 8247776 windows- # jdk_internal +jdk/internal/platform/docker/TestDockerMemoryMetrics.java 8250984 linux-5.4.0-1019-oracle + ############################################################################ # jdk_jpackage From 00d223cff60af8e80ea30f7cd529ab03a24c6669 Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Mon, 3 Aug 2020 22:10:31 -0700 Subject: [PATCH 045/100] 8250899: Backout JDK-8249628 from jdk/jdk Reviewed-by: erikj --- make/autoconf/version-numbers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/autoconf/version-numbers b/make/autoconf/version-numbers index b5becc2e4bb..81874ad65f1 100644 --- a/make/autoconf/version-numbers +++ b/make/autoconf/version-numbers @@ -38,7 +38,7 @@ DEFAULT_VERSION_CLASSFILE_MAJOR=60 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" DEFAULT_VERSION_CLASSFILE_MINOR=0 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="14 15 16" DEFAULT_JDK_SOURCE_TARGET_VERSION=16 -DEFAULT_PROMOTED_VERSION_PRE= +DEFAULT_PROMOTED_VERSION_PRE=ea LAUNCHER_NAME=openjdk PRODUCT_NAME=OpenJDK From 39616b4d7cf49a89744b42d4c11425f71b41365b Mon Sep 17 00:00:00 2001 From: Yasumasa Suenaga Date: Tue, 4 Aug 2020 15:28:27 +0900 Subject: [PATCH 046/100] 8250930: [TESTBUG] Some forceEarlyReturn00* tests failed due to compiler optimization Reviewed-by: cjplummer, dholmes --- .../libforceEarlyReturn004a.cpp | 19 ++++++------------- .../libforceEarlyReturn002a.cpp | 19 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/libforceEarlyReturn004a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/libforceEarlyReturn004a.cpp index f343576d59c..879beacf5be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/libforceEarlyReturn004a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/libforceEarlyReturn004a.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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,27 +26,20 @@ extern "C" { -int always_true = 1; - JNIEXPORT jint JNICALL Java_nsk_jdi_ThreadReference_forceEarlyReturn_forceEarlyReturn004_forceEarlyReturn004a_nativeMethod(JNIEnv *env, jobject classObject, jobject object) { - int dummy_counter = 0; + static volatile int dummy_counter = 0; // notify another thread that thread in native method jclass klass = env->GetObjectClass(object); jfieldID field = env->GetFieldID(klass, "threadInNative", "Z"); env->SetBooleanField(object, field, 1); // execute infinite loop to be sure that thread in native method - while (always_true) - { - // Need some dummy code so the optimizer does not remove this loop. - dummy_counter = dummy_counter < 1000 ? 0 : dummy_counter + 1; - } - // The optimizer can be surprisingly clever. - // Use dummy_counter so it can never be optimized out. - // This statement will always return 0. - return dummy_counter >= 0 ? 0 : 1; + while (dummy_counter == 0) {} + + // Should not reach here + return 0; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.cpp index 24f8319c505..79d46c3095e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/libforceEarlyReturn002a.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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,27 +26,20 @@ extern "C" { -int always_true = 1; - JNIEXPORT jint JNICALL Java_nsk_jdwp_ThreadReference_ForceEarlyReturn_forceEarlyReturn002_forceEarlyReturn002a_nativeMethod(JNIEnv *env, jobject classObject, jobject object) { - int dummy_counter = 0; + static volatile int dummy_counter = 0; // notify another thread that thread in native method jclass klass = env->GetObjectClass(object); jfieldID field = env->GetFieldID(klass, "threadInNative", "Z"); env->SetBooleanField(object, field, 1); // execute infinite loop to be sure that thread in native method - while (always_true) - { - // Need some dummy code so the optimizer does not remove this loop. - dummy_counter = dummy_counter < 1000 ? 0 : dummy_counter + 1; - } - // The optimizer can be surprisingly clever. - // Use dummy_counter so it can never be optimized out. - // This statement will always return 0. - return dummy_counter >= 0 ? 0 : 1; + while (dummy_counter == 0) {} + + // Should not reach here + return 0; } } From b0ceab23dd4176329cbf3a95f21e8e9ac2d8723f Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Tue, 4 Aug 2020 04:19:23 -0400 Subject: [PATCH 047/100] 8250652: Add logical operations on types Add stand-ins for C++17 logical operations on types. Reviewed-by: eosterlund, tschatzl --- src/hotspot/share/metaprogramming/logical.hpp | 64 +++++++++++++ .../gtest/metaprogramming/test_logical.cpp | 91 +++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 src/hotspot/share/metaprogramming/logical.hpp create mode 100644 test/hotspot/gtest/metaprogramming/test_logical.cpp diff --git a/src/hotspot/share/metaprogramming/logical.hpp b/src/hotspot/share/metaprogramming/logical.hpp new file mode 100644 index 00000000000..a488b94f8b9 --- /dev/null +++ b/src/hotspot/share/metaprogramming/logical.hpp @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_METAPROGRAMMING_LOGICAL_HPP +#define SHARE_METAPROGRAMMING_LOGICAL_HPP + +// Stand-ins for C++17 logical operations on types. + +#include + +// Stand-in for C++17 std::bool_constant. +template +using BoolConstant = std::integral_constant; + +// Stand-in for C++17 std::conjunction +template +struct Conjunction : public std::true_type {}; + +template +struct Conjunction : public T1 {}; + +template +struct Conjunction : + public std::conditional_t, T1> +{}; + +// Stand-in for C++17 std::disjunction. +template +struct Disjunction : public std::false_type {}; + +template +struct Disjunction : public T1 {}; + +template +struct Disjunction : + public std::conditional_t> +{}; + +// Stand-in for C++17 std::negation. +template +using Negation = BoolConstant; + +#endif // SHARE_METAPROGRAMMING_LOGICAL_HPP diff --git a/test/hotspot/gtest/metaprogramming/test_logical.cpp b/test/hotspot/gtest/metaprogramming/test_logical.cpp new file mode 100644 index 00000000000..b61b4e92431 --- /dev/null +++ b/test/hotspot/gtest/metaprogramming/test_logical.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "metaprogramming/logical.hpp" +#include + +class TestBoolConstant { + static_assert(BoolConstant::value, "true"); + static_assert(!BoolConstant::value, "false"); +}; + +class TestConjunction { + class A : public std::true_type {}; + class B : public std::true_type {}; + class C : public std::false_type {}; + class D : public std::false_type {}; + + static_assert(Conjunction<>::value, "nullary value"); + + static_assert(Conjunction::value, "true value"); + static_assert(std::is_base_of>::value, "true type"); + + static_assert(!Conjunction::value, "false value"); + static_assert(std::is_base_of>::value, "false type"); + + static_assert(Conjunction::value, "true/true value"); + static_assert(std::is_base_of>::value, "true/true type"); + + static_assert(!Conjunction::value, "true/false value"); + static_assert(std::is_base_of>::value, "true/false type"); + + static_assert(!Conjunction::value, "false/true value"); + static_assert(std::is_base_of>::value, "false/true type"); + + static_assert(!Conjunction::value, "false/false value"); + static_assert(std::is_base_of>::value, "false/false type"); +}; + +class TestDisjunction { + class A : public std::true_type {}; + class B : public std::true_type {}; + class C : public std::false_type {}; + class D : public std::false_type {}; + + static_assert(!Disjunction<>::value, "nullary value"); + + static_assert(Disjunction::value, "true value"); + static_assert(std::is_base_of>::value, "true type"); + + static_assert(!Disjunction::value, "false value"); + static_assert(std::is_base_of>::value, "false type"); + + static_assert(Disjunction::value, "true/true value"); + static_assert(std::is_base_of>::value, "true/true type"); + + static_assert(Disjunction::value, "true/false value"); + static_assert(std::is_base_of>::value, "true/false type"); + + static_assert(Disjunction::value, "false/true value"); + static_assert(std::is_base_of>::value, "false/true type"); + + static_assert(!Disjunction::value, "false/false value"); + static_assert(std::is_base_of>::value, "false/false type"); +}; + +class TestNegation { + static_assert(Negation::value, "false -> true"); + static_assert(!Negation::value, "true -> false"); +}; From 38af8be9844bfbae1640279506d6fe92561c94aa Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Tue, 4 Aug 2020 10:26:39 -0700 Subject: [PATCH 048/100] 8022795: Method.isVarargs of dynamic proxy generated method to match the proxy interface method Reviewed-by: rriggs, darcy --- .../java/lang/reflect/ProxyGenerator.java | 5 +- .../java/lang/reflect/Proxy/TestVarArgs.java | 115 ++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 test/jdk/java/lang/reflect/Proxy/TestVarArgs.java diff --git a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java index ce627f1f23e..3fc01aad882 100644 --- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java +++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java @@ -670,7 +670,10 @@ final class ProxyGenerator extends ClassWriter { private void generateMethod(ClassWriter cw, String className) { MethodType mt = MethodType.methodType(returnType, parameterTypes); String desc = mt.toMethodDescriptorString(); - MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_FINAL, + int accessFlags = ACC_PUBLIC | ACC_FINAL; + if (method.isVarArgs()) accessFlags |= ACC_VARARGS; + + MethodVisitor mv = cw.visitMethod(accessFlags, method.getName(), desc, null, typeNames(Arrays.asList(exceptionTypes))); diff --git a/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java b/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java new file mode 100644 index 00000000000..a472f75d4b7 --- /dev/null +++ b/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8022795 + * @run testng TestVarArgs + * @summary Verify if a method defined in a proxy interface has ACC_VARARGS set + */ + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +public class TestVarArgs { + interface I { + Object call(Object... values); + } + interface J { + Object call(Object[] values); + } + + @DataProvider(name = "proxyInterfaces") + public Object[][] proxyInterfaces() { + return new Object[][] { + { new Class[] { I.class }, true}, + { new Class[] { J.class }, false}, + { new Class[] { I.class, J.class }, true}, + { new Class[] { J.class, I.class }, false}, + }; + } + + @Test(dataProvider = "proxyInterfaces") + public void testMethod(Class[] proxyInterfaces, boolean isVarArgs) throws Throwable { + // check if the first proxy interface with the method named "call" declares var result + Method m = proxyInterfaces[0].getMethod("call", Object[].class); + assertTrue(m.isVarArgs() == isVarArgs); + + // the method in the generated proxy class should match the method + // declared in the proxy interface + Object proxy = Proxy.newProxyInstance(TestVarArgs.class.getClassLoader(), + proxyInterfaces, IH); + Class proxyClass = proxy.getClass(); + assertTrue(Proxy.isProxyClass(proxyClass)); + Method method = proxyClass.getMethod("call", Object[].class); + assertTrue(method.isVarArgs() == isVarArgs); + + Object params = new Object[] { "foo", "bar", "goo" }; + Object result; + + // test reflection + result = method.invoke(proxy, params); + assertEquals(result, params); + + // test method handle + MethodHandle mh = MethodHandles.lookup().findVirtual(proxyClass, "call", + MethodType.methodType(Object.class, Object[].class)); + assertTrue(mh.isVarargsCollector() == isVarArgs); + MethodHandle mhVarArity = mh; + MethodHandle mhFixedArity = mh; + if (isVarArgs) { + mhFixedArity = mh.asFixedArity(); + } else { + mhVarArity = mh.asVarargsCollector(Object[].class); + } + result = mhVarArity.invoke(proxy, "foo", "bar", "goo"); + assertEquals(result, params); + + result = mhFixedArity.invoke(proxy, params); + assertEquals(result, params); + + if (!isVarArgs) { + MethodType mt = MethodType.methodType(Object.class, Object.class, String.class, String.class, String.class); + mh = mh.asVarargsCollector(Object[].class).asType(mt); + } + result = mh.invoke(proxy, "foo", "bar", "goo"); + assertEquals(result, params); + } + + private static final InvocationHandler IH = new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + return args[0]; + } + }; + +} From f4de95a97c29fd1b8872333c6c006bd11f40f287 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Tue, 4 Aug 2020 10:36:02 -0700 Subject: [PATCH 049/100] 8250219: Proxy::newProxyInstance spec should specify the behavior if a given proxy interface is hidden Reviewed-by: alanb --- .../classes/java/lang/reflect/Proxy.java | 19 +++--- .../reflect/Proxy/HiddenProxyInterface.java | 62 +++++++++++++++++++ 2 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java index 1a2d7f668ab..2f2ec3bba34 100644 --- a/src/java.base/share/classes/java/lang/reflect/Proxy.java +++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java @@ -674,12 +674,6 @@ public class Proxy implements java.io.Serializable { { Map, Boolean> interfaceSet = new IdentityHashMap<>(interfaces.size()); for (Class intf : interfaces) { - /* - * Verify that the class loader resolves the name of this - * interface to the same Class object. - */ - ensureVisible(loader, intf); - /* * Verify that the Class object actually represents an * interface. @@ -688,6 +682,16 @@ public class Proxy implements java.io.Serializable { throw new IllegalArgumentException(intf.getName() + " is not an interface"); } + if (intf.isHidden()) { + throw new IllegalArgumentException(intf.getName() + " is a hidden interface"); + } + + /* + * Verify that the class loader resolves the name of this + * interface to the same Class object. + */ + ensureVisible(loader, intf); + /* * Verify that this interface is not a duplicate. */ @@ -905,7 +909,8 @@ public class Proxy implements java.io.Serializable { * if any of the following restrictions is violated: *
      *
    • All of {@code Class} objects in the given {@code interfaces} array - * must represent interfaces, not classes or primitive types. + * must represent {@linkplain Class#isHidden() non-hidden} interfaces, + * not classes or primitive types. * *
    • No two elements in the {@code interfaces} array may * refer to identical {@code Class} objects. diff --git a/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java b/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java new file mode 100644 index 00000000000..e52d3671ab6 --- /dev/null +++ b/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8250219 + * @run testng HiddenProxyInterface + */ + +import java.lang.invoke.MethodHandles; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +public class HiddenProxyInterface { + private static final Path CLASSES_DIR = Paths.get(System.getProperty("test.classes")); + + interface Intf { + void m(); + } + + @Test(expectedExceptions = { IllegalArgumentException.class }) + public void testHiddenInterface() throws Exception { + Path classFile = CLASSES_DIR.resolve("HiddenProxyInterface$Intf.class"); + byte[] bytes = Files.readAllBytes(classFile); + Class hiddenIntf = MethodHandles.lookup().defineHiddenClass(bytes, false).lookupClass(); + Proxy.newProxyInstance(HiddenProxyInterface.class.getClassLoader(), + new Class[]{ hiddenIntf }, + new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + return null; + } + }); + } +} From d7c7f70a6ad5e8ee44e86dd1c4e6b713e591dee1 Mon Sep 17 00:00:00 2001 From: Calvin Cheung Date: Tue, 4 Aug 2020 19:17:31 +0000 Subject: [PATCH 050/100] 8249586: Test runtime/cds/appcds/DirClasspathTest.java will fail if run twice Add the StandardCopyOption.REPLACE_EXISTING option when calling Files.copy(). Reviewed-by: iklam --- test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java b/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java index b2495d3b6e1..a6ed18760a0 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/DirClasspathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -38,6 +38,7 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.util.Arrays; public class DirClasspathTest { @@ -118,7 +119,7 @@ public class DirClasspathTest { // Long path to non-empty dir in -cp: should report error if a class is loaded from it File srcClass = new File(classDir.toFile(), "Super.class"); File destClass = new File(longDir, "Super.class"); - Files.copy(srcClass.toPath(), destClass.toPath()); + Files.copy(srcClass.toPath(), destClass.toPath(), StandardCopyOption.REPLACE_EXISTING); output = doDump(longDir.getPath(), appClassList2, "-Xlog:class+path=info"); output.shouldNotHaveExitValue(0); output.shouldContain("Cannot have non-empty directory in paths"); From c79e6346d0396b72bc4f7c4371683e7e06ae59e4 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Tue, 4 Aug 2020 13:16:45 -0700 Subject: [PATCH 051/100] 8250233: -XX:+CITime triggers guarantee(events != NULL) in jvmci.cpp:173 Add missing EnableJVMCI flag check. Refactoring compiler print statistic code. Reviewed-by: thartmann --- .../share/compiler/abstractCompiler.hpp | 18 +- src/hotspot/share/compiler/compileBroker.cpp | 156 ++++++++---------- src/hotspot/share/compiler/compileBroker.hpp | 6 +- src/hotspot/share/jvmci/jvmciCompiler.cpp | 8 +- 4 files changed, 87 insertions(+), 101 deletions(-) diff --git a/src/hotspot/share/compiler/abstractCompiler.hpp b/src/hotspot/share/compiler/abstractCompiler.hpp index 922121ec29e..f00863e9b2a 100644 --- a/src/hotspot/share/compiler/abstractCompiler.hpp +++ b/src/hotspot/share/compiler/abstractCompiler.hpp @@ -31,7 +31,6 @@ typedef void (*initializer)(void); -#if INCLUDE_JVMCI // Per-compiler statistics class CompilerStatistics { friend class VMStructs; @@ -58,17 +57,20 @@ class CompilerStatistics { Data _osr; // stats for OSR compilations int _nmethods_size; // int _nmethods_code_size; - int bytes_per_second() { + + double total_time() { return _standard._time.seconds() + _osr._time.seconds(); } + + double bytes_per_second() { int bytes = _standard._bytes + _osr._bytes; if (bytes == 0) { - return 0; + return 0.0; } - double seconds = _standard._time.seconds() + _osr._time.seconds(); - return seconds == 0.0 ? 0 : (int) (bytes / seconds); + double seconds = total_time(); + return seconds == 0.0 ? 0.0 : (bytes / seconds); } + CompilerStatistics() : _nmethods_size(0), _nmethods_code_size(0) {} }; -#endif // INCLUDE_JVMCI class AbstractCompiler : public CHeapObj { private: @@ -86,9 +88,7 @@ class AbstractCompiler : public CHeapObj { private: const CompilerType _type; -#if INCLUDE_JVMCI CompilerStatistics _stats; -#endif public: AbstractCompiler(CompilerType type) : _num_compiler_threads(0), _compiler_state(uninitialized), _type(type) {} @@ -176,9 +176,7 @@ class AbstractCompiler : public CHeapObj { ShouldNotReachHere(); } -#if INCLUDE_JVMCI CompilerStatistics* stats() { return &_stats; } -#endif }; #endif // SHARE_COMPILER_ABSTRACTCOMPILER_HPP diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp index b399ad138e2..50521eb1129 100644 --- a/src/hotspot/share/compiler/compileBroker.cpp +++ b/src/hotspot/share/compiler/compileBroker.cpp @@ -181,6 +181,8 @@ int CompileBroker::_sum_nmethod_code_size = 0; long CompileBroker::_peak_compilation_time = 0; +CompilerStatistics CompileBroker::_stats_per_level[CompLevel_full_optimization]; + CompileQueue* CompileBroker::_c2_compile_queue = NULL; CompileQueue* CompileBroker::_c1_compile_queue = NULL; @@ -1599,6 +1601,7 @@ static const int JVMCI_COMPILATION_PROGRESS_WAIT_ATTEMPTS = 10; * @return true if this thread needs to free/recycle the task */ bool CompileBroker::wait_for_jvmci_completion(JVMCICompiler* jvmci, CompileTask* task, JavaThread* thread) { + assert(UseJVMCICompiler, "sanity"); MonitorLocker ml(thread, task->lock()); int progress_wait_attempts = 0; int methods_compiled = jvmci->methods_compiled(); @@ -2458,6 +2461,7 @@ void CompileBroker::collect_statistics(CompilerThread* thread, elapsedTimer time methodHandle method (thread, task->method()); uint compile_id = task->compile_id(); bool is_osr = (task->osr_bci() != standard_entry_bci); + const int comp_level = task->comp_level(); nmethod* code = task->code(); CompilerCounters* counters = thread->counters(); @@ -2506,25 +2510,34 @@ void CompileBroker::collect_statistics(CompilerThread* thread, elapsedTimer time _sum_standard_bytes_compiled += method->code_size() + task->num_inlined_bytecodes(); } -#if INCLUDE_JVMCI - AbstractCompiler* comp = compiler(task->comp_level()); + // Collect statistic per compilation level + if (comp_level > CompLevel_none && comp_level <= CompLevel_full_optimization) { + CompilerStatistics* stats = &_stats_per_level[comp_level-1]; + if (is_osr) { + stats->_osr.update(time, bytes_compiled); + } else { + stats->_standard.update(time, bytes_compiled); + } + stats->_nmethods_size += code->total_size(); + stats->_nmethods_code_size += code->insts_size(); + } else { + assert(false, "CompilerStatistics object does not exist for compilation level %d", comp_level); + } + + // Collect statistic per compiler + AbstractCompiler* comp = compiler(comp_level); if (comp) { CompilerStatistics* stats = comp->stats(); - if (stats) { - if (is_osr) { - stats->_osr.update(time, bytes_compiled); - } else { - stats->_standard.update(time, bytes_compiled); - } - stats->_nmethods_size += code->total_size(); - stats->_nmethods_code_size += code->insts_size(); - } else { // if (!stats) - assert(false, "Compiler statistics object must exist"); + if (is_osr) { + stats->_osr.update(time, bytes_compiled); + } else { + stats->_standard.update(time, bytes_compiled); } + stats->_nmethods_size += code->total_size(); + stats->_nmethods_code_size += code->insts_size(); } else { // if (!comp) assert(false, "Compiler object must exist"); } -#endif // INCLUDE_JVMCI } if (UsePerfData) { @@ -2543,9 +2556,10 @@ void CompileBroker::collect_statistics(CompilerThread* thread, elapsedTimer time } if (CITimeEach) { - float bytes_per_sec = 1.0 * (method->code_size() + task->num_inlined_bytecodes()) / time.seconds(); - tty->print_cr("%3d seconds: %f bytes/sec : %f (bytes %d + %d inlined)", - compile_id, time.seconds(), bytes_per_sec, method->code_size(), task->num_inlined_bytecodes()); + double compile_time = time.seconds(); + double bytes_per_sec = compile_time == 0.0 ? 0.0 : (double)(method->code_size() + task->num_inlined_bytecodes()) / compile_time; + tty->print_cr("%3d seconds: %6.3f bytes/sec : %f (bytes %d + %d inlined)", + compile_id, compile_time, bytes_per_sec, method->code_size(), task->num_inlined_bytecodes()); } // Collect counts of successful compilations @@ -2580,81 +2594,53 @@ const char* CompileBroker::compiler_name(int comp_level) { } } -#if INCLUDE_JVMCI -void CompileBroker::print_times(AbstractCompiler* comp) { - CompilerStatistics* stats = comp->stats(); - if (stats) { - tty->print_cr(" %s {speed: %d bytes/s; standard: %6.3f s, %d bytes, %d methods; osr: %6.3f s, %d bytes, %d methods; nmethods_size: %d bytes; nmethods_code_size: %d bytes}", - comp->name(), stats->bytes_per_second(), +void CompileBroker::print_times(const char* name, CompilerStatistics* stats) { + tty->print_cr(" %s {speed: %6.3f bytes/s; standard: %6.3f s, %d bytes, %d methods; osr: %6.3f s, %d bytes, %d methods; nmethods_size: %d bytes; nmethods_code_size: %d bytes}", + name, stats->bytes_per_second(), stats->_standard._time.seconds(), stats->_standard._bytes, stats->_standard._count, stats->_osr._time.seconds(), stats->_osr._bytes, stats->_osr._count, stats->_nmethods_size, stats->_nmethods_code_size); - } else { // if (!stats) - assert(false, "Compiler statistics object must exist"); - } - comp->print_timers(); } -#endif // INCLUDE_JVMCI void CompileBroker::print_times(bool per_compiler, bool aggregate) { -#if INCLUDE_JVMCI - elapsedTimer standard_compilation; - elapsedTimer total_compilation; - elapsedTimer osr_compilation; - - int standard_bytes_compiled = 0; - int osr_bytes_compiled = 0; - - int standard_compile_count = 0; - int osr_compile_count = 0; - int total_compile_count = 0; - - int nmethods_size = 0; - int nmethods_code_size = 0; - bool printedHeader = false; - - for (unsigned int i = 0; i < sizeof(_compilers) / sizeof(AbstractCompiler*); i++) { - AbstractCompiler* comp = _compilers[i]; - if (comp != NULL) { - if (per_compiler && aggregate && !printedHeader) { - printedHeader = true; - tty->cr(); - tty->print_cr("Individual compiler times (for compiled methods only)"); - tty->print_cr("------------------------------------------------"); - tty->cr(); - } - CompilerStatistics* stats = comp->stats(); - - if (stats) { - standard_compilation.add(stats->_standard._time); - osr_compilation.add(stats->_osr._time); - - standard_bytes_compiled += stats->_standard._bytes; - osr_bytes_compiled += stats->_osr._bytes; - - standard_compile_count += stats->_standard._count; - osr_compile_count += stats->_osr._count; - - nmethods_size += stats->_nmethods_size; - nmethods_code_size += stats->_nmethods_code_size; - } else { // if (!stats) - assert(false, "Compiler statistics object must exist"); - } - - if (per_compiler) { - print_times(comp); + if (per_compiler) { + if (aggregate) { + tty->cr(); + tty->print_cr("Individual compiler times (for compiled methods only)"); + tty->print_cr("------------------------------------------------"); + tty->cr(); + } + for (unsigned int i = 0; i < sizeof(_compilers) / sizeof(AbstractCompiler*); i++) { + AbstractCompiler* comp = _compilers[i]; + if (comp != NULL) { + print_times(comp->name(), comp->stats()); } } + if (aggregate) { + tty->cr(); + tty->print_cr("Individual compilation Tier times (for compiled methods only)"); + tty->print_cr("------------------------------------------------"); + tty->cr(); + } + char tier_name[256]; + for (int tier = CompLevel_simple; tier <= CompLevel_highest_tier; tier++) { + CompilerStatistics* stats = &_stats_per_level[tier-1]; + sprintf(tier_name, "Tier%d", tier); + print_times(tier_name, stats); + } } - total_compile_count = osr_compile_count + standard_compile_count; - total_compilation.add(osr_compilation); - total_compilation.add(standard_compilation); +#if INCLUDE_JVMCI // In hosted mode, print the JVMCI compiler specific counters manually. - if (!UseJVMCICompiler) { + if (EnableJVMCI && !UseJVMCICompiler) { JVMCICompiler::print_compilation_timers(); } -#else // INCLUDE_JVMCI +#endif + + if (!aggregate) { + return; + } + elapsedTimer standard_compilation = CompileBroker::_t_standard_compilation; elapsedTimer osr_compilation = CompileBroker::_t_osr_compilation; elapsedTimer total_compilation = CompileBroker::_t_total_compilation; @@ -2665,14 +2651,12 @@ void CompileBroker::print_times(bool per_compiler, bool aggregate) { int standard_compile_count = CompileBroker::_total_standard_compile_count; int osr_compile_count = CompileBroker::_total_osr_compile_count; int total_compile_count = CompileBroker::_total_compile_count; + int total_bailout_count = CompileBroker::_total_bailout_count; + int total_invalidated_count = CompileBroker::_total_invalidated_count; int nmethods_size = CompileBroker::_sum_nmethod_code_size; int nmethods_code_size = CompileBroker::_sum_nmethod_size; -#endif // INCLUDE_JVMCI - if (!aggregate) { - return; - } tty->cr(); tty->print_cr("Accumulated compiler times"); tty->print_cr("----------------------------------------------------------"); @@ -2681,16 +2665,16 @@ void CompileBroker::print_times(bool per_compiler, bool aggregate) { tty->print_cr(" Total compilation time : %7.3f s", total_compilation.seconds()); tty->print_cr(" Standard compilation : %7.3f s, Average : %2.3f s", standard_compilation.seconds(), - standard_compilation.seconds() / standard_compile_count); + standard_compile_count == 0 ? 0.0 : standard_compilation.seconds() / standard_compile_count); tty->print_cr(" Bailed out compilation : %7.3f s, Average : %2.3f s", CompileBroker::_t_bailedout_compilation.seconds(), - CompileBroker::_t_bailedout_compilation.seconds() / CompileBroker::_total_bailout_count); + total_bailout_count == 0 ? 0.0 : CompileBroker::_t_bailedout_compilation.seconds() / total_bailout_count); tty->print_cr(" On stack replacement : %7.3f s, Average : %2.3f s", osr_compilation.seconds(), - osr_compilation.seconds() / osr_compile_count); + osr_compile_count == 0 ? 0.0 : osr_compilation.seconds() / osr_compile_count); tty->print_cr(" Invalidated : %7.3f s, Average : %2.3f s", CompileBroker::_t_invalidated_compilation.seconds(), - CompileBroker::_t_invalidated_compilation.seconds() / CompileBroker::_total_invalidated_count); + total_invalidated_count == 0 ? 0.0 : CompileBroker::_t_invalidated_compilation.seconds() / total_invalidated_count); AbstractCompiler *comp = compiler(CompLevel_simple); if (comp != NULL) { diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp index ca4d5ada926..b3be2ec649b 100644 --- a/src/hotspot/share/compiler/compileBroker.hpp +++ b/src/hotspot/share/compiler/compileBroker.hpp @@ -224,6 +224,8 @@ class CompileBroker: AllStatic { static int _sum_nmethod_code_size; static long _peak_compilation_time; + static CompilerStatistics _stats_per_level[]; + static volatile int _print_compilation_warning; static Handle create_thread_oop(const char* name, TRAPS); @@ -371,10 +373,8 @@ public: // Redefine Classes support static void mark_on_stack(); -#if INCLUDE_JVMCI // Print curent compilation time stats for a given compiler - static void print_times(AbstractCompiler* comp); -#endif + static void print_times(const char* name, CompilerStatistics* stats); // Print a detailed accounting of compilation time static void print_times(bool per_compiler = true, bool aggregate = true); diff --git a/src/hotspot/share/jvmci/jvmciCompiler.cpp b/src/hotspot/share/jvmci/jvmciCompiler.cpp index b92c0bd857b..cd1ac48d862 100644 --- a/src/hotspot/share/jvmci/jvmciCompiler.cpp +++ b/src/hotspot/share/jvmci/jvmciCompiler.cpp @@ -141,11 +141,15 @@ void JVMCICompiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci, // Print compilation timers and statistics void JVMCICompiler::print_timers() { + tty->print_cr(" JVMCI Compile Time: %7.3f s", stats()->total_time()); print_compilation_timers(); } // Print compilation timers and statistics void JVMCICompiler::print_compilation_timers() { - JVMCI_event_1("JVMCICompiler::print_timers"); - tty->print_cr(" JVMCI code install time: %6.3f s", _codeInstallTimer.seconds()); + double code_install_time = _codeInstallTimer.seconds(); + if (code_install_time != 0.0) { + tty->cr(); + tty->print_cr(" JVMCI code install time: %6.3f s", code_install_time); + } } From 084e15bca3d1dc2cbede47f31b15498785aef466 Mon Sep 17 00:00:00 2001 From: Alexander Matveev Date: Fri, 7 Aug 2020 19:04:45 -0700 Subject: [PATCH 052/100] 8248905: [macos] symbolic links not properly resolved Reviewed-by: herrick, asemenyuk --- .../macosx/native/common/MacSysInfo.cpp | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp b/src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp index 838023a3012..401c7b8caf2 100644 --- a/src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp +++ b/src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp @@ -23,12 +23,39 @@ * questions. */ +#include +#include #include #include "FileUtils.h" #include "ErrorHandling.h" namespace SysInfo { +tstring getRealPath(const std::vector& in) { + std::vector out(PATH_MAX); + + struct stat sb; + if (lstat(in.data(), &sb) == -1) { + JP_THROW(tstrings::any() << "lstat(" << in.data() + << ") failed. Error: " << lastCRTError()); + } + + // readlink() will fail if called on real path, so if we have real path, then just + // use it + if (!S_ISLNK(sb.st_mode)) { + return tstring(in.data(), in.size() - 1 /* don't count trailing '0' */); + } + + // Get real path, since _NSGetExecutablePath can return symbolic link + ssize_t len = readlink(in.data(), out.data(), PATH_MAX); + if (len < 0) { + JP_THROW(tstrings::any() << "readlink(" << in.data() + << ") failed. Error: " << lastCRTError()); + } + + return tstring(out.data(), len); +} + tstring getProcessModulePath() { std::vector buffer; uint32_t bufferSize = 0; @@ -44,8 +71,9 @@ tstring getProcessModulePath() { buffer.resize(bufferSize); } while (true); - tstring reply = tstring(buffer.data(), - buffer.size() - 1 /* don't count trailing '0' */); + + tstring reply = getRealPath(buffer); + return FileUtils::toAbsolutePath(reply); } From 3ed56830b43d847e99395f22e6b9f4e1f3b418d8 Mon Sep 17 00:00:00 2001 From: Jatin Bhateja Date: Sun, 9 Aug 2020 02:03:09 +0530 Subject: [PATCH 053/100] 8248830: C2: Optimize Rotate API on x86 Improved existing scalar rotate operations, added support for vector rotate operations using new AVX512 instructions. Reviewed-by: vlivanov, kvn --- src/hotspot/cpu/x86/assembler_x86.cpp | 133 ++++++- src/hotspot/cpu/x86/assembler_x86.hpp | 19 + src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 84 +++++ src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp | 7 + src/hotspot/cpu/x86/x86.ad | 77 ++++ src/hotspot/cpu/x86/x86_64.ad | 354 +++++------------- src/hotspot/share/adlc/formssel.cpp | 4 +- src/hotspot/share/opto/addnode.cpp | 80 ++++ src/hotspot/share/opto/addnode.hpp | 2 + src/hotspot/share/opto/classes.hpp | 4 + src/hotspot/share/opto/mulnode.cpp | 96 +++++ src/hotspot/share/opto/mulnode.hpp | 23 ++ src/hotspot/share/opto/superword.cpp | 28 +- src/hotspot/share/opto/vectornode.cpp | 209 ++++++++++- src/hotspot/share/opto/vectornode.hpp | 25 +- .../compiler/c2/cr6340864/TestIntVect.java | 109 +++++- .../compiler/c2/cr6340864/TestLongVect.java | 106 ++++++ .../jtreg/compiler/intrinsics/TestRotate.java | 309 +++++++++++++++ .../bench/java/lang/RotateBenchmark.java | 87 +++++ 19 files changed, 1474 insertions(+), 282 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/intrinsics/TestRotate.java create mode 100644 test/micro/org/openjdk/bench/java/lang/RotateBenchmark.java diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp index 20b0dbc4f89..ef04d33c7f4 100644 --- a/src/hotspot/cpu/x86/assembler_x86.cpp +++ b/src/hotspot/cpu/x86/assembler_x86.cpp @@ -4311,6 +4311,58 @@ void Assembler::roll(Register dst, int imm8) { } } +void Assembler::roll(Register dst) { + int encode = prefix_and_encode(dst->encoding()); + emit_int16((unsigned char)0xD3, (0xC0 | encode)); +} + +void Assembler::rorl(Register dst, int imm8) { + assert(isShiftCount(imm8 >> 1), "illegal shift count"); + int encode = prefix_and_encode(dst->encoding()); + if (imm8 == 1) { + emit_int16((unsigned char)0xD1, (0xC8 | encode)); + } else { + emit_int24((unsigned char)0xC1, (0xc8 | encode), imm8); + } +} + +void Assembler::rorl(Register dst) { + int encode = prefix_and_encode(dst->encoding()); + emit_int16((unsigned char)0xD3, (0xC8 | encode)); +} + +#ifdef _LP64 +void Assembler::rorq(Register dst) { + int encode = prefixq_and_encode(dst->encoding()); + emit_int16((unsigned char)0xD3, (0xC8 | encode)); +} + +void Assembler::rorq(Register dst, int imm8) { + assert(isShiftCount(imm8 >> 1), "illegal shift count"); + int encode = prefixq_and_encode(dst->encoding()); + if (imm8 == 1) { + emit_int16((unsigned char)0xD1, (0xC8 | encode)); + } else { + emit_int24((unsigned char)0xC1, (0xc8 | encode), imm8); + } +} + +void Assembler::rolq(Register dst) { + int encode = prefixq_and_encode(dst->encoding()); + emit_int16((unsigned char)0xD3, (0xC0 | encode)); +} + +void Assembler::rolq(Register dst, int imm8) { + assert(isShiftCount(imm8 >> 1), "illegal shift count"); + int encode = prefixq_and_encode(dst->encoding()); + if (imm8 == 1) { + emit_int16((unsigned char)0xD1, (0xC0 | encode)); + } else { + emit_int24((unsigned char)0xC1, (0xc0 | encode), imm8); + } +} +#endif + void Assembler::sahf() { #ifdef _LP64 // Not supported in 64bit mode @@ -6226,6 +6278,78 @@ void Assembler::evpxorq(XMMRegister dst, XMMRegister nds, Address src, int vecto emit_operand(dst, src); } +void Assembler::evprold(XMMRegister dst, XMMRegister src, int shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(xmm1->encoding(), dst->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes); + emit_int24(0x72, (0xC0 | encode), shift & 0xFF); +} + +void Assembler::evprolq(XMMRegister dst, XMMRegister src, int shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(xmm1->encoding(), dst->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes); + emit_int24(0x72, (0xC0 | encode), shift & 0xFF); +} + +void Assembler::evprord(XMMRegister dst, XMMRegister src, int shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(xmm0->encoding(), dst->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes); + emit_int24(0x72, (0xC0 | encode), shift & 0xFF); +} + +void Assembler::evprorq(XMMRegister dst, XMMRegister src, int shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(xmm0->encoding(), dst->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes); + emit_int24(0x72, (0xC0 | encode), shift & 0xFF); +} + +void Assembler::evprolvd(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(dst->encoding(), src->encoding(), shift->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes); + emit_int16(0x15, (unsigned char)(0xC0 | encode)); +} + +void Assembler::evprolvq(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(dst->encoding(), src->encoding(), shift->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes); + emit_int16(0x15, (unsigned char)(0xC0 | encode)); +} + +void Assembler::evprorvd(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(dst->encoding(), src->encoding(), shift->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes); + emit_int16(0x14, (unsigned char)(0xC0 | encode)); +} + +void Assembler::evprorvq(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(dst->encoding(), src->encoding(), shift->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes); + emit_int16(0x14, (unsigned char)(0xC0 | encode)); +} + void Assembler::vpternlogd(XMMRegister dst, int imm8, XMMRegister src2, XMMRegister src3, int vector_len) { assert(VM_Version::supports_evex(), "requires EVEX support"); assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); @@ -8905,15 +9029,6 @@ void Assembler::rcrq(Register dst, int imm8) { } } -void Assembler::rorq(Register dst, int imm8) { - assert(isShiftCount(imm8 >> 1), "illegal shift count"); - int encode = prefixq_and_encode(dst->encoding()); - if (imm8 == 1) { - emit_int16((unsigned char)0xD1, (0xC8 | encode)); - } else { - emit_int24((unsigned char)0xC1, (0xc8 | encode), imm8); - } -} void Assembler::rorxq(Register dst, Register src, int imm8) { assert(VM_Version::supports_bmi2(), "bit manipulation instructions not supported"); diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp index 38637cc2a32..bbcfb7ec64e 100644 --- a/src/hotspot/cpu/x86/assembler_x86.hpp +++ b/src/hotspot/cpu/x86/assembler_x86.hpp @@ -1827,9 +1827,18 @@ private: void ret(int imm16); + void roll(Register dst); + void roll(Register dst, int imm8); + void rorl(Register dst); + + void rorl(Register dst, int imm8); + #ifdef _LP64 + void rolq(Register dst); + void rolq(Register dst, int imm8); + void rorq(Register dst); void rorq(Register dst, int imm8); void rorxq(Register dst, Register src, int imm8); void rorxd(Register dst, Register src, int imm8); @@ -2205,6 +2214,16 @@ private: void vpternlogd(XMMRegister dst, int imm8, XMMRegister src2, Address src3, int vector_len); void vpternlogq(XMMRegister dst, int imm8, XMMRegister src2, XMMRegister src3, int vector_len); + // Vector Rotate Left/Right instruction. + void evprolvd(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len); + void evprolvq(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len); + void evprorvd(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len); + void evprorvq(XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len); + void evprold(XMMRegister dst, XMMRegister src, int shift, int vector_len); + void evprolq(XMMRegister dst, XMMRegister src, int shift, int vector_len); + void evprord(XMMRegister dst, XMMRegister src, int shift, int vector_len); + void evprorq(XMMRegister dst, XMMRegister src, int shift, int vector_len); + // vinserti forms void vinserti128(XMMRegister dst, XMMRegister nds, XMMRegister src, uint8_t imm8); void vinserti128(XMMRegister dst, XMMRegister nds, Address src, uint8_t imm8); diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp index a61435b7671..8dc5cd6f3c5 100644 --- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp @@ -870,6 +870,57 @@ void C2_MacroAssembler::vextendbw(bool sign, XMMRegister dst, XMMRegister src, i } } +void C2_MacroAssembler::vprotate_imm(int opcode, BasicType etype, XMMRegister dst, XMMRegister src, + int shift, int vector_len) { + if (opcode == Op_RotateLeftV) { + if (etype == T_INT) { + evprold(dst, src, shift, vector_len); + } else { + assert(etype == T_LONG, "expected type T_LONG"); + evprolq(dst, src, shift, vector_len); + } + } else { + assert(opcode == Op_RotateRightV, "opcode should be Op_RotateRightV"); + if (etype == T_INT) { + evprord(dst, src, shift, vector_len); + } else { + assert(etype == T_LONG, "expected type T_LONG"); + evprorq(dst, src, shift, vector_len); + } + } +} + +void C2_MacroAssembler::vprotate_var(int opcode, BasicType etype, XMMRegister dst, XMMRegister src, + XMMRegister shift, int vector_len) { + if (opcode == Op_RotateLeftV) { + if (etype == T_INT) { + evprolvd(dst, src, shift, vector_len); + } else { + assert(etype == T_LONG, "expected type T_LONG"); + evprolvq(dst, src, shift, vector_len); + } + } else { + assert(opcode == Op_RotateRightV, "opcode should be Op_RotateRightV"); + if (etype == T_INT) { + evprorvd(dst, src, shift, vector_len); + } else { + assert(etype == T_LONG, "expected type T_LONG"); + evprorvq(dst, src, shift, vector_len); + } + } +} + +void C2_MacroAssembler::vshiftd_imm(int opcode, XMMRegister dst, int shift) { + if (opcode == Op_RShiftVI) { + psrad(dst, shift); + } else if (opcode == Op_LShiftVI) { + pslld(dst, shift); + } else { + assert((opcode == Op_URShiftVI),"opcode should be Op_URShiftVI"); + psrld(dst, shift); + } +} + void C2_MacroAssembler::vshiftd(int opcode, XMMRegister dst, XMMRegister src) { if (opcode == Op_RShiftVI) { psrad(dst, src); @@ -881,6 +932,17 @@ void C2_MacroAssembler::vshiftd(int opcode, XMMRegister dst, XMMRegister src) { } } +void C2_MacroAssembler::vshiftd_imm(int opcode, XMMRegister dst, XMMRegister nds, int shift, int vector_len) { + if (opcode == Op_RShiftVI) { + vpsrad(dst, nds, shift, vector_len); + } else if (opcode == Op_LShiftVI) { + vpslld(dst, nds, shift, vector_len); + } else { + assert((opcode == Op_URShiftVI),"opcode should be Op_URShiftVI"); + vpsrld(dst, nds, shift, vector_len); + } +} + void C2_MacroAssembler::vshiftd(int opcode, XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) { if (opcode == Op_RShiftVI) { vpsrad(dst, nds, src, vector_len); @@ -925,6 +987,17 @@ void C2_MacroAssembler::vshiftq(int opcode, XMMRegister dst, XMMRegister src) { } } +void C2_MacroAssembler::vshiftq_imm(int opcode, XMMRegister dst, int shift) { + if (opcode == Op_RShiftVL) { + psrlq(dst, shift); // using srl to implement sra on pre-avs512 systems + } else if (opcode == Op_LShiftVL) { + psllq(dst, shift); + } else { + assert((opcode == Op_URShiftVL),"opcode should be Op_URShiftVL"); + psrlq(dst, shift); + } +} + void C2_MacroAssembler::vshiftq(int opcode, XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) { if (opcode == Op_RShiftVL) { evpsraq(dst, nds, src, vector_len); @@ -936,6 +1009,17 @@ void C2_MacroAssembler::vshiftq(int opcode, XMMRegister dst, XMMRegister nds, XM } } +void C2_MacroAssembler::vshiftq_imm(int opcode, XMMRegister dst, XMMRegister nds, int shift, int vector_len) { + if (opcode == Op_RShiftVL) { + evpsraq(dst, nds, shift, vector_len); + } else if (opcode == Op_LShiftVL) { + vpsllq(dst, nds, shift, vector_len); + } else { + assert((opcode == Op_URShiftVL),"opcode should be Op_URShiftVL"); + vpsrlq(dst, nds, shift, vector_len); + } +} + // Reductions for vectors of ints, longs, floats, and doubles. void C2_MacroAssembler::reduce_operation_128(int opcode, XMMRegister dst, XMMRegister src) { diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp index 6fec6e19649..f16b193a21d 100644 --- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp @@ -74,11 +74,18 @@ public: void vextendbw(bool sign, XMMRegister dst, XMMRegister src, int vector_len); void vextendbw(bool sign, XMMRegister dst, XMMRegister src); void vshiftd(int opcode, XMMRegister dst, XMMRegister src); + void vshiftd_imm(int opcode, XMMRegister dst, int shift); void vshiftd(int opcode, XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len); + void vshiftd_imm(int opcode, XMMRegister dst, XMMRegister nds, int shift, int vector_len); void vshiftw(int opcode, XMMRegister dst, XMMRegister src); void vshiftw(int opcode, XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len); void vshiftq(int opcode, XMMRegister dst, XMMRegister src); + void vshiftq_imm(int opcode, XMMRegister dst, int shift); void vshiftq(int opcode, XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len); + void vshiftq_imm(int opcode, XMMRegister dst, XMMRegister nds, int shift, int vector_len); + + void vprotate_imm(int opcode, BasicType etype, XMMRegister dst, XMMRegister src, int shift, int vector_len); + void vprotate_var(int opcode, BasicType etype, XMMRegister dst, XMMRegister src, XMMRegister shift, int vector_len); // Reductions for vectors of ints, longs, floats, and doubles. diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad index 4108d628bb9..4e32b71539b 100644 --- a/src/hotspot/cpu/x86/x86.ad +++ b/src/hotspot/cpu/x86/x86.ad @@ -1469,6 +1469,8 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType return false; // implementation limitation (only vcmov8F_reg is present) } break; + case Op_RotateRightV: + case Op_RotateLeftV: case Op_MacroLogicV: if (!VM_Version::supports_evex() || ((size_in_bits != 512) && !VM_Version::supports_avx512vl())) { @@ -4955,6 +4957,33 @@ instruct vshiftI(vec dst, vec src, vec shift) %{ ins_pipe( pipe_slow ); %} +// Integers vector left constant shift +instruct vshiftI_imm(vec dst, vec src, immI8 shift) %{ + match(Set dst (LShiftVI src (LShiftCntV shift))); + match(Set dst (RShiftVI src (RShiftCntV shift))); + match(Set dst (URShiftVI src (RShiftCntV shift))); + effect(TEMP dst, USE src); + format %{ "vshiftd_imm $dst,$src,$shift\t! shift packedI" %} + ins_encode %{ + int opcode = this->ideal_Opcode(); + if (UseAVX > 0) { + int vector_len = vector_length_encoding(this); + __ vshiftd_imm(opcode, $dst$$XMMRegister, $src$$XMMRegister, $shift$$constant, vector_len); + } else { + int vlen = vector_length(this); + if (vlen == 2) { + __ movdbl($dst$$XMMRegister, $src$$XMMRegister); + __ vshiftd_imm(opcode, $dst$$XMMRegister, $shift$$constant); + } else { + assert(vlen == 4, "sanity"); + __ movdqu($dst$$XMMRegister, $src$$XMMRegister); + __ vshiftd_imm(opcode, $dst$$XMMRegister, $shift$$constant); + } + } + %} + ins_pipe( pipe_slow ); +%} + // Longs vector shift instruct vshiftL(vec dst, vec src, vec shift) %{ match(Set dst (LShiftVL src shift)); @@ -4975,6 +5004,26 @@ instruct vshiftL(vec dst, vec src, vec shift) %{ ins_pipe( pipe_slow ); %} +// Longs vector constant shift +instruct vshiftL_imm(vec dst, vec src, immI8 shift) %{ + match(Set dst (LShiftVL src (LShiftCntV shift))); + match(Set dst (URShiftVL src (RShiftCntV shift))); + effect(TEMP dst, USE src, USE shift); + format %{ "vshiftq_imm $dst,$src,$shift\t! shift packedL" %} + ins_encode %{ + int opcode = this->ideal_Opcode(); + if (UseAVX > 0) { + int vector_len = vector_length_encoding(this); + __ vshiftq_imm(opcode, $dst$$XMMRegister, $src$$XMMRegister, $shift$$constant, vector_len); + } else { + assert(vector_length(this) == 2, ""); + __ movdqu($dst$$XMMRegister, $src$$XMMRegister); + __ vshiftq_imm(opcode, $dst$$XMMRegister, $shift$$constant); + } + %} + ins_pipe( pipe_slow ); +%} + // -------------------ArithmeticRightShift ----------------------------------- // Long vector arithmetic right shift instruct vshiftL_arith_reg(vec dst, vec src, vec shift, vec tmp, rRegI scratch) %{ @@ -5359,3 +5408,31 @@ instruct vpternlog_mem(vec dst, vec src2, memory src3, immU8 func) %{ %} ins_pipe( pipe_slow ); %} + +// --------------------------------- Rotation Operations ---------------------------------- +instruct vprotate_immI8(vec dst, vec src, immI8 shift) %{ + match(Set dst (RotateLeftV src shift)); + match(Set dst (RotateRightV src shift)); + format %{ "vprotate_imm8 $dst,$src,$shift\t! vector rotate" %} + ins_encode %{ + int opcode = this->ideal_Opcode(); + int vector_len = vector_length_encoding(this); + BasicType etype = this->bottom_type()->is_vect()->element_basic_type(); + __ vprotate_imm(opcode, etype, $dst$$XMMRegister, $src$$XMMRegister, $shift$$constant, vector_len); + %} + ins_pipe( pipe_slow ); +%} + +instruct vprorate(vec dst, vec src, vec shift) %{ + match(Set dst (RotateLeftV src shift)); + match(Set dst (RotateRightV src shift)); + format %{ "vprotate $dst,$src,$shift\t! vector rotate" %} + ins_encode %{ + int opcode = this->ideal_Opcode(); + int vector_len = vector_length_encoding(this); + BasicType etype = this->bottom_type()->is_vect()->element_basic_type(); + __ vprotate_var(opcode, etype, $dst$$XMMRegister, $src$$XMMRegister, $shift$$XMMRegister, vector_len); + %} + ins_pipe( pipe_slow ); +%} + diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad index 69da70311bb..70156db5e6f 100644 --- a/src/hotspot/cpu/x86/x86_64.ad +++ b/src/hotspot/cpu/x86/x86_64.ad @@ -3339,19 +3339,6 @@ operand rdi_RegI() interface(REG_INTER); %} -operand no_rcx_RegI() -%{ - constraint(ALLOC_IN_RC(int_no_rcx_reg)); - match(RegI); - match(rax_RegI); - match(rbx_RegI); - match(rdx_RegI); - match(rdi_RegI); - - format %{ %} - interface(REG_INTER); -%} - operand no_rax_rdx_RegI() %{ constraint(ALLOC_IN_RC(int_no_rax_rdx_reg)); @@ -3561,16 +3548,6 @@ operand no_rax_RegL() interface(REG_INTER); %} -operand no_rcx_RegL() -%{ - constraint(ALLOC_IN_RC(long_no_rcx_reg)); - match(RegL); - match(rRegL); - - format %{ %} - interface(REG_INTER); -%} - operand rax_RegL() %{ constraint(ALLOC_IN_RC(long_rax_reg)); @@ -8969,294 +8946,137 @@ instruct i2s(rRegI dst, rRegI src, immI_16 sixteen) // ROL/ROR instructions -// ROL expand -instruct rolI_rReg_imm1(rRegI dst, rFlagsReg cr) %{ - effect(KILL cr, USE_DEF dst); - - format %{ "roll $dst" %} - opcode(0xD1, 0x0); /* Opcode D1 /0 */ - ins_encode(REX_reg(dst), OpcP, reg_opc(dst)); - ins_pipe(ialu_reg); -%} - -instruct rolI_rReg_imm8(rRegI dst, immI8 shift, rFlagsReg cr) %{ - effect(USE_DEF dst, USE shift, KILL cr); - +// Rotate left by constant. +instruct rolI_imm(rRegI dst, immI8 shift, rFlagsReg cr) +%{ + predicate(n->bottom_type()->basic_type() == T_INT); + match(Set dst (RotateLeft dst shift)); + effect(KILL cr); format %{ "roll $dst, $shift" %} - opcode(0xC1, 0x0); /* Opcode C1 /0 ib */ - ins_encode( reg_opc_imm(dst, shift) ); + ins_encode %{ + __ roll($dst$$Register, $shift$$constant); + %} ins_pipe(ialu_reg); %} -instruct rolI_rReg_CL(no_rcx_RegI dst, rcx_RegI shift, rFlagsReg cr) +// Rotate Left by variable +instruct rolI_rReg_Var(rRegI dst, rcx_RegI shift, rFlagsReg cr) %{ - effect(USE_DEF dst, USE shift, KILL cr); - + predicate(n->bottom_type()->basic_type() == T_INT); + match(Set dst (RotateLeft dst shift)); + effect(KILL cr); format %{ "roll $dst, $shift" %} - opcode(0xD3, 0x0); /* Opcode D3 /0 */ - ins_encode(REX_reg(dst), OpcP, reg_opc(dst)); + ins_encode %{ + __ roll($dst$$Register); + %} ins_pipe(ialu_reg_reg); %} -// end of ROL expand -// Rotate Left by one -instruct rolI_rReg_i1(rRegI dst, immI1 lshift, immI_M1 rshift, rFlagsReg cr) +// Rotate Right by constant. +instruct rorI_immI8_legacy(rRegI dst, immI8 shift, rFlagsReg cr) %{ - match(Set dst (OrI (LShiftI dst lshift) (URShiftI dst rshift))); - - expand %{ - rolI_rReg_imm1(dst, cr); - %} -%} - -// Rotate Left by 8-bit immediate -instruct rolI_rReg_i8(rRegI dst, immI8 lshift, immI8 rshift, rFlagsReg cr) -%{ - predicate(0 == ((n->in(1)->in(2)->get_int() + n->in(2)->in(2)->get_int()) & 0x1f)); - match(Set dst (OrI (LShiftI dst lshift) (URShiftI dst rshift))); - - expand %{ - rolI_rReg_imm8(dst, lshift, cr); - %} -%} - -// Rotate Left by variable -instruct rolI_rReg_Var_C0(no_rcx_RegI dst, rcx_RegI shift, immI0 zero, rFlagsReg cr) -%{ - match(Set dst (OrI (LShiftI dst shift) (URShiftI dst (SubI zero shift)))); - - expand %{ - rolI_rReg_CL(dst, shift, cr); - %} -%} - -// Rotate Left by variable -instruct rolI_rReg_Var_C32(no_rcx_RegI dst, rcx_RegI shift, immI_32 c32, rFlagsReg cr) -%{ - match(Set dst (OrI (LShiftI dst shift) (URShiftI dst (SubI c32 shift)))); - - expand %{ - rolI_rReg_CL(dst, shift, cr); - %} -%} - -// ROR expand -instruct rorI_rReg_imm1(rRegI dst, rFlagsReg cr) -%{ - effect(USE_DEF dst, KILL cr); - - format %{ "rorl $dst" %} - opcode(0xD1, 0x1); /* D1 /1 */ - ins_encode(REX_reg(dst), OpcP, reg_opc(dst)); - ins_pipe(ialu_reg); -%} - -instruct rorI_rReg_imm8(rRegI dst, immI8 shift, rFlagsReg cr) -%{ - effect(USE_DEF dst, USE shift, KILL cr); - + predicate(!VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_INT); + match(Set dst (RotateRight dst shift)); + effect(KILL cr); format %{ "rorl $dst, $shift" %} - opcode(0xC1, 0x1); /* C1 /1 ib */ - ins_encode(reg_opc_imm(dst, shift)); + ins_encode %{ + __ rorl($dst$$Register, $shift$$constant); + %} ins_pipe(ialu_reg); %} -instruct rorI_rReg_CL(no_rcx_RegI dst, rcx_RegI shift, rFlagsReg cr) +// Rotate Right by constant. +instruct rorI_immI8(rRegI dst, immI8 shift) %{ - effect(USE_DEF dst, USE shift, KILL cr); + predicate(VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_INT); + match(Set dst (RotateRight dst shift)); + format %{ "rorxd $dst, $shift" %} + ins_encode %{ + __ rorxd($dst$$Register, $dst$$Register, $shift$$constant); + %} + ins_pipe(ialu_reg_reg); +%} +// Rotate Right by variable +instruct rorI_rReg_Var(rRegI dst, rcx_RegI shift, rFlagsReg cr) +%{ + predicate(n->bottom_type()->basic_type() == T_INT); + match(Set dst (RotateRight dst shift)); + effect(KILL cr); format %{ "rorl $dst, $shift" %} - opcode(0xD3, 0x1); /* D3 /1 */ - ins_encode(REX_reg(dst), OpcP, reg_opc(dst)); + ins_encode %{ + __ rorl($dst$$Register); + %} ins_pipe(ialu_reg_reg); %} -// end of ROR expand -// Rotate Right by one -instruct rorI_rReg_i1(rRegI dst, immI1 rshift, immI_M1 lshift, rFlagsReg cr) + +// Rotate Left by constant. +instruct rolL_immI8(rRegL dst, immI8 shift, rFlagsReg cr) %{ - match(Set dst (OrI (URShiftI dst rshift) (LShiftI dst lshift))); - - expand %{ - rorI_rReg_imm1(dst, cr); - %} -%} - -// Rotate Right by 8-bit immediate -instruct rorI_rReg_i8(rRegI dst, immI8 rshift, immI8 lshift, rFlagsReg cr) -%{ - predicate(0 == ((n->in(1)->in(2)->get_int() + n->in(2)->in(2)->get_int()) & 0x1f)); - match(Set dst (OrI (URShiftI dst rshift) (LShiftI dst lshift))); - - expand %{ - rorI_rReg_imm8(dst, rshift, cr); - %} -%} - -// Rotate Right by variable -instruct rorI_rReg_Var_C0(no_rcx_RegI dst, rcx_RegI shift, immI0 zero, rFlagsReg cr) -%{ - match(Set dst (OrI (URShiftI dst shift) (LShiftI dst (SubI zero shift)))); - - expand %{ - rorI_rReg_CL(dst, shift, cr); - %} -%} - -// Rotate Right by variable -instruct rorI_rReg_Var_C32(no_rcx_RegI dst, rcx_RegI shift, immI_32 c32, rFlagsReg cr) -%{ - match(Set dst (OrI (URShiftI dst shift) (LShiftI dst (SubI c32 shift)))); - - expand %{ - rorI_rReg_CL(dst, shift, cr); - %} -%} - -// for long rotate -// ROL expand -instruct rolL_rReg_imm1(rRegL dst, rFlagsReg cr) %{ - effect(USE_DEF dst, KILL cr); - - format %{ "rolq $dst" %} - opcode(0xD1, 0x0); /* Opcode D1 /0 */ - ins_encode(REX_reg_wide(dst), OpcP, reg_opc(dst)); - ins_pipe(ialu_reg); -%} - -instruct rolL_rReg_imm8(rRegL dst, immI8 shift, rFlagsReg cr) %{ - effect(USE_DEF dst, USE shift, KILL cr); - + predicate(n->bottom_type()->basic_type() == T_LONG); + match(Set dst (RotateLeft dst shift)); + effect(KILL cr); format %{ "rolq $dst, $shift" %} - opcode(0xC1, 0x0); /* Opcode C1 /0 ib */ - ins_encode( reg_opc_imm_wide(dst, shift) ); + ins_encode %{ + __ rolq($dst$$Register, $shift$$constant); + %} ins_pipe(ialu_reg); %} -instruct rolL_rReg_CL(no_rcx_RegL dst, rcx_RegI shift, rFlagsReg cr) -%{ - effect(USE_DEF dst, USE shift, KILL cr); - - format %{ "rolq $dst, $shift" %} - opcode(0xD3, 0x0); /* Opcode D3 /0 */ - ins_encode(REX_reg_wide(dst), OpcP, reg_opc(dst)); - ins_pipe(ialu_reg_reg); -%} -// end of ROL expand - -// Rotate Left by one -instruct rolL_rReg_i1(rRegL dst, immI1 lshift, immI_M1 rshift, rFlagsReg cr) -%{ - match(Set dst (OrL (LShiftL dst lshift) (URShiftL dst rshift))); - - expand %{ - rolL_rReg_imm1(dst, cr); - %} -%} - -// Rotate Left by 8-bit immediate -instruct rolL_rReg_i8(rRegL dst, immI8 lshift, immI8 rshift, rFlagsReg cr) -%{ - predicate(0 == ((n->in(1)->in(2)->get_int() + n->in(2)->in(2)->get_int()) & 0x3f)); - match(Set dst (OrL (LShiftL dst lshift) (URShiftL dst rshift))); - - expand %{ - rolL_rReg_imm8(dst, lshift, cr); - %} -%} - // Rotate Left by variable -instruct rolL_rReg_Var_C0(no_rcx_RegL dst, rcx_RegI shift, immI0 zero, rFlagsReg cr) +instruct rolL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr) %{ - match(Set dst (OrL (LShiftL dst shift) (URShiftL dst (SubI zero shift)))); - - expand %{ - rolL_rReg_CL(dst, shift, cr); + predicate(n->bottom_type()->basic_type() == T_LONG); + match(Set dst (RotateLeft dst shift)); + effect(KILL cr); + format %{ "rolq $dst, $shift" %} + ins_encode %{ + __ rolq($dst$$Register); %} -%} - -// Rotate Left by variable -instruct rolL_rReg_Var_C64(no_rcx_RegL dst, rcx_RegI shift, immI_64 c64, rFlagsReg cr) -%{ - match(Set dst (OrL (LShiftL dst shift) (URShiftL dst (SubI c64 shift)))); - - expand %{ - rolL_rReg_CL(dst, shift, cr); - %} -%} - -// ROR expand -instruct rorL_rReg_imm1(rRegL dst, rFlagsReg cr) -%{ - effect(USE_DEF dst, KILL cr); - - format %{ "rorq $dst" %} - opcode(0xD1, 0x1); /* D1 /1 */ - ins_encode(REX_reg_wide(dst), OpcP, reg_opc(dst)); - ins_pipe(ialu_reg); -%} - -instruct rorL_rReg_imm8(rRegL dst, immI8 shift, rFlagsReg cr) -%{ - effect(USE_DEF dst, USE shift, KILL cr); - - format %{ "rorq $dst, $shift" %} - opcode(0xC1, 0x1); /* C1 /1 ib */ - ins_encode(reg_opc_imm_wide(dst, shift)); - ins_pipe(ialu_reg); -%} - -instruct rorL_rReg_CL(no_rcx_RegL dst, rcx_RegI shift, rFlagsReg cr) -%{ - effect(USE_DEF dst, USE shift, KILL cr); - - format %{ "rorq $dst, $shift" %} - opcode(0xD3, 0x1); /* D3 /1 */ - ins_encode(REX_reg_wide(dst), OpcP, reg_opc(dst)); ins_pipe(ialu_reg_reg); %} -// end of ROR expand -// Rotate Right by one -instruct rorL_rReg_i1(rRegL dst, immI1 rshift, immI_M1 lshift, rFlagsReg cr) + +// Rotate Right by constant. +instruct rorL_immI8_legacy(rRegL dst, immI8 shift, rFlagsReg cr) %{ - match(Set dst (OrL (URShiftL dst rshift) (LShiftL dst lshift))); - - expand %{ - rorL_rReg_imm1(dst, cr); + predicate(!VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_LONG); + match(Set dst (RotateRight dst shift)); + effect(KILL cr); + format %{ "rorq $dst, $shift" %} + ins_encode %{ + __ rorq($dst$$Register, $shift$$constant); %} + ins_pipe(ialu_reg); %} -// Rotate Right by 8-bit immediate -instruct rorL_rReg_i8(rRegL dst, immI8 rshift, immI8 lshift, rFlagsReg cr) -%{ - predicate(0 == ((n->in(1)->in(2)->get_int() + n->in(2)->in(2)->get_int()) & 0x3f)); - match(Set dst (OrL (URShiftL dst rshift) (LShiftL dst lshift))); - expand %{ - rorL_rReg_imm8(dst, rshift, cr); +// Rotate Right by constant +instruct rorL_immI8(rRegL dst, immI8 shift) +%{ + predicate(VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_LONG); + match(Set dst (RotateRight dst shift)); + format %{ "rorxq $dst, $shift" %} + ins_encode %{ + __ rorxq($dst$$Register, $dst$$Register, $shift$$constant); %} + ins_pipe(ialu_reg_reg); %} // Rotate Right by variable -instruct rorL_rReg_Var_C0(no_rcx_RegL dst, rcx_RegI shift, immI0 zero, rFlagsReg cr) +instruct rorL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr) %{ - match(Set dst (OrL (URShiftL dst shift) (LShiftL dst (SubI zero shift)))); - - expand %{ - rorL_rReg_CL(dst, shift, cr); + predicate(n->bottom_type()->basic_type() == T_LONG); + match(Set dst (RotateRight dst shift)); + effect(KILL cr); + format %{ "rorq $dst, $shift" %} + ins_encode %{ + __ rorq($dst$$Register); %} + ins_pipe(ialu_reg_reg); %} -// Rotate Right by variable -instruct rorL_rReg_Var_C64(no_rcx_RegL dst, rcx_RegI shift, immI_64 c64, rFlagsReg cr) -%{ - match(Set dst (OrL (URShiftL dst shift) (LShiftL dst (SubI c64 shift)))); - - expand %{ - rorL_rReg_CL(dst, shift, cr); - %} -%} // Logical Instructions diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp index 4030d336f3c..dab03c87c45 100644 --- a/src/hotspot/share/adlc/formssel.cpp +++ b/src/hotspot/share/adlc/formssel.cpp @@ -773,6 +773,8 @@ bool InstructForm::captures_bottom_type(FormDict &globals) const { !strcmp(_matrule->_rChild->_opType,"CheckCastPP") || !strcmp(_matrule->_rChild->_opType,"GetAndSetP") || !strcmp(_matrule->_rChild->_opType,"GetAndSetN") || + !strcmp(_matrule->_rChild->_opType,"RotateLeft") || + !strcmp(_matrule->_rChild->_opType,"RotateRight") || #if INCLUDE_SHENANDOAHGC !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeP") || !strcmp(_matrule->_rChild->_opType,"ShenandoahCompareAndExchangeN") || @@ -4164,7 +4166,7 @@ bool MatchRule::is_vector() const { "RShiftVB","RShiftVS","RShiftVI","RShiftVL", "URShiftVB","URShiftVS","URShiftVI","URShiftVL", "ReplicateB","ReplicateS","ReplicateI","ReplicateL","ReplicateF","ReplicateD", - "RoundDoubleModeV","LoadVector","StoreVector", + "RoundDoubleModeV","RotateLeftV" , "RotateRightV", "LoadVector","StoreVector", "FmaVD", "FmaVF","PopCountVI", // Next are not supported currently. "PackB","PackS","PackI","PackL","PackF","PackD","Pack2L","Pack2D", diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp index 61bac396cff..f83938ad28a 100644 --- a/src/hotspot/share/opto/addnode.cpp +++ b/src/hotspot/share/opto/addnode.cpp @@ -743,6 +743,46 @@ Node* OrINode::Identity(PhaseGVN* phase) { return AddNode::Identity(phase); } +Node *OrINode::Ideal(PhaseGVN *phase, bool can_reshape) { + int lopcode = in(1)->Opcode(); + int ropcode = in(2)->Opcode(); + if (Matcher::match_rule_supported(Op_RotateLeft) && + lopcode == Op_LShiftI && ropcode == Op_URShiftI && in(1)->in(1) == in(2)->in(1)) { + Node *lshift = in(1)->in(2); + Node *rshift = in(2)->in(2); + // val << norm_con_shift | val >> (32 - norm_con_shift) => rotate_left val , norm_con_shift + if (lshift->is_Con() && rshift->is_Con() && + ((lshift->get_int() & 0x1F) == (32 - (rshift->get_int() & 0x1F)))) { + return new RotateLeftNode(in(1)->in(1), + phase->intcon(lshift->get_int() & 0x1F), TypeInt::INT); + } + // val << var_shift | val >> (0/32 - var_shift) => rotate_left val , var_shift + if (rshift->Opcode() == Op_SubI && rshift->in(2) == lshift && + rshift->in(1)->is_Con() && + (rshift->in(1)->get_int() == 0 || rshift->in(1)->get_int() == 32)) { + return new RotateLeftNode(in(1)->in(1), lshift, TypeInt::INT); + } + } + if (Matcher::match_rule_supported(Op_RotateRight) && + lopcode == Op_URShiftI && ropcode == Op_LShiftI && in(1)->in(1) == in(2)->in(1)) { + Node *rshift = in(1)->in(2); + Node *lshift = in(2)->in(2); + // val >> norm_con_shift | val << (32 - norm_con_shift) => rotate_right val , norm_con_shift + if (rshift->is_Con() && lshift->is_Con() && + ((rshift->get_int() & 0x1F) == (32 - (lshift->get_int() & 0x1F)))) { + return new RotateRightNode(in(1)->in(1), + phase->intcon(rshift->get_int() & 0x1F), TypeInt::INT); + } + // val >> var_shift | val << (0/32 - var_shift) => rotate_right val , var_shift + if (lshift->Opcode() == Op_SubI && lshift->in(2) == rshift && + lshift->in(1)->is_Con() && + (lshift->in(1)->get_int() == 0 || lshift->in(1)->get_int() == 32)) { + return new RotateRightNode(in(1)->in(1), rshift, TypeInt::INT); + } + } + return NULL; +} + //------------------------------add_ring--------------------------------------- // Supplied function returns the sum of the inputs IN THE CURRENT RING. For // the logical operations the ring's ADD is really a logical OR function. @@ -784,6 +824,46 @@ Node* OrLNode::Identity(PhaseGVN* phase) { return AddNode::Identity(phase); } +Node *OrLNode::Ideal(PhaseGVN *phase, bool can_reshape) { + int lopcode = in(1)->Opcode(); + int ropcode = in(2)->Opcode(); + if (Matcher::match_rule_supported(Op_RotateLeft) && + lopcode == Op_LShiftL && ropcode == Op_URShiftL && in(1)->in(1) == in(2)->in(1)) { + Node *lshift = in(1)->in(2); + Node *rshift = in(2)->in(2); + // val << norm_con_shift | val >> (64 - norm_con_shift) => rotate_left val , norm_con_shift + if (lshift->is_Con() && rshift->is_Con() && + ((lshift->get_int() & 0x3F) == (64 - (rshift->get_int() & 0x3F)))) { + return new RotateLeftNode(in(1)->in(1), + phase->intcon(lshift->get_int() & 0x3F), TypeLong::LONG); + } + // val << var_shift | val >> (0/64 - var_shift) => rotate_left val , var_shift + if (rshift->Opcode() == Op_SubI && rshift->in(2) == lshift && + rshift->in(1)->is_Con() && + (rshift->in(1)->get_int() == 0 || rshift->in(1)->get_int() == 64)) { + return new RotateLeftNode(in(1)->in(1), lshift, TypeLong::LONG); + } + } + if (Matcher::match_rule_supported(Op_RotateRight) && + lopcode == Op_URShiftL && ropcode == Op_LShiftL && in(1)->in(1) == in(2)->in(1)) { + Node *rshift = in(1)->in(2); + Node *lshift = in(2)->in(2); + // val >> norm_con_shift | val << (64 - norm_con_shift) => rotate_right val , norm_con_shift + if (rshift->is_Con() && lshift->is_Con() && + ((rshift->get_int() & 0x3F) == (64 - (lshift->get_int() & 0x3F)))) { + return new RotateRightNode(in(1)->in(1), + phase->intcon(rshift->get_int() & 0x3F), TypeLong::LONG); + } + // val >> var_shift | val << (0/64 - var_shift) => rotate_right val , var_shift + if (lshift->Opcode() == Op_SubI && lshift->in(2) == rshift && + lshift->in(1)->is_Con() && + (lshift->in(1)->get_int() == 0 || lshift->in(1)->get_int() == 64)) { + return new RotateRightNode(in(1)->in(1), rshift, TypeLong::LONG); + } + } + return NULL; +} + //------------------------------add_ring--------------------------------------- const Type *OrLNode::add_ring( const Type *t0, const Type *t1 ) const { const TypeLong *r0 = t0->is_long(); // Handy access diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp index b7ef2bc5a2e..6e6bca1d493 100644 --- a/src/hotspot/share/opto/addnode.hpp +++ b/src/hotspot/share/opto/addnode.hpp @@ -172,6 +172,7 @@ public: virtual const Type *bottom_type() const { return TypeInt::INT; } virtual Node* Identity(PhaseGVN* phase); virtual uint ideal_reg() const { return Op_RegI; } + virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); }; //------------------------------OrLNode---------------------------------------- @@ -186,6 +187,7 @@ public: virtual const Type *bottom_type() const { return TypeLong::LONG; } virtual Node* Identity(PhaseGVN* phase); virtual uint ideal_reg() const { return Op_RegL; } + virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); }; //------------------------------XorINode--------------------------------------- diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp index e609851772f..429cd460a7c 100644 --- a/src/hotspot/share/opto/classes.hpp +++ b/src/hotspot/share/opto/classes.hpp @@ -268,6 +268,10 @@ macro(RoundDouble) macro(RoundDoubleMode) macro(RoundDoubleModeV) macro(RoundFloat) +macro(RotateLeft) +macro(RotateLeftV) +macro(RotateRight) +macro(RotateRightV) macro(SafePoint) macro(SafePointScalarObject) #if INCLUDE_SHENANDOAHGC diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp index bd081df11d2..3df3f7fa040 100644 --- a/src/hotspot/share/opto/mulnode.cpp +++ b/src/hotspot/share/opto/mulnode.cpp @@ -1433,3 +1433,99 @@ const Type* FmaFNode::Value(PhaseGVN* phase) const { uint MulAddS2INode::hash() const { return (uintptr_t)in(1) + (uintptr_t)in(2) + (uintptr_t)in(3) + (uintptr_t)in(4) + Opcode(); } + +//------------------------------Rotate Operations ------------------------------ + +const Type* RotateLeftNode::Value(PhaseGVN* phase) const { + const Type* t1 = phase->type(in(1)); + const Type* t2 = phase->type(in(2)); + // Either input is TOP ==> the result is TOP + if (t1 == Type::TOP || t2 == Type::TOP) { + return Type::TOP; + } + + if (t1->isa_int()) { + const TypeInt* r1 = t1->is_int(); + const TypeInt* r2 = t2->is_int(); + + // Left input is ZERO ==> the result is ZERO. + if (r1 == TypeInt::ZERO) { + return TypeInt::ZERO; + } + // Shift by zero does nothing + if (r2 == TypeInt::ZERO) { + return r1; + } + + if (r1->is_con() && r2->is_con()) { + int shift = r2->get_con() & (BitsPerJavaInteger - 1); // semantics of Java shifts + return TypeInt::make((r1->get_con() << shift) | (r1->get_con() >> (32 - shift))); + } + return TypeInt::INT; + } else { + assert(t1->isa_long(), "Type must be a long"); + const TypeLong* r1 = t1->is_long(); + const TypeInt* r2 = t2->is_int(); + + // Left input is ZERO ==> the result is ZERO. + if (r1 == TypeLong::ZERO) { + return TypeLong::ZERO; + } + // Shift by zero does nothing + if (r2 == TypeInt::ZERO) { + return r1; + } + + if (r1->is_con() && r2->is_con()) { + int shift = r2->get_con() & (BitsPerJavaLong - 1); // semantics of Java shifts + return TypeLong::make((r1->get_con() << shift) | (r1->get_con() >> (64 - shift))); + } + return TypeLong::LONG; + } +} + +const Type* RotateRightNode::Value(PhaseGVN* phase) const { + const Type* t1 = phase->type(in(1)); + const Type* t2 = phase->type(in(2)); + // Either input is TOP ==> the result is TOP + if (t1 == Type::TOP || t2 == Type::TOP) { + return Type::TOP; + } + + if (t1->isa_int()) { + const TypeInt* r1 = t1->is_int(); + const TypeInt* r2 = t2->is_int(); + + // Left input is ZERO ==> the result is ZERO. + if (r1 == TypeInt::ZERO) { + return TypeInt::ZERO; + } + // Shift by zero does nothing + if (r2 == TypeInt::ZERO) { + return r1; + } + if (r1->is_con() && r2->is_con()) { + int shift = r2->get_con() & (BitsPerJavaInteger - 1); // semantics of Java shifts + return TypeInt::make((r1->get_con() >> shift) | (r1->get_con() << (32 - shift))); + } + return TypeInt::INT; + + } else { + assert(t1->isa_long(), "Type must be a long"); + const TypeLong* r1 = t1->is_long(); + const TypeInt* r2 = t2->is_int(); + // Left input is ZERO ==> the result is ZERO. + if (r1 == TypeLong::ZERO) { + return TypeLong::ZERO; + } + // Shift by zero does nothing + if (r2 == TypeInt::ZERO) { + return r1; + } + if (r1->is_con() && r2->is_con()) { + int shift = r2->get_con() & (BitsPerJavaLong - 1); // semantics of Java shifts + return TypeLong::make((r1->get_con() >> shift) | (r1->get_con() << (64 - shift))); + } + return TypeLong::LONG; + } +} diff --git a/src/hotspot/share/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp index 8945b8aed0d..fce6e02825e 100644 --- a/src/hotspot/share/opto/mulnode.hpp +++ b/src/hotspot/share/opto/mulnode.hpp @@ -211,6 +211,29 @@ public: virtual uint ideal_reg() const { return Op_RegL; } }; + +//------------------------ RotateLeftNode ---------------------------------- +class RotateLeftNode : public TypeNode { + public: + RotateLeftNode(Node* in1, Node* in2, const Type* type) : TypeNode(type, 3) { + init_req(1, in1); + init_req(2, in2); + } + virtual int Opcode() const; + virtual const Type* Value(PhaseGVN* phase) const; +}; + +//----------------------- RotateRightNode ---------------------------------- +class RotateRightNode : public TypeNode { + public: + RotateRightNode(Node* in1, Node* in2, const Type* type) : TypeNode(type, 3) { + init_req(1, in1); + init_req(2, in2); + } + virtual int Opcode() const; + virtual const Type* Value(PhaseGVN* phase) const; +}; + //------------------------------RShiftINode------------------------------------ // Signed shift right class RShiftINode : public Node { diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index 0f4da5e8cfa..3a9b6b555a9 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -2464,6 +2464,16 @@ void SuperWord::output() { const TypePtr* atyp = n->adr_type(); vn = StoreVectorNode::make(opc, ctl, mem, adr, atyp, val, vlen); vlen_in_bytes = vn->as_StoreVector()->memory_size(); + } else if (VectorNode::is_scalar_rotate(n)) { + Node* in1 = low_adr->in(1); + Node* in2 = p->at(0)->in(2); + assert(in2->bottom_type()->isa_int(), "Shift must always be an int value"); + // If rotation count is non-constant or greater than 8bit value create a vector. + if (!in2->is_Con() || -0x80 > in2->get_int() || in2->get_int() >= 0x80) { + in2 = vector_opd(p, 2); + } + vn = VectorNode::make(opc, in1, in2, vlen, velt_basic_type(n)); + vlen_in_bytes = vn->as_Vector()->length_in_bytes(); } else if (VectorNode::is_roundopD(n)) { Node* in1 = vector_opd(p, 1); Node* in2 = low_adr->in(2); @@ -2758,8 +2768,22 @@ Node* SuperWord::vector_opd(Node_List* p, int opd_idx) { // Convert scalar input to vector with the same number of elements as // p0's vector. Use p0's type because size of operand's container in // vector should match p0's size regardless operand's size. - const Type* p0_t = velt_type(p0); - VectorNode* vn = VectorNode::scalar2vector(opd, vlen, p0_t); + const Type* p0_t = NULL; + VectorNode* vn = NULL; + if (opd_idx == 2 && VectorNode::is_scalar_rotate(p0)) { + Node* conv = opd; + p0_t = TypeInt::INT; + if (p0->bottom_type()->isa_long()) { + p0_t = TypeLong::LONG; + conv = new ConvI2LNode(opd); + _igvn.register_new_node_with_optimizer(conv); + _phase->set_ctrl(conv, _phase->get_ctrl(opd)); + } + vn = VectorNode::scalar2vector(conv, vlen, p0_t); + } else { + p0_t = velt_type(p0); + vn = VectorNode::scalar2vector(opd, vlen, p0_t); + } _igvn.register_new_node_with_optimizer(vn); _phase->set_ctrl(vn, _phase->get_ctrl(opd)); diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp index 16d3899ba80..0dbe44fe0bf 100644 --- a/src/hotspot/share/opto/vectornode.cpp +++ b/src/hotspot/share/opto/vectornode.cpp @@ -24,8 +24,11 @@ #include "precompiled.hpp" #include "memory/allocation.inline.hpp" #include "opto/connode.hpp" +#include "opto/mulnode.hpp" +#include "opto/subnode.hpp" #include "opto/vectornode.hpp" #include "utilities/powerOfTwo.hpp" +#include "utilities/globalDefinitions.hpp" //------------------------------VectorNode-------------------------------------- @@ -132,6 +135,12 @@ int VectorNode::opcode(int sopc, BasicType bt) { case Op_RoundDoubleMode: assert(bt == T_DOUBLE, "must be"); return Op_RoundDoubleModeV; + case Op_RotateLeft: + assert(bt == T_LONG || bt == T_INT, "must be"); + return Op_RotateLeftV; + case Op_RotateRight: + assert(bt == T_LONG || bt == T_INT, "must be"); + return Op_RotateRightV; case Op_SqrtF: assert(bt == T_FLOAT, "must be"); return Op_SqrtVF; @@ -239,6 +248,12 @@ bool VectorNode::implemented(int opc, uint vlen, BasicType bt) { (vlen > 1) && is_power_of_2(vlen) && Matcher::vector_size_supported(bt, vlen)) { int vopc = VectorNode::opcode(opc, bt); + // For rotate operation we will do a lazy de-generation into + // OrV/LShiftV/URShiftV pattern if the target does not support + // vector rotation instruction. + if (vopc == Op_RotateLeftV || vopc == Op_RotateRightV) { + return is_vector_rotate_supported(vopc, vlen, bt); + } return vopc > 0 && Matcher::match_rule_supported_vector(vopc, vlen, bt); } return false; @@ -263,13 +278,45 @@ bool VectorNode::is_muladds2i(Node* n) { return false; } -bool VectorNode::is_roundopD(Node *n) { +bool VectorNode::is_roundopD(Node* n) { if (n->Opcode() == Op_RoundDoubleMode) { return true; } return false; } +bool VectorNode::is_scalar_rotate(Node* n) { + if (n->Opcode() == Op_RotateLeft || n->Opcode() == Op_RotateRight) { + return true; + } + return false; +} + +bool VectorNode::is_vector_rotate_supported(int vopc, uint vlen, BasicType bt) { + assert(vopc == Op_RotateLeftV || vopc == Op_RotateRightV, "wrong opcode"); + + // If target defines vector rotation patterns then no + // need for degeneration. + if (Matcher::match_rule_supported_vector(vopc, vlen, bt)) { + return true; + } + + // Validate existence of nodes created in case of rotate degeneration. + switch (bt) { + case T_INT: + return Matcher::match_rule_supported_vector(Op_OrV, vlen, bt) && + Matcher::match_rule_supported_vector(Op_LShiftVI, vlen, bt) && + Matcher::match_rule_supported_vector(Op_URShiftVI, vlen, bt); + case T_LONG: + return Matcher::match_rule_supported_vector(Op_OrV, vlen, bt) && + Matcher::match_rule_supported_vector(Op_LShiftVL, vlen, bt) && + Matcher::match_rule_supported_vector(Op_URShiftVL, vlen, bt); + default: + assert(false, "not supported: %s", type2name(bt)); + return false; + } +} + bool VectorNode::is_shift(Node* n) { switch (n->Opcode()) { case Op_LShiftI: @@ -395,6 +442,8 @@ VectorNode* VectorNode::make(int opc, Node* n1, Node* n2, uint vlen, BasicType b case Op_SqrtVD: return new SqrtVDNode(n1, vt); case Op_PopCountVI: return new PopCountVINode(n1, vt); + case Op_RotateLeftV: return new RotateLeftVNode(n1, n2, vt); + case Op_RotateRightV: return new RotateRightVNode(n1, n2, vt); case Op_LShiftVB: return new LShiftVBNode(n1, n2, vt); case Op_LShiftVS: return new LShiftVSNode(n1, n2, vt); @@ -784,3 +833,161 @@ MacroLogicVNode* MacroLogicVNode::make(PhaseGVN& gvn, Node* in1, Node* in2, Node return new MacroLogicVNode(in1, in2, in3, fn, vt); } +Node* VectorNode::degenerate_vector_rotate(Node* src, Node* cnt, bool is_rotate_left, + int vlen, BasicType bt, PhaseGVN* phase) { + int shiftLOpc; + int shiftROpc; + Node* shiftLCnt = NULL; + Node* shiftRCnt = NULL; + const TypeVect* vt = TypeVect::make(bt, vlen); + + // Compute shift values for right rotation and + // later swap them in case of left rotation. + if (cnt->is_Con()) { + // Constant shift case. + if (bt == T_INT) { + int shift = cnt->get_int() & 31; + shiftRCnt = phase->intcon(shift); + shiftLCnt = phase->intcon(32 - shift); + shiftLOpc = Op_LShiftI; + shiftROpc = Op_URShiftI; + } else { + int shift = cnt->get_int() & 63; + shiftRCnt = phase->intcon(shift); + shiftLCnt = phase->intcon(64 - shift); + shiftLOpc = Op_LShiftL; + shiftROpc = Op_URShiftL; + } + } else { + // Variable shift case. + assert(VectorNode::is_invariant_vector(cnt), "Broadcast expected"); + cnt = cnt->in(1); + if (bt == T_INT) { + shiftRCnt = phase->transform(new AndINode(cnt, phase->intcon(31))); + shiftLCnt = phase->transform(new SubINode(phase->intcon(32), shiftRCnt)); + shiftLOpc = Op_LShiftI; + shiftROpc = Op_URShiftI; + } else { + assert(cnt->Opcode() == Op_ConvI2L, "ConvI2L expected"); + cnt = cnt->in(1); + shiftRCnt = phase->transform(new AndINode(cnt, phase->intcon(63))); + shiftLCnt = phase->transform(new SubINode(phase->intcon(64), shiftRCnt)); + shiftLOpc = Op_LShiftL; + shiftROpc = Op_URShiftL; + } + } + + // Swap the computed left and right shift counts. + if (is_rotate_left) { + swap(shiftRCnt,shiftLCnt); + } + + shiftLCnt = phase->transform(new LShiftCntVNode(shiftLCnt, vt)); + shiftRCnt = phase->transform(new RShiftCntVNode(shiftRCnt, vt)); + + return new OrVNode(phase->transform(VectorNode::make(shiftLOpc, src, shiftLCnt, vlen, bt)), + phase->transform(VectorNode::make(shiftROpc, src, shiftRCnt, vlen, bt)), + vt); +} + +Node* RotateLeftVNode::Ideal(PhaseGVN* phase, bool can_reshape) { + int vlen = length(); + BasicType bt = vect_type()->element_basic_type(); + if (!Matcher::match_rule_supported_vector(Op_RotateLeftV, vlen, bt)) { + return VectorNode::degenerate_vector_rotate(in(1), in(2), true, vlen, bt, phase); + } + return NULL; +} + +Node* RotateRightVNode::Ideal(PhaseGVN* phase, bool can_reshape) { + int vlen = length(); + BasicType bt = vect_type()->element_basic_type(); + if (!Matcher::match_rule_supported_vector(Op_RotateRightV, vlen, bt)) { + return VectorNode::degenerate_vector_rotate(in(1), in(2), false, vlen, bt, phase); + } + return NULL; +} + +Node* OrVNode::Ideal(PhaseGVN* phase, bool can_reshape) { + int lopcode = in(1)->Opcode(); + int ropcode = in(2)->Opcode(); + const TypeVect* vt = bottom_type()->is_vect(); + int vec_len = vt->length(); + BasicType bt = vt->element_basic_type(); + + // Vector Rotate operations inferencing, this will be useful when vector + // operations are created via non-SLP route i.e. (VectorAPI). + if (Matcher::match_rule_supported_vector(Op_RotateLeftV, vec_len, bt) && + ((ropcode == Op_LShiftVI && lopcode == Op_URShiftVI) || + (ropcode == Op_LShiftVL && lopcode == Op_URShiftVL)) && + in(1)->in(1) == in(2)->in(1)) { + assert(Op_RShiftCntV == in(1)->in(2)->Opcode(), "LShiftCntV operand expected"); + assert(Op_LShiftCntV == in(2)->in(2)->Opcode(), "RShiftCntV operand expected"); + Node* lshift = in(1)->in(2)->in(1); + Node* rshift = in(2)->in(2)->in(1); + int mod_val = bt == T_LONG ? 64 : 32; + int shift_mask = bt == T_LONG ? 0x3F : 0x1F; + // val >> norm_con_shift | val << (32 - norm_con_shift) => rotate_right val , + // norm_con_shift + if (lshift->is_Con() && rshift->is_Con() && + ((lshift->get_int() & shift_mask) == + (mod_val - (rshift->get_int() & shift_mask)))) { + return new RotateRightVNode( + in(1)->in(1), phase->intcon(lshift->get_int() & shift_mask), vt); + } + if (lshift->Opcode() == Op_AndI && rshift->Opcode() == Op_AndI && + lshift->in(2)->is_Con() && rshift->in(2)->is_Con() && + lshift->in(2)->get_int() == (mod_val - 1) && + rshift->in(2)->get_int() == (mod_val - 1)) { + lshift = lshift->in(1); + rshift = rshift->in(1); + // val << var_shift | val >> (0/32 - var_shift) => rotate_left val , + // var_shift + if (lshift->Opcode() == Op_SubI && lshift->in(2) == rshift && + lshift->in(1)->is_Con() && + (lshift->in(1)->get_int() == 0 || + lshift->in(1)->get_int() == mod_val)) { + Node* rotate_cnt = phase->transform(new ReplicateINode(rshift, vt)); + return new RotateLeftVNode(in(1)->in(1), rotate_cnt, vt); + } + } + } + + if (Matcher::match_rule_supported_vector(Op_RotateRightV, vec_len, bt) && + ((ropcode == Op_URShiftVI && lopcode == Op_LShiftVI) || + (ropcode == Op_URShiftVL && lopcode == Op_LShiftVL)) && + in(1)->in(1) == in(2)->in(1)) { + assert(Op_LShiftCntV == in(1)->in(2)->Opcode(), "RShiftCntV operand expected"); + assert(Op_RShiftCntV == in(2)->in(2)->Opcode(), "LShiftCntV operand expected"); + Node* rshift = in(1)->in(2)->in(1); + Node* lshift = in(2)->in(2)->in(1); + int mod_val = bt == T_LONG ? 64 : 32; + int shift_mask = bt == T_LONG ? 0x3F : 0x1F; + // val << norm_con_shift | val >> (32 - norm_con_shift) => rotate_left val + // , norm_con_shift + if (rshift->is_Con() && lshift->is_Con() && + ((rshift->get_int() & shift_mask) == + (mod_val - (lshift->get_int() & shift_mask)))) { + return new RotateLeftVNode( + in(1)->in(1), phase->intcon(rshift->get_int() & shift_mask), vt); + } + if (lshift->Opcode() == Op_AndI && rshift->Opcode() == Op_AndI && + lshift->in(2)->is_Con() && rshift->in(2)->is_Con() && + rshift->in(2)->get_int() == (mod_val - 1) && + lshift->in(2)->get_int() == (mod_val - 1)) { + rshift = rshift->in(1); + lshift = lshift->in(1); + // val >> var_shift | val << (0/32 - var_shift) => rotate_right val , + // var_shift + if (rshift->Opcode() == Op_SubI && rshift->in(2) == lshift && + rshift->in(1)->is_Con() && + (rshift->in(1)->get_int() == 0 || + rshift->in(1)->get_int() == mod_val)) { + Node* rotate_cnt = phase->transform(new ReplicateINode(lshift, vt)); + return new RotateRightVNode(in(1)->in(1), rotate_cnt, vt); + } + } + } + return NULL; +} + diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp index d6ceacf10b1..570f0645a01 100644 --- a/src/hotspot/share/opto/vectornode.hpp +++ b/src/hotspot/share/opto/vectornode.hpp @@ -78,10 +78,14 @@ class VectorNode : public TypeNode { static bool is_type_transition_short_to_int(Node* n); static bool is_type_transition_to_int(Node* n); static bool is_muladds2i(Node* n); - static bool is_roundopD(Node * n); + static bool is_roundopD(Node* n); + static bool is_scalar_rotate(Node* n); + static bool is_vector_rotate_supported(int vopc, uint vlen, BasicType bt); static bool is_invariant_vector(Node* n); static bool is_all_ones_vector(Node* n); static bool is_vector_bitwise_not_pattern(Node* n); + static Node* degenerate_vector_rotate(Node* n1, Node* n2, bool is_rotate_left, int vlen, + BasicType bt, PhaseGVN* phase); // [Start, end) half-open range defining which operands are vectors static void vector_operands(Node* n, uint* start, uint* end); @@ -620,6 +624,7 @@ class OrVNode : public VectorNode { public: OrVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {} virtual int Opcode() const; + Node* Ideal(PhaseGVN* phase, bool can_reshape); }; //------------------------------XorVNode--------------------------------------- @@ -1003,4 +1008,22 @@ public: static MacroLogicVNode* make(PhaseGVN& igvn, Node* in1, Node* in2, Node* in3, uint truth_table, const TypeVect* vt); }; +class RotateRightVNode : public VectorNode { +public: + RotateRightVNode(Node* in1, Node* in2, const TypeVect* vt) + : VectorNode(in1, in2, vt) {} + + virtual int Opcode() const; + Node* Ideal(PhaseGVN* phase, bool can_reshape); +}; + +class RotateLeftVNode : public VectorNode { +public: + RotateLeftVNode(Node* in1, Node* in2, const TypeVect* vt) + : VectorNode(in1, in2, vt) {} + + virtual int Opcode() const; + Node* Ideal(PhaseGVN* phase, bool can_reshape); +}; + #endif // SHARE_OPTO_VECTORNODE_HPP diff --git a/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java b/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java index 8ac63801df2..1c7129392b7 100644 --- a/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java +++ b/test/hotspot/jtreg/compiler/c2/cr6340864/TestIntVect.java @@ -30,6 +30,7 @@ * @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:MaxVectorSize=8 compiler.c2.cr6340864.TestIntVect * @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:MaxVectorSize=16 compiler.c2.cr6340864.TestIntVect * @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:MaxVectorSize=32 compiler.c2.cr6340864.TestIntVect + * @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:+IgnoreUnrecognizedVMOptions -XX:UseAVX=3 compiler.c2.cr6340864.TestIntVect */ package compiler.c2.cr6340864; @@ -41,6 +42,8 @@ public class TestIntVect { private static final int BIT_MASK = 0xEC80F731; private static final int VALUE = 15; private static final int SHIFT = 32; + private static final int SHIFT_LT_IMM8 = -128; + private static final int SHIFT_GT_IMM8 = 128; public static void main(String args[]) { System.out.println("Testing Integer vectors"); @@ -148,6 +151,13 @@ public class TestIntVect { test_srac_and(a0, a1); test_srav_and(a0, a1, BIT_MASK); + test1_ror(a0, a1); + test1_rol(a0, a1); + test2_ror(a0, a1); + test2_rol(a0, a1); + test3_ror(a0, a1, SHIFT); + test3_rol(a0, a1, SHIFT); + test_pack2(p2, a1); test_unpack2(a0, p2); test_pack2_swap(p2, a1); @@ -375,6 +385,30 @@ public class TestIntVect { for (int i=0; i>SHIFT)); } + test1_ror(a0, a1); + for (int i=0; i>>SHIFT_GT_IMM8) | (int)(ADD_INIT+i)<<-SHIFT_GT_IMM8)); + } + test1_rol(a0, a1); + for (int i=0; i>>-SHIFT_GT_IMM8)); + } + test2_ror(a0, a1); + for (int i=0; i>>SHIFT_LT_IMM8) | (int)(ADD_INIT+i)<<-SHIFT_LT_IMM8)); + } + test2_rol(a0, a1); + for (int i=0; i>>-SHIFT_LT_IMM8)); + } + test3_rol(a0, a1, SHIFT); + for (int i=0; i>>-SHIFT)); + } + test3_ror(a0, a1, SHIFT); + for (int i=0; i>>SHIFT) | (int)(ADD_INIT+i)<<-SHIFT)); + } test_sllc_on(a0, a1); for (int i=0; i>VALUE)); } + test1_ror(a0, a1); + for (int i=0; i>>SHIFT_GT_IMM8) | (long)(ADD_INIT+i)<<-SHIFT_GT_IMM8)); + } + test1_rol(a0, a1); + for (int i=0; i>>-SHIFT_GT_IMM8)); + } + test2_ror(a0, a1); + for (int i=0; i>>SHIFT_LT_IMM8) | (long)(ADD_INIT+i)<<-SHIFT_LT_IMM8)); + } + test2_rol(a0, a1); + for (int i=0; i>>-SHIFT_LT_IMM8)); + } + test3_rol(a0, a1, SHIFT); + for (int i=0; i>>-SHIFT)); + } + test3_ror(a0, a1, SHIFT); + for (int i=0; i>>SHIFT) | (long)(ADD_INIT+i)<<-SHIFT)); + } } if (errn > 0) @@ -852,6 +886,48 @@ public class TestLongVect { end = System.currentTimeMillis(); System.out.println("test_srav_and: " + (end - start)); + start = System.currentTimeMillis(); + for (int i=0; i>VALUE); } } + static void test1_rol(long[] a0, long[] a1) { + for (int i = 0; i < a0.length; i+=1) { + a0[i] = (long)(Long.rotateLeft(a1[i], SHIFT_GT_IMM8)); + } + } + static void test1_ror(long[] a0, long[] a1) { + for (int i = 0; i < a0.length; i+=1) { + a0[i] = (long)(Long.rotateRight(a1[i], SHIFT_GT_IMM8)); + } + } + static void test2_rol(long[] a0, long[] a1) { + for (int i = 0; i < a0.length; i+=1) { + a0[i] = (long)(Long.rotateLeft(a1[i], SHIFT_LT_IMM8)); + } + } + static void test2_ror(long[] a0, long[] a1) { + for (int i = 0; i < a0.length; i+=1) { + a0[i] = (long)(Long.rotateRight(a1[i], SHIFT_LT_IMM8)); + } + } + static void test3_rol(long[] a0, long[] a1, int shift) { + for (int i = 0; i < a0.length; i+=1) { + a0[i] = (long)(Long.rotateLeft(a1[i], shift)); + } + } + static void test3_ror(long[] a0, long[] a1, int shift) { + for (int i = 0; i < a0.length; i+=1) { + a0[i] = (long)(Long.rotateRight(a1[i], shift)); + } + } static int verify(String text, int i, long elem, long val) { if (elem != val) { diff --git a/test/hotspot/jtreg/compiler/intrinsics/TestRotate.java b/test/hotspot/jtreg/compiler/intrinsics/TestRotate.java new file mode 100644 index 00000000000..0bbc33b1406 --- /dev/null +++ b/test/hotspot/jtreg/compiler/intrinsics/TestRotate.java @@ -0,0 +1,309 @@ +/* + * Copyright (c) 2019, 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8248830 + * @summary Support for scalar rotates ([Integer/Long].rotate[Left/Right]). + * @library /test/lib + * @requires vm.compiler2.enabled + * + * @run main/othervm/timeout=600 -XX:-TieredCompilation -XX:CompileThreshold=1000 -Xbatch + * compiler.intrinsics.TestRotate + * + */ + +package compiler.intrinsics; + +import java.util.Arrays; +import java.util.Random; +import jdk.test.lib.Utils; + +public class TestRotate { + static int ITERS = 500000; + static int SIZE = 32; + static Random rand; + + static final int [] ref_rol_int = {1073741824,2147483647,-1847483168,-762700135,617181014,1499775590,770793873,-921711375,1843194553,618929189,543569581,-1524383055,-1358287055,-2015951670,1688073778,687346128,2069534693,-649937276,-1986172760,-1935023546,1291562794,-1493576900,1682263699,807071113,888440312,1299098553,1799312476,745578744,762073952,-1048231621,479680827,403988906}; + + static final int [] ref_ror_int = {1,2147483647,-1847483168,1244166759,1284961634,1704135065,770793873,-53535600,-1217156379,118049081,1667944966,1766387884,-960747332,849475009,2106366247,-532201309,-111225179,-1590275921,1733962274,-1851577736,1055640211,1872573386,356142481,1649149627,1025605133,1537928787,1799312476,-131305312,190518488,82773525,1321674198,-2126112095}; + + static final long [] ref_rol_long = {4611686018427387904L,9223372036854775807L,-3965526468698771170L,-4285866096636113521L,7635506276746300070L,5413117018148508287L,1868037460083876000L,-3244573585138770353L,7136025216317516898L,-4913621043675642569L,-6391133452542036978L,3902621950534797292L,-4632945906580257763L,4947809816008258399L,5235987658397734862L,2619582334080606650L,1815014778597694835L,-2451797983190531776L,-12499474356882106L,-8308822678069541478L,8441313153103433409L,3994820770127321462L,3403550366464210270L,-5787882067214947834L,-3689654055874130041L,-589861354719079036L,6641098980367723810L,763129181839551415L,4389436227302949880L,-8023110070632385182L,-8486732357167672789L,7236425339463197932L}; + + static final long [] ref_ror_long = {1L,9223372036854775807L,-3965526468698771170L,1303279687165097535L,-6959108088026060186L,681250795361731838L,3705372465420868140L,-8117671657526198993L,-335604442896202624L,-3176041913244586253L,-2152781018329716108L,975655487633699323L,8574521504761035792L,-5473888690750018935L,1581768605333334728L,7674419410656225425L,6685114322387540375L,5780227587575757360L,-799966358840454721L,8284086884492323912L,5288463661042741341L,912426852973757747L,-11970671133582816L,-344117270115783853L,-2106591766031512621L,-857638554601955011L,6641098980367723810L,-5257223391402178581L,1097359056825737470L,-4640791861453503840L,8696676574724001348L,-6526192196514797544L}; + + static final int [] ref_int_rol_shift_1 = {1,-2,600000961,1244166759,642480817,161047955,-1021158430,-2014938908,-1427785869,-467917532,857429648,-1524383055,1807911884,1884072061,845454838,1040479242,1471523198,1301556200,-1713993080,-1641781046,-809831772,-1713031218,-1529278125,-1361538303,1602441032,-689259628,-696342344,93197343,762073952,352644870,1972613577,223396003}; + + static final int [] ref_int_rol_shift_127 = {1073741824 ,-1073741825 ,1223742064 ,-762700135 ,1234362028 ,-1033479836 ,-1329031432 ,570007097 ,-356946468 ,956762441 ,214357412 ,1766387884 ,451977971 ,1544759839 ,-1936119939 ,-1887363838 ,-1779602849 ,325389050 ,645243554 ,-1484187086 ,871283881 ,-1501999629 ,-382319532 ,1807099072 ,400610258 ,901426917 ,899656238 ,-1050442489 ,190518488 ,-2059322431 ,1566895218 ,-1017892824}; + + static final int [] ref_int_rol_shift_128 = {-2147483648 ,2147483647 ,-1847483168 ,-1525400269 ,-1826243240 ,-2066959671 ,1636904433 ,1140014194 ,-713892935 ,1913524882 ,428714824 ,-762191528 ,903955942 ,-1205447618 ,422727419 ,520239621 ,735761599 ,650778100 ,1290487108 ,1326593125 ,1742567762 ,1290968039 ,-764639063 ,-680769152 ,801220516 ,1802853834 ,1799312476 ,-2100884977 ,381036976 ,176322435 ,-1161176860 ,-2035785647}; + + static final int [] ref_int_rol_shift_M128 = {-2147483648 ,2147483647 ,-1847483168 ,-1525400269 ,-1826243240 ,-2066959671 ,1636904433 ,1140014194 ,-713892935 ,1913524882 ,428714824 ,-762191528 ,903955942 ,-1205447618 ,422727419 ,520239621 ,735761599 ,650778100 ,1290487108 ,1326593125 ,1742567762 ,1290968039 ,-764639063 ,-680769152 ,801220516 ,1802853834 ,1799312476 ,-2100884977 ,381036976 ,176322435 ,-1161176860 ,-2035785647}; + + static final int [] ref_int_rol_shift_M129 = {1073741824 ,-1073741825 ,1223742064 ,-762700135 ,1234362028 ,-1033479836 ,-1329031432 ,570007097 ,-356946468 ,956762441 ,214357412 ,1766387884 ,451977971 ,1544759839 ,-1936119939 ,-1887363838 ,-1779602849 ,325389050 ,645243554 ,-1484187086 ,871283881 ,-1501999629 ,-382319532 ,1807099072 ,400610258 ,901426917 ,899656238 ,-1050442489 ,190518488 ,-2059322431 ,1566895218 ,-1017892824}; + + static final int [] ref_int_ror_shift_1 = {1073741824,-1073741825,1223742064,-762700135,1234362028,-1033479836,-1329031432,570007097,-356946468,956762441,214357412,1766387884,451977971,1544759839,-1936119939,-1887363838,-1779602849,325389050,645243554,-1484187086,871283881,-1501999629,-382319532,1807099072,400610258,901426917,899656238,-1050442489,190518488,-2059322431,1566895218,-1017892824}; + + static final int [] ref_int_ror_shift_127 = {1 ,-2 ,600000961 ,1244166759 ,642480817 ,161047955 ,-1021158430 ,-2014938908 ,-1427785869 ,-467917532 ,857429648 ,-1524383055 ,1807911884 ,1884072061 ,845454838 ,1040479242 ,1471523198 ,1301556200 ,-1713993080 ,-1641781046 ,-809831772 ,-1713031218 ,-1529278125 ,-1361538303 ,1602441032 ,-689259628 ,-696342344 ,93197343 ,762073952 ,352644870 ,1972613577 ,223396003}; + + static final int [] ref_int_ror_shift_128 = {-2147483648 ,2147483647 ,-1847483168 ,-1525400269 ,-1826243240 ,-2066959671 ,1636904433 ,1140014194 ,-713892935 ,1913524882 ,428714824 ,-762191528 ,903955942 ,-1205447618 ,422727419 ,520239621 ,735761599 ,650778100 ,1290487108 ,1326593125 ,1742567762 ,1290968039 ,-764639063 ,-680769152 ,801220516 ,1802853834 ,1799312476 ,-2100884977 ,381036976 ,176322435 ,-1161176860 ,-2035785647}; + + static final int [] ref_int_ror_shift_M128 = {-2147483648 ,2147483647 ,-1847483168 ,-1525400269 ,-1826243240 ,-2066959671 ,1636904433 ,1140014194 ,-713892935 ,1913524882 ,428714824 ,-762191528 ,903955942 ,-1205447618 ,422727419 ,520239621 ,735761599 ,650778100 ,1290487108 ,1326593125 ,1742567762 ,1290968039 ,-764639063 ,-680769152 ,801220516 ,1802853834 ,1799312476 ,-2100884977 ,381036976 ,176322435 ,-1161176860 ,-2035785647}; + + static final int [] ref_int_ror_shift_M129 = {1 ,-2 ,600000961 ,1244166759 ,642480817 ,161047955 ,-1021158430 ,-2014938908 ,-1427785869 ,-467917532 ,857429648 ,-1524383055 ,1807911884 ,1884072061 ,845454838 ,1040479242 ,1471523198 ,1301556200 ,-1713993080 ,-1641781046 ,-809831772 ,-1713031218 ,-1529278125 ,-1361538303 ,1602441032 ,-689259628 ,-696342344 ,93197343 ,762073952 ,352644870 ,1972613577 ,223396003}; + + + static final long [] ref_long_rol_shift_1 = { +1L,-2L,-7931052937397542339L,1303279687165097535L,5608201114852140040L,359735415298403453L,4701815018953926360L,8969694797557082089L,324535527229983777L,-3508390168714987589L,-8153196119534272952L,-5889362595358906884L,8065135560209711367L,-3515635332702993867L,-3582426625105780649L,1632572717772861065L,3572202937482896855L,-7534931108784269461L,8161459789691976885L,5213383633793760703L,5933801933688073239L,-6730200469375698045L,6308363257973444605L,-3098812595652498694L,-541332749731694416L,9008962398204287055L,6200852250644175020L,5992317991244719550L,1486051504252676350L,-6863599526811956670L,5846438278934178867L,2838151117945983671L}; + + static final long [] ref_long_rol_shift_127 = {4611686018427387904L,-4611686018427387905L,7240608802505390223L,-4285866096636113521L,1402050278713035010L,4701619872251988767L,1175453754738481590L,6854109717816658426L,4692819900234883848L,-877097542178746898L,2573386988543819666L,3139345369587661183L,-2595402128374960063L,8344463203679027341L,-895606656276445163L,5019829197870603170L,-3718635284056663691L,-1883732777196067366L,6652050965850382125L,-3308340109978947729L,-3128235535005369595L,-1682550117343924512L,6188776832920749055L,-5386389167340512578L,4476352830994464300L,-2359445418876316141L,1550213062661043755L,-7725292539043595921L,-8851859160791606721L,-6327585900130377072L,-3150076448693843188L,-3902148238940891987L}; + + static final long [] ref_long_rol_shift_128 = {-9223372036854775808L,9223372036854775807L,-3965526468698771170L,-8571732193272227041L,2804100557426070020L,-9043504329205574082L,2350907509476963180L,-4738524638076234764L,-9061104273239783920L,-1754195084357493795L,5146773977087639332L,6278690739175322366L,-5190804256749920125L,-1757817666351496934L,-1791213312552890325L,-8407085677968345276L,-7437270568113327381L,-3767465554392134731L,-5142642142008787366L,-6616680219957895457L,-6256471070010739189L,-3365100234687849023L,-6069190407868053506L,7673965739028526461L,8952705661988928600L,-4718890837752632281L,3100426125322087510L,2996158995622359775L,743025752126338175L,5791572273448797473L,-6300152897387686375L,-7804296477881783973L}; + + static final long [] ref_long_rol_shift_M128 = {-9223372036854775808L,9223372036854775807L,-3965526468698771170L,-8571732193272227041L,2804100557426070020L,-9043504329205574082L,2350907509476963180L,-4738524638076234764L,-9061104273239783920L,-1754195084357493795L,5146773977087639332L,6278690739175322366L,-5190804256749920125L,-1757817666351496934L,-1791213312552890325L,-8407085677968345276L,-7437270568113327381L,-3767465554392134731L,-5142642142008787366L,-6616680219957895457L,-6256471070010739189L,-3365100234687849023L,-6069190407868053506L,7673965739028526461L,8952705661988928600L,-4718890837752632281L,3100426125322087510L,2996158995622359775L,743025752126338175L,5791572273448797473L,-6300152897387686375L,-7804296477881783973L}; + + + static final long [] ref_long_rol_shift_M129 = {4611686018427387904L,-4611686018427387905L,7240608802505390223L,-4285866096636113521L,1402050278713035010L,4701619872251988767L,1175453754738481590L,6854109717816658426L,4692819900234883848L,-877097542178746898L,2573386988543819666L,3139345369587661183L,-2595402128374960063L,8344463203679027341L,-895606656276445163L,5019829197870603170L,-3718635284056663691L,-1883732777196067366L,6652050965850382125L,-3308340109978947729L,-3128235535005369595L,-1682550117343924512L,6188776832920749055L,-5386389167340512578L,4476352830994464300L,-2359445418876316141L,1550213062661043755L,-7725292539043595921L,-8851859160791606721L,-6327585900130377072L,-3150076448693843188L,-3902148238940891987L}; + + static final long [] ref_long_ror_shift_1 = {4611686018427387904L,-4611686018427387905L,7240608802505390223L,-4285866096636113521L,1402050278713035010L,4701619872251988767L,1175453754738481590L,6854109717816658426L,4692819900234883848L,-877097542178746898L,2573386988543819666L,3139345369587661183L,-2595402128374960063L,8344463203679027341L,-895606656276445163L,5019829197870603170L,-3718635284056663691L,-1883732777196067366L,6652050965850382125L,-3308340109978947729L,-3128235535005369595L,-1682550117343924512L,6188776832920749055L,-5386389167340512578L,4476352830994464300L,-2359445418876316141L,1550213062661043755L,-7725292539043595921L,-8851859160791606721L,-6327585900130377072L,-3150076448693843188L,-3902148238940891987L}; + + static final long [] ref_long_ror_shift_127 = {1L,-2L,-7931052937397542339L,1303279687165097535L,5608201114852140040L,359735415298403453L,4701815018953926360L,8969694797557082089L,324535527229983777L,-3508390168714987589L,-8153196119534272952L,-5889362595358906884L,8065135560209711367L,-3515635332702993867L,-3582426625105780649L,1632572717772861065L,3572202937482896855L,-7534931108784269461L,8161459789691976885L,5213383633793760703L,5933801933688073239L,-6730200469375698045L,6308363257973444605L,-3098812595652498694L,-541332749731694416L,9008962398204287055L,6200852250644175020L,5992317991244719550L,1486051504252676350L,-6863599526811956670L,5846438278934178867L,2838151117945983671L}; + + + static final long [] ref_long_ror_shift_128 = {-9223372036854775808L,9223372036854775807L,-3965526468698771170L,-8571732193272227041L,2804100557426070020L,-9043504329205574082L,2350907509476963180L,-4738524638076234764L,-9061104273239783920L,-1754195084357493795L,5146773977087639332L,6278690739175322366L,-5190804256749920125L,-1757817666351496934L,-1791213312552890325L,-8407085677968345276L,-7437270568113327381L,-3767465554392134731L,-5142642142008787366L,-6616680219957895457L,-6256471070010739189L,-3365100234687849023L,-6069190407868053506L,7673965739028526461L,8952705661988928600L,-4718890837752632281L,3100426125322087510L,2996158995622359775L,743025752126338175L,5791572273448797473L,-6300152897387686375L,-7804296477881783973L}; + + + static final long [] ref_long_ror_shift_M128 = {-9223372036854775808L,9223372036854775807L,-3965526468698771170L,-8571732193272227041L,2804100557426070020L,-9043504329205574082L,2350907509476963180L,-4738524638076234764L,-9061104273239783920L,-1754195084357493795L,5146773977087639332L,6278690739175322366L,-5190804256749920125L,-1757817666351496934L,-1791213312552890325L,-8407085677968345276L,-7437270568113327381L,-3767465554392134731L,-5142642142008787366L,-6616680219957895457L,-6256471070010739189L,-3365100234687849023L,-6069190407868053506L,7673965739028526461L,8952705661988928600L,-4718890837752632281L,3100426125322087510L,2996158995622359775L,743025752126338175L,5791572273448797473L,-6300152897387686375L,-7804296477881783973L}; + + static final long [] ref_long_ror_shift_M129 = {1L,-2L,-7931052937397542339L,1303279687165097535L,5608201114852140040L,359735415298403453L,4701815018953926360L,8969694797557082089L,324535527229983777L,-3508390168714987589L,-8153196119534272952L,-5889362595358906884L,8065135560209711367L,-3515635332702993867L,-3582426625105780649L,1632572717772861065L,3572202937482896855L,-7534931108784269461L,8161459789691976885L,5213383633793760703L,5933801933688073239L,-6730200469375698045L,6308363257973444605L,-3098812595652498694L,-541332749731694416L,9008962398204287055L,6200852250644175020L,5992317991244719550L,1486051504252676350L,-6863599526811956670L,5846438278934178867L,2838151117945983671L}; + + static void verify(String text, long ref, long actual) { + if (ref != actual) { + System.err.println(text + " " + ref + " != " + actual); + throw new Error("Fail"); + } + } + + public static int [] init_shift_vector(Random rand) { + int [] vec_int = new int [SIZE]; + vec_int[0] = 127; + vec_int[1] = -128; + vec_int[2] = 128; + vec_int[3] = -129; + for (int i = 4 ; i < SIZE ; i++) { + vec_int[i] = rand.nextInt(256); + } + return vec_int; + } + + public static int [] init_int_vector() { + int [] vec_int = new int [SIZE]; + vec_int[0] = Integer.MIN_VALUE; + vec_int[1] = Integer.MAX_VALUE; + for (int i = 2 ; i < SIZE ; i++) { + vec_int[i] = rand.nextInt(); + } + return vec_int; + } + + public static long [] init_long_vector() { + long [] vec_long = new long [SIZE]; + vec_long[0] = Long.MIN_VALUE; + vec_long[1] = Long.MAX_VALUE; + for (int i = 2 ; i < SIZE ; i++) { + vec_long[i] = rand.nextLong(); + } + return vec_long; + } + + public static void test_rol_int(int val, int shift, int index) { + int actual = Integer.rotateLeft(val, shift); + verify("Integer.rotateLeft shift = " + shift, ref_rol_int[index], actual); + actual = (val << shift) | (val >>> -shift); + verify("Pattern1 integer rotateLeft shift = " + shift, ref_rol_int[index], actual); + actual = (val << shift) | (val >>> 32-shift); + verify("Pattern2 integer rotateLeft shift = " + shift, ref_rol_int[index], actual); + } + + public static void test_ror_int(int val, int shift, int index) { + int actual = Integer.rotateRight(val, shift); + verify("Integer.rotateRight shift = " + shift, ref_ror_int[index], actual); + actual = (val >>> shift) | (val <<-shift); + verify("Pattern1 integer rotateRight shift = " + shift, ref_ror_int[index], actual); + actual = (val >>> shift) | (val <<-32-shift); + verify("Pattern2 integer rotateRight shift = " + shift, ref_ror_int[index], actual); + } + + public static void test_rol_long(long val, int shift, int index) { + long actual = Long.rotateLeft(val, shift); + verify("Long.rotateLeft shift = " + shift, ref_rol_long[index], actual); + actual = (val << shift) | (val >>>-shift); + verify("Pattern1 long rotateLeft shift = " + shift, ref_rol_long[index], actual); + actual = (val << shift) | (val >>>64-shift); + verify("Pattern2 long rotateLeft shift = " + shift, ref_rol_long[index], actual); + } + + public static void test_ror_long(long val, int shift, int index) { + long actual = Long.rotateRight(val, shift); + verify("Long.rotateRight shift = " + shift, ref_ror_long[index], actual); + actual = (val >>> shift) | (val <<-shift); + verify("Pattern1 long rotateRight shift = " + shift, ref_ror_long[index], actual); + actual = (val >>> shift) | (val <<64-shift); + verify("Pattern2 long rotateRight shift = " + shift, ref_ror_long[index], actual); + } + + public static void test_rol_int_const(int val, int index) { + int res1 = Integer.rotateLeft(val, 1); + verify("Constant integer rotateLeft shift = 1", res1 , ref_int_rol_shift_1[index]); + int res2 = (val << 1) | (val >>> -1); + verify("Constant integer rotateLeft shift = 1", res2 , ref_int_rol_shift_1[index]); + + res1 = Integer.rotateLeft(val, 127); + verify("Constant integer rotateLeft shift = 127", res1 , ref_int_rol_shift_127[index]); + res2 = (val << 127) | (val >>> -127); + verify("Constant integer rotateLeft shift = 127", res2 , ref_int_rol_shift_127[index]); + + res1 = Integer.rotateLeft(val, 128); + verify("Constant integer rotateLeft shift = 128", res1 , ref_int_rol_shift_128[index]); + res2 = (val << 128) | (val >>> -128); + verify("Constant integer rotateLeft pattern = 128", res2 , ref_int_rol_shift_128[index]); + + res1 = Integer.rotateLeft(val, -128); + verify("Constant integer rotateLeft shift = -128", res1 , ref_int_rol_shift_M128[index]); + res2 = (val << -128) | (val >>> 128); + verify("Constant integer rotateLeft pattern = 128", res2 , ref_int_rol_shift_M128[index]); + + res1 = Integer.rotateLeft(val, -129); + verify("Constant integer rotateLeft shift = -129", res1 , ref_int_rol_shift_M129[index]); + res2 = (val << -129) | (val >>> 129); + verify("Constant integer rotateLeft pattern = 129", res2 , ref_int_rol_shift_M129[index]); + } + + public static void test_ror_int_const(int val, int index) { + int res1 = Integer.rotateRight(val, 1); + verify("Constant integer rotateRight shift = 1", res1 , ref_int_ror_shift_1[index]); + int res2 = (val >>> 1) | (val << -1); + verify("Constant integer rotateRight pattern = 1", res2 , ref_int_ror_shift_1[index]); + + res1 = Integer.rotateRight(val, 127); + verify("Constant integer rotateRight shift = 127", res1 , ref_int_ror_shift_127[index]); + res2 = (val >>> 127) | (val << -127); + verify("Constant integer rotateRight pattern = 127", res2 , ref_int_ror_shift_127[index]); + + res1 = Integer.rotateRight(val, 128); + verify("Constant integer rotateRight shift = 128", res1 , ref_int_ror_shift_128[index]); + res2 = (val >>> 128) | (val << -128); + verify("Constant integer rotateRight pattern = 128", res2 , ref_int_ror_shift_128[index]); + + res1 = Integer.rotateRight(val, -128); + verify("Constant integer rotateRight shift = -128", res1 , ref_int_ror_shift_M128[index]); + res2 = (val >>> -128) | (val << 128); + verify("Constant integer rotateRight pattern = 128", res2 , ref_int_ror_shift_M128[index]); + + res1 = Integer.rotateRight(val, -129); + verify("Constant integer rotateRight shift = -129", res1 , ref_int_ror_shift_M129[index]); + res2 = (val >>> -129) | (val << 129); + verify("Constant integer rotateRight pattern = 129", res2 , ref_int_ror_shift_M129[index]); + } + + public static void test_rol_long_const(long val, int index) { + long res1 = Long.rotateLeft(val, 1); + verify("Constant long rotateLeft shift = 1", res1 , ref_long_rol_shift_1[index]); + long res2 = (val << 1) | (val >>> -1); + verify("Constant long rotateLeft pattern = 1", res2 , ref_long_rol_shift_1[index]); + + res1 = Long.rotateLeft(val, 127); + verify("Constant long rotateLeft shift = 127", res1 , ref_long_rol_shift_127[index]); + res2 = (val << 127) | (val >>> -127); + verify("Constant long rotateLeft pattern = 127", res2 , ref_long_rol_shift_127[index]); + + res1 = Long.rotateLeft(val, 128); + verify("Constant long rotateLeft shift = 128", res1 , ref_long_rol_shift_128[index]); + res2 = (val << 128) | (val >>> -128); + verify("Constant long rotateLeft pattern = 128", res2 , ref_long_rol_shift_128[index]); + + res1 = Long.rotateLeft(val, -128); + verify("Constant long rotateLeft shift = -128", res1 , ref_long_rol_shift_M128[index]); + res2 = (val << -128) | (val >>> 128); + verify("Constant long rotateLeft pattern = 128", res2 , ref_long_rol_shift_M128[index]); + + res1 = Long.rotateLeft(val, -129); + verify("Constant long rotateLeft shift = -129", res1 , ref_long_rol_shift_M129[index]); + res2 = (val << -129) | (val >>> 129); + verify("Constant long rotateLeft pattern = 129", res2 , ref_long_rol_shift_M129[index]); + } + + public static void test_ror_long_const(long val, int index) { + long res1 = Long.rotateRight(val, 1); + verify("Constant long rotateRight shift = 1", res1 , ref_long_ror_shift_1[index]); + long res2 = (val >>> 1) | (val << -1); + verify("Constant long rotateRight pattern = 1", res2 , ref_long_ror_shift_1[index]); + + res1 = Long.rotateRight(val, 127); + verify("Constant long rotateRight shift = 127", res1 , ref_long_ror_shift_127[index]); + res2 = (val >>> 127) | (val << -127); + verify("Constant long rotateRight pattern = 127", res2 , ref_long_ror_shift_127[index]); + + res1 = Long.rotateRight(val, 128); + verify("Constant long rotateRight shift = 128", res1 , ref_long_ror_shift_128[index]); + res2 = (val >>> 128) | (val << -128); + verify("Constant long rotateRight pattern = 128", res2 , ref_long_ror_shift_128[index]); + + res1 = Long.rotateRight(val, -128); + verify("Constant long rotateRight shift = -128", res1 , ref_long_ror_shift_M128[index]); + res2 = (val >>> -128) | (val << 128); + verify("Constant long rotateRight pattern = 128", res2 , ref_long_ror_shift_M128[index]); + + res1 = Long.rotateRight(val, -129); + verify("Constant long rotateRight shift = -129", res1 , ref_long_ror_shift_M129[index]); + res2 = (val >>> -129) | (val << 129); + verify("Constant long rotateRight pattern = 129", res2 , ref_long_ror_shift_M129[index]); + } + + public static void main(String args[]) throws Exception { + rand = new Random(8248830); + + int [] test_int = init_int_vector(); + long [] test_long = init_long_vector(); + int [] shift_vec = init_shift_vector(rand); + + try { + for (int i = 0 ; i < ITERS; i++) { + for (int j = 0 ; j < SIZE ; j++) { + test_rol_int(test_int[j], shift_vec[j], j); + test_ror_int(test_int[j], shift_vec[j], j); + test_rol_long(test_long[j], shift_vec[j], j); + test_ror_long(test_long[j], shift_vec[j], j); + + test_rol_int_const(test_int[j], j); + test_ror_int_const(test_int[j], j); + test_rol_long_const(test_long[j], j); + test_ror_long_const(test_long[j], j); + } + } + System.out.println("test status : PASS"); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + } +} diff --git a/test/micro/org/openjdk/bench/java/lang/RotateBenchmark.java b/test/micro/org/openjdk/bench/java/lang/RotateBenchmark.java new file mode 100644 index 00000000000..81fd956a4e6 --- /dev/null +++ b/test/micro/org/openjdk/bench/java/lang/RotateBenchmark.java @@ -0,0 +1,87 @@ +// +// Copyright (c) 2003, 2020, 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 +// under the terms of the GNU General Public License version 2 only, as +// published by the Free Software Foundation. +// +// This code is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// version 2 for more details (a copy is included in the LICENSE file that +// accompanied this code). +// +// You should have received a copy of the GNU General Public License version +// 2 along with this work; if not, write to the Free Software Foundation, +// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +// or visit www.oracle.com if you need additional information or have any +// questions. +// +// +package org.openjdk.bench.java.lang; + +import java.util.Random; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.infra.Blackhole; + +@OutputTimeUnit(TimeUnit.MILLISECONDS) +@State(Scope.Thread) +@BenchmarkMode(Mode.Throughput) +public class RotateBenchmark { + + @Param({"1024"}) + public int TESTSIZE; + + @Param({"20"}) + public int SHIFT; + + public long [] larr; + public int [] iarr; + + public long [] lres; + public int [] ires; + + + @Setup(Level.Trial) + public void BmSetup() { + Random r = new Random(1024); + larr = new long[TESTSIZE]; + iarr = new int[TESTSIZE]; + lres = new long[TESTSIZE]; + ires = new int[TESTSIZE]; + + for (int i = 0; i < TESTSIZE; i++) { + larr[i] = r.nextLong(); + } + + for (int i = 0; i < TESTSIZE; i++) { + iarr[i] = r.nextInt(); + } + } + + @Benchmark + public void testRotateLeftI() { + for (int i = 0; i < TESTSIZE; i++) + ires[i] = Integer.rotateLeft(iarr[i], SHIFT); + } + @Benchmark + public void testRotateRightI() { + for (int i = 0; i < TESTSIZE; i++) + ires[i] = Integer.rotateRight(iarr[i], SHIFT); + } + @Benchmark + public void testRotateLeftL() { + for (int i = 0; i < TESTSIZE; i++) + lres[i] = Long.rotateLeft(larr[i], SHIFT); + } + @Benchmark + public void testRotateRightL() { + for (int i = 0; i < TESTSIZE; i++) + lres[i] = Long.rotateRight(larr[i], SHIFT); + } + +} From b5d775f115e4274d8f0c221a8eb4a92d17a9f579 Mon Sep 17 00:00:00 2001 From: Abdul Kolarkunnu Date: Sat, 8 Aug 2020 20:29:27 -0700 Subject: [PATCH 054/100] 8248745: Add jarsigner and keytool tests for restricted algorithms Reviewed-by: mullan, hchao --- .../tools/jarsigner/RestrictedAlgo.java | 201 ++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java diff --git a/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java b/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java new file mode 100644 index 00000000000..07dc2e47b4b --- /dev/null +++ b/test/jdk/sun/security/tools/jarsigner/RestrictedAlgo.java @@ -0,0 +1,201 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import jdk.test.lib.SecurityTools; +import jdk.test.lib.util.JarUtils; +import jdk.test.lib.process.OutputAnalyzer; + +/** + * @test + * @bug 8248745 + * @summary Test key generation and jar signing with disabled algorithms and + * key sizes, with and without entries in jdk.jar.disabledAlgorithms, + * jdk.certpath.disabledAlgorithms + * @library /test/lib + * @run main/othervm RestrictedAlgo RESTRICT + * @run main/othervm RestrictedAlgo NO_RESTRICT + */ + +public class RestrictedAlgo { + + private static final String KEYSTORE = "keystore.jks"; + private static final String PASSWORD = "password"; + private static final String SIGNED_JARFILE = "signed.jar"; + private static final String UNSIGNED_JARFILE = "unsigned.jar"; + private static final String SECURITY_FILE = "java.security"; + private static final String NO_RESTRICT = "-J-Djava.security.properties=" + + SECURITY_FILE; + private static final String FIRST_FILE = "first.txt"; + private static final String WARNING = "Warning:"; + private static final String SECURITY_WARNING = + ".* is considered a security risk and is disabled."; + + private static String algoStatus; + + public static void main(String[] args) throws Exception { + + algoStatus = args[0]; + // create a jar file that contains one file + JarUtils.createJarFile(Path.of(UNSIGNED_JARFILE), Path.of("."), + new File(FIRST_FILE).exists() ? Paths.get(FIRST_FILE) + : Files.createFile(Paths.get(FIRST_FILE))); + if (!isAlgoRestricted()) { + // An alternative security properties + Files.writeString(Files.createFile(Paths.get(SECURITY_FILE)), + "jdk.certpath.disabledAlgorithms=\n" + + "jdk.jar.disabledAlgorithms=\n" + + "jdk.security.legacyAlgorithms="); + } + + System.out.println("\nTesting sigalg MD2\n"); + test("RSA", "MD2withRSA", "SigAlgMD2", "SHA256", true); + + System.out.println("\nTesting sigalg MD5\n"); + test("RSA", "MD5withRSA", "SigAlgMD5", "SHA256", true); + + System.out.println("\nTesting digestalg MD2\n"); + test("RSA", "SHA256withRSA", "DigestAlgMD2", "MD2", false); + + System.out.println("\nTesting digestalg MD5\n"); + test("RSA", "SHA256withRSA", "DigestAlgMD5", "MD5", false); + + System.out.println("\nTesting RSA Keysize: RSA keySize < 1024\n"); + test("RSA", "SHA256withRSA", "KeySizeRSA", "SHA256", true, + "-keysize", "512"); + + System.out.println("\nTesting DSA Keysize: DSA keySize < 1024\n"); + test("DSA", "SHA256withDSA", "KeySizeDSA", "SHA256", true, + "-keysize", "512"); + + System.out.println("\nTesting Native Curve:" + + " include jdk.disabled.namedCurves\n"); + test("EC", "SHA256withECDSA", "curve", "SHA256", true, + "-groupname", "secp112r1"); + } + + private static void test(String keyAlg, String sigAlg, String aliasPrefix, + String digestAlg, boolean isKeyToolVerify, + String... addKeyToolArgs) throws Exception { + + String alias = aliasPrefix + "_" + algoStatus; + testKeytool(keyAlg, sigAlg, alias, isKeyToolVerify, addKeyToolArgs); + testJarSignerSigning(sigAlg, alias, digestAlg); + testJarSignerVerification(); + } + + private static void testKeytool(String keyAlg, String sigAlg, String alias, + boolean isKeyToolVerify, String... additionalCmdArgs) + throws Exception { + + System.out.println("Testing Keytool\n"); + List cmd = prepareCommand( + "-genkeypair", + "-keystore", KEYSTORE, + "-storepass", PASSWORD, + "-dname", "CN=Test", + "-ext", "bc:c", + "-keyalg", keyAlg, + "-sigalg", sigAlg, + "-alias", alias, + "-J-Djdk.sunec.disableNative=false"); + for (String additionalCMDArg : additionalCmdArgs) { + cmd.add(additionalCMDArg); + } + + OutputAnalyzer analyzer = SecurityTools.keytool(cmd) + .shouldHaveExitValue(0); + if (isKeyToolVerify) { + verifyAnalyzer(analyzer); + } + } + + private static void testJarSignerSigning(String sigAlg, String alias, + String digestAlg) throws Exception { + + System.out.println("\nTesting JarSigner Signing\n"); + List cmd = prepareCommand( + "-keystore", KEYSTORE, + "-storepass", PASSWORD, + "-sigalg", sigAlg, + "-digestalg", digestAlg, + "-signedjar", SIGNED_JARFILE, + UNSIGNED_JARFILE, + alias, + "-J-Djdk.sunec.disableNative=false"); + + OutputAnalyzer analyzer = SecurityTools.jarsigner(cmd) + .shouldHaveExitValue(0); + + verifyAnalyzer(analyzer); + } + + private static void testJarSignerVerification() + throws Exception { + + System.out.println("\nTesting JarSigner Verification\n"); + List cmd = prepareCommand( + "-verify", + SIGNED_JARFILE, + "-J-Djdk.sunec.disableNative=false"); + + OutputAnalyzer analyzer = SecurityTools.jarsigner(cmd) + .shouldHaveExitValue(0); + + if (isAlgoRestricted()) { + analyzer.shouldContain("The jar will be treated as unsigned," + + " because it is signed with a weak algorithm that " + + "is now disabled."); + } else { + analyzer.shouldContain("jar verified."); + } + } + + private static List prepareCommand(String... options) { + List cmd = new ArrayList<>(); + cmd.addAll(Arrays.asList(options)); + if (!isAlgoRestricted()) { + cmd.add(NO_RESTRICT); + } + return cmd; + } + + private static void verifyAnalyzer(OutputAnalyzer analyzer) { + if (isAlgoRestricted()) { + analyzer.shouldContain(WARNING) + .shouldMatch(SECURITY_WARNING); + } else { + analyzer.shouldNotMatch(SECURITY_WARNING); + } + } + + private static boolean isAlgoRestricted() { + return ("RESTRICT".equals(algoStatus)) ? true : false; + } +} From 6df465de7309e90bc4de8da66c7059035ffc9bef Mon Sep 17 00:00:00 2001 From: Thomas Stuefe Date: Sun, 9 Aug 2020 09:20:02 +0200 Subject: [PATCH 055/100] 8251257: NMT: jcmd VM.native_memory scale=1 crashes target VM Reviewed-by: zgu, dholmes --- src/hotspot/share/services/nmtCommon.cpp | 1 + test/hotspot/jtreg/runtime/NMT/JcmdScale.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/hotspot/share/services/nmtCommon.cpp b/src/hotspot/share/services/nmtCommon.cpp index 10a6190d783..b90981f5cd2 100644 --- a/src/hotspot/share/services/nmtCommon.cpp +++ b/src/hotspot/share/services/nmtCommon.cpp @@ -35,6 +35,7 @@ const char* NMTUtil::_memory_type_names[] = { const char* NMTUtil::scale_name(size_t scale) { switch(scale) { + case 1: return ""; case K: return "KB"; case M: return "MB"; case G: return "GB"; diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdScale.java b/test/hotspot/jtreg/runtime/NMT/JcmdScale.java index 12a7f649e02..c0c08be0967 100644 --- a/test/hotspot/jtreg/runtime/NMT/JcmdScale.java +++ b/test/hotspot/jtreg/runtime/NMT/JcmdScale.java @@ -42,6 +42,14 @@ public class JcmdScale { // Grab my own PID String pid = Long.toString(ProcessTools.getProcessId()); + pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=1"}); + output = new OutputAnalyzer(pb.start()); + output.shouldContain(", committed="); + + pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=b"}); + output = new OutputAnalyzer(pb.start()); + output.shouldContain(", committed="); + pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=KB"}); output = new OutputAnalyzer(pb.start()); output.shouldContain("KB, committed="); From ee060c777c22515f6fdace1058024adac035cff5 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Sun, 9 Aug 2020 19:38:51 -0700 Subject: [PATCH 056/100] 8241951: SA core file tests failed to find core file for signed binaries on OSX 10.15 Reviewed-by: amenkov, dcubed --- test/lib/jdk/test/lib/util/CoreUtils.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/lib/jdk/test/lib/util/CoreUtils.java b/test/lib/jdk/test/lib/util/CoreUtils.java index c189aad2dae..cfff57bfd52 100644 --- a/test/lib/jdk/test/lib/util/CoreUtils.java +++ b/test/lib/jdk/test/lib/util/CoreUtils.java @@ -135,6 +135,14 @@ public class CoreUtils { if (!coresDir.canWrite()) { throw new SkippedException("Directory \"" + coresDir + "\" is not writable"); } + if (Platform.isSignedOSX()) { + if (Platform.getOsVersionMajor() > 10 || + (Platform.getOsVersionMajor() == 10 && Platform.getOsVersionMinor() >= 15)) + { + // We can't generate cores files with signed binaries on OSX 10.15 and later. + throw new SkippedException("Cannot produce core file with signed binary on OSX 10.15 and later"); + } + } } else if (Platform.isLinux()) { // Check if a crash report tool is installed. File corePatternFile = new File(CORE_PATTERN_FILE_NAME); From c1093dc2447c39c0bd1e1db3627dd353662a5040 Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Sun, 9 Aug 2020 20:56:04 -0700 Subject: [PATCH 057/100] 8251213: [TESTBUG] CDS tests shouldn't write output files into test.classes directory Reviewed-by: minqi, ccheung --- .../runtime/cds/appcds/AppendClasspath.java | 9 +++-- .../cds/appcds/BootClassPathMismatch.java | 2 +- .../runtime/cds/appcds/ClassPathAttr.java | 7 ++-- .../jtreg/runtime/cds/appcds/JarBuilder.java | 15 +++---- .../runtime/cds/appcds/LongClassListPath.java | 6 +-- .../jtreg/runtime/cds/appcds/MoveJDKTest.java | 9 +++-- .../runtime/cds/appcds/MultiReleaseJars.java | 5 ++- .../runtime/cds/appcds/NonExistClasspath.java | 11 +++--- .../runtime/cds/appcds/OldClassTest.java | 8 ++-- .../jtreg/runtime/cds/appcds/TestCommon.java | 9 ++--- .../runtime/cds/appcds/VerifierTest.java | 10 ++--- .../dynamicArchive/CDSStreamTestDriver.java | 6 +-- .../dynamicArchive/DoubleSumAverageTest.java | 3 +- .../dynamicArchive/HelloDynamicCustom.java | 4 +- .../HelloDynamicCustomUnload.java | 4 +- .../LambdaForClassInBaseArchive.java | 4 +- .../dynamicArchive/NoClassToArchive.java | 4 +- .../methodHandles/CDSMHTest_generate.sh | 27 +++++++++++-- .../MethodHandlesAsCollectorTest.java | 3 +- .../MethodHandlesCastFailureTest.java | 3 +- .../MethodHandlesGeneralTest.java | 3 +- .../MethodHandlesInvokersTest.java | 3 +- .../MethodHandlesPermuteArgumentsTest.java | 3 +- .../MethodHandlesSpreadArgumentsTest.java | 3 +- test/lib/jdk/test/lib/cds/CDSTestUtils.java | 39 +++++++++++++------ 25 files changed, 113 insertions(+), 87 deletions(-) diff --git a/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java index a6a670a62a6..be927dbc7b4 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -36,6 +36,7 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; public class AppendClasspath { @@ -54,11 +55,11 @@ public class AppendClasspath { .assertNormalExit(); // PASS: 2) runtime has an non-existing jar in the -cp - String classDir = System.getProperty("test.classes"); + String outDir = CDSTestUtils.getOutputDir(); String newFile = "non-exist.jar"; - String nonExistPath = classDir + File.separator + newFile; + String nonExistPath = outDir + File.separator + newFile; String classPath = appJar + File.pathSeparator + nonExistPath; - File nonExistJar = new File(classDir, newFile); + File nonExistJar = new File(outDir, newFile); if (nonExistJar.exists()) { nonExistJar.delete(); } diff --git a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java index 7016558be9f..279c3286ca1 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java @@ -237,7 +237,7 @@ public class BootClassPathMismatch { } private static void copyHelloToNewDir() throws Exception { - String classDir = System.getProperty("test.classes"); + String classDir = CDSTestUtils.getOutputDir(); String dstDir = classDir + File.separator + "newdir"; try { Files.createDirectory(Paths.get(dstDir)); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java index 16187f215f5..bf9bb5bb274 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -30,6 +30,7 @@ * @run driver/timeout=240 ClassPathAttr */ +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; import java.io.File; import java.nio.file.Files; @@ -101,7 +102,7 @@ public class ClassPathAttr { buildCpAttr("cpattr6", "cpattr6.mf", "CpAttr6", "CpAttr6"); String cp = TestCommon.getTestJar("cpattr6.jar"); - String nonExistPath = System.getProperty("test.classes") + File.separator + "cpattrX.jar"; + String nonExistPath = CDSTestUtils.getOutputDir() + File.separator + "cpattrX.jar"; (new File(nonExistPath)).delete(); TestCommon.testDump(cp, TestCommon.list("CpAttr6"), @@ -129,7 +130,7 @@ public class ClassPathAttr { } private static void buildCpAttr(String jarName, String manifest, String enclosingClassName, String ...testClassNames) throws Exception { - String jarClassesDir = System.getProperty("test.classes") + File.separator + jarName + "_classes"; + String jarClassesDir = CDSTestUtils.getOutputDir() + File.separator + jarName + "_classes"; try { Files.createDirectory(Paths.get(jarClassesDir)); } catch (FileAlreadyExistsException e) { } JarBuilder.compile(jarClassesDir, System.getProperty("test.src") + File.separator + diff --git a/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java index 88cfd2437c2..0929d0cc114 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java @@ -32,6 +32,7 @@ */ import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.compiler.CompilerUtils; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; @@ -48,7 +49,7 @@ public class JarBuilder { .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found")); public static String getJarFilePath(String jarName) { - return classDir + File.separator + jarName + ".jar"; + return CDSTestUtils.getOutputDir() + File.separator + jarName + ".jar"; } // jar all files under dir, with manifest file man, with an optional versionArgs @@ -59,7 +60,7 @@ public class JarBuilder { // -C .\ // --release 9 -C . // the last line begins with "--release" corresponds to the optional versionArgs. - public static void build(String jarName, File dir, String man, String ...versionArgs) + public static String build(String jarName, File dir, String man, String ...versionArgs) throws Exception { ArrayList args = new ArrayList(); if (man != null) { @@ -67,7 +68,8 @@ public class JarBuilder { } else { args.add("cf"); } - args.add(classDir + File.separator + jarName + ".jar"); + String jarFile = getJarFilePath(jarName); + args.add(jarFile); if (man != null) { args.add(man); } @@ -78,6 +80,7 @@ public class JarBuilder { args.add(verArg); } createJar(args); + return jarFile; } public static String build(String jarName, String ...classNames) @@ -259,8 +262,6 @@ public class JarBuilder { public static void signJar() throws Exception { String keyTool = JDKToolFinder.getJDKTool("keytool"); String jarSigner = JDKToolFinder.getJDKTool("jarsigner"); - String classDir = System.getProperty("test.classes"); - String FS = File.separator; executeProcess(keyTool, "-genkey", "-keystore", "./keystore", "-alias", "mykey", @@ -270,8 +271,8 @@ public class JarBuilder { executeProcess(jarSigner, "-keystore", "./keystore", "-storepass", "abc123", "-keypass", - "abc123", "-signedjar", classDir + FS + "signed_hello.jar", - classDir + FS + "hello.jar", "mykey") + "abc123", "-signedjar", getJarFilePath("signed_hello"), + getJarFilePath("hello"), "mykey") .shouldHaveExitValue(0); } diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java index 59c7b2b3567..b50b0ad47d9 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -51,14 +51,14 @@ public class LongClassListPath { // Create a directory with long path and copy the classlist file to // the directory. - Path classDir = Paths.get(System.getProperty("test.classes")); + Path classDir = Paths.get(CDSTestUtils.getOutputDir()); Path destDir = classDir; int subDirLen = MAX_PATH - classDir.toString().length() - 2; if (subDirLen > 0) { char[] chars = new char[subDirLen]; Arrays.fill(chars, 'x'); String subPath = new String(chars); - destDir = Paths.get(System.getProperty("test.classes"), subPath); + destDir = Paths.get(CDSTestUtils.getOutputDir(), subPath); } File longDir = destDir.toFile(); longDir.mkdir(); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java index 09572d1293f..7cfd5b7107c 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java @@ -41,6 +41,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; public class MoveJDKTest { @@ -178,12 +179,12 @@ public class MoveJDKTest { } private static String copyFakeModulesFromHelloJar() throws Exception { - String classDir = System.getProperty("test.classes"); + String outDir = CDSTestUtils.getOutputDir(); String newFile = "hello.modules"; - String path = classDir + File.separator + newFile; + String path = outDir + File.separator + newFile; - Files.copy(Paths.get(classDir, "hello.jar"), - Paths.get(classDir, newFile), + Files.copy(Paths.get(outDir, "hello.jar"), + Paths.get(outDir, newFile), StandardCopyOption.REPLACE_EXISTING); return path; } diff --git a/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java index 6da874393fa..6563a38d230 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, 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 @@ -34,6 +34,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.PrintStream; import java.io.IOException; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; public class MultiReleaseJars { @@ -90,7 +91,7 @@ public class MultiReleaseJars { * META-INF/versions//version/Version.class */ static void createClassFilesAndJar() throws Exception { - String tempDir = System.getProperty("test.classes"); + String tempDir = CDSTestUtils.getOutputDir(); File baseDir = new File(tempDir + File.separator + "base"); File vDir = new File(tempDir + File.separator + MAJOR_VERSION_STRING); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java index 30f916681ee..a08f1c5ff15 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -36,6 +36,7 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; public class NonExistClasspath { @@ -46,9 +47,9 @@ public class NonExistClasspath { } static void doTest(String appJar, boolean bootcp) throws Exception { - String classDir = System.getProperty("test.classes"); + String outDir = CDSTestUtils.getOutputDir(); String newFile = "non-exist.jar"; - String nonExistPath = classDir + File.separator + newFile; + String nonExistPath = outDir + File.separator + newFile; final String errorMessage1 = "Unable to use shared archive"; final String errorMessage2 = "shared class paths mismatch"; final String errorMessage3 = (bootcp ? "BOOT" : "APP") + " classpath mismatch"; @@ -90,8 +91,8 @@ public class NonExistClasspath { .assertNormalExit(); // Now make nonExistPath exist. CDS will fail to load. - Files.copy(Paths.get(classDir, "hello.jar"), - Paths.get(classDir, newFile), + Files.copy(Paths.get(outDir, "hello.jar"), + Paths.get(outDir, newFile), StandardCopyOption.REPLACE_EXISTING); TestCommon.run(make_args(bootcp, diff --git a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java index 4869705c87a..b2401f87112 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -45,10 +45,8 @@ public class OldClassTest implements Opcodes { public static void main(String[] args) throws Exception { File jarSrcFile = new File(JarBuilder.getOrCreateHelloJar()); - - File dir = new File(System.getProperty("test.classes", ".")); - File jarFile = new File(dir, "OldClassTest_old.jar"); - String jar = jarFile.getPath(); + String jar = JarBuilder.getJarFilePath("OldClassTest_old"); + File jarFile = new File(jar); if (!jarFile.exists() || jarFile.lastModified() < jarSrcFile.lastModified()) { createTestJarFile(jarSrcFile, jarFile); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java index 39ce615ac0e..ec1ca50fabd 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -321,12 +321,11 @@ public class TestCommon extends CDSTestUtils { firstJar = firstJar.substring(0, n); } String classDir = System.getProperty("test.classes"); - String expected1 = classDir + File.separator; - String expected2 = System.getProperty("user.dir") + File.separator; + String expected = getOutputDir() + File.separator; - if (!firstJar.startsWith(expected1) && !firstJar.startsWith(expected2)) { + if (!firstJar.startsWith(expected)) { throw new RuntimeException("FIXME: jar file not at a supported location ('" - + expected1 + "', or '" + expected2 + "'): " + firstJar); + + expected + "'): " + firstJar); } String replaceJar = firstJar + ".tmp"; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java index cbae7c36d54..1a0b29bc80d 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, 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 @@ -62,15 +62,13 @@ public class VerifierTest implements Opcodes { String jarName_hi = "hi" + "_" + subCaseId; - JarBuilder.build(jarName_verifier_test_tmp, "VerifierTest0", "VerifierTestA", + File jarSrcFile = new File(JarBuilder.build(jarName_verifier_test_tmp, "VerifierTest0", "VerifierTestA", "VerifierTestB", "VerifierTestC", "VerifierTestD", "VerifierTestE", - "UnverifiableBase", "UnverifiableIntf", "UnverifiableIntfSub"); + "UnverifiableBase", "UnverifiableIntf", "UnverifiableIntfSub")); JarBuilder.build(jarName_greet, "Greet"); JarBuilder.build(jarName_hi, "Hi", "Hi$MyClass"); - File dir = new File(System.getProperty("test.classes", ".")); - File jarSrcFile = new File(dir, jarName_verifier_test_tmp + ".jar"); - File jarFile = new File(dir, jarName_verifier_test + ".jar"); + File jarFile = new File(JarBuilder.getJarFilePath(jarName_verifier_test)); String jar = jarFile.getPath(); if (!jarFile.exists() || jarFile.lastModified() < jarSrcFile.lastModified()) { diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java index ba5dedde6bd..9525e12b1e8 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java @@ -36,11 +36,8 @@ */ import org.testng.annotations.Test; - import java.io.File; - import jtreg.SkippedException; - import sun.hotspot.gc.GC; @Test @@ -58,8 +55,7 @@ public class CDSStreamTestDriver extends DynamicArchiveTestBase { static void doTest() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("streamapp", new File(classDir), null); - String appJar = classDir + File.separator + "streamapp.jar"; + String appJar = JarBuilder.build("streamapp", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String testngJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DoubleSumAverageTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DoubleSumAverageTest.java index 01b8d7d5849..6d6d3b78c0d 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DoubleSumAverageTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DoubleSumAverageTest.java @@ -47,8 +47,7 @@ public class DoubleSumAverageTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("stream", new File(classDir), null); - String appJar = classDir + File.separator + "stream.jar"; + String appJar = JarBuilder.build("stream", new File(classDir), null); dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace", "-cp", appJar, mainClass); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java index 2dc36726768..69e44f1e419 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustom.java @@ -36,11 +36,11 @@ */ import java.io.File; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; public class HelloDynamicCustom extends DynamicArchiveTestBase { - private static final String ARCHIVE_NAME = - System.getProperty("test.classes") + File.separator + "HelloDynamicCustom-top.jsa"; + private static final String ARCHIVE_NAME = CDSTestUtils.getOutputFileName("top.jsa"); public static void main(String[] args) throws Exception { runTest(HelloDynamicCustom::testDefaultBase); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java index d4ada452a18..1f8d907434c 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicCustomUnload.java @@ -39,10 +39,10 @@ */ import java.io.File; +import jdk.test.lib.cds.CDSTestUtils; public class HelloDynamicCustomUnload extends DynamicArchiveTestBase { - private static final String ARCHIVE_NAME = - System.getProperty("test.classes") + File.separator + "HelloDynamicCustomUnload.jsa"; + private static final String ARCHIVE_NAME = CDSTestUtils.getOutputFileName("top.jsa"); public static void main(String[] args) throws Exception { runTest(HelloDynamicCustomUnload::testDefaultBase); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdaForClassInBaseArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdaForClassInBaseArchive.java index e68bf028d7f..4de1f4a188b 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdaForClassInBaseArchive.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdaForClassInBaseArchive.java @@ -37,12 +37,12 @@ */ import java.io.File; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; public class LambdaForClassInBaseArchive extends DynamicArchiveTestBase { - static final String classList = System.getProperty("test.classes") + - File.separator + "LambdaForClassInBaseArchive.list"; + static final String classList = CDSTestUtils.getOutputFileName("classlist"); static final String appClass = "SimpleApp"; public static void main(String[] args) throws Exception { diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java index 1568f60efba..947b1444c10 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/NoClassToArchive.java @@ -45,14 +45,14 @@ */ import java.io.File; +import jdk.test.lib.cds.CDSTestUtils; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; public class NoClassToArchive extends DynamicArchiveTestBase { static final String warningMessage = "There is no class to be included in the dynamic archive"; - static final String classList = System.getProperty("test.classes") + - File.separator + "NoClassToArchive.list"; + static final String classList = CDSTestUtils.getOutputFileName("classlist"); static final String appClass = "StrConcatApp"; public static void main(String[] args) throws Exception { diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh index def90c398fc..9ac1e5c4749 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh @@ -30,7 +30,29 @@ for i in "${testnames[@]}" do fname="$i$name_suffix" cat << EOF > $fname - +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ // this file is auto-generated by $0. Do not edit manually. /* @@ -78,8 +100,7 @@ public class $i extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java index 20f73d444f9..39066c7f641 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java @@ -68,8 +68,7 @@ public class MethodHandlesAsCollectorTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java index 3405a31b744..0c3482ba95e 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java @@ -68,8 +68,7 @@ public class MethodHandlesCastFailureTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java index 0a0655c0c81..4d78b79692e 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java @@ -68,8 +68,7 @@ public class MethodHandlesGeneralTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java index 95b369e2554..15622747bff 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java @@ -68,8 +68,7 @@ public class MethodHandlesInvokersTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java index f612171432a..d07e1c00ad5 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java @@ -68,8 +68,7 @@ public class MethodHandlesPermuteArgumentsTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java index f9962b6499e..d8d6c77b7d9 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java @@ -68,8 +68,7 @@ public class MethodHandlesSpreadArgumentsTest extends DynamicArchiveTestBase { static void testImpl() throws Exception { String topArchiveName = getNewArchiveName(); - JarBuilder.build("MH", new File(classDir), null); - String appJar = classDir + File.separator + "MH.jar"; + String appJar = JarBuilder.build("MH", new File(classDir), null); String[] classPaths = javaClassPath.split(File.pathSeparator); String junitJar = null; diff --git a/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java index 2582833e3b3..cfa6bbddfcc 100644 --- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java +++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java @@ -482,11 +482,21 @@ public class CDSTestUtils { return output; } + private static final String outputDir; + private static final File outputDirAsFile; + + static { + outputDir = System.getProperty("user.dir", "."); + outputDirAsFile = new File(outputDir); + } + + public static String getOutputDir() { + return outputDir; + } // get the file object for the test artifact public static File getTestArtifact(String name, boolean checkExistence) { - File dir = new File(System.getProperty("test.classes", ".")); - File file = new File(dir, name); + File file = new File(outputDirAsFile, name); if (checkExistence && !file.exists()) { throw new RuntimeException("Cannot find " + file.getPath()); @@ -549,14 +559,16 @@ public class CDSTestUtils { // ===================== FILE ACCESS convenience methods public static File getOutputFile(String name) { - File dir = new File(System.getProperty("test.classes", ".")); - return new File(dir, testName + "-" + name); + return new File(outputDirAsFile, testName + "-" + name); + } + + public static String getOutputFileName(String name) { + return getOutputFile(name).getName(); } public static File getOutputSourceFile(String name) { - File dir = new File(System.getProperty("test.classes", ".")); - return new File(dir, name); + return new File(outputDirAsFile, name); } @@ -570,14 +582,17 @@ public class CDSTestUtils { public static OutputAnalyzer executeAndLog(ProcessBuilder pb, String logName) throws Exception { long started = System.currentTimeMillis(); OutputAnalyzer output = new OutputAnalyzer(pb.start()); - String outputFileNamePrefix = - testName + "-" + String.format("%04d", getNextLogCounter()) + "-" + logName; + String logFileNameStem = + String.format("%04d", getNextLogCounter()) + "-" + logName; - writeFile(getOutputFile(outputFileNamePrefix + ".stdout"), output.getStdout()); - writeFile(getOutputFile(outputFileNamePrefix + ".stderr"), output.getStderr()); + File stdout = getOutputFile(logFileNameStem + ".stdout"); + File stderr = getOutputFile(logFileNameStem + ".stderr"); + + writeFile(stdout, output.getStdout()); + writeFile(stderr, output.getStderr()); System.out.println("[ELAPSED: " + (System.currentTimeMillis() - started) + " ms]"); - System.out.println("[logging stdout to " + outputFileNamePrefix + ".stdout]"); - System.out.println("[logging stderr to " + outputFileNamePrefix + ".stderr]"); + System.out.println("[logging stdout to " + stdout + "]"); + System.out.println("[logging stderr to " + stderr + "]"); System.out.println("[STDERR]\n" + output.getStderr()); if (copyChildStdoutToMainStdout) From 970e251a54d3b8871d3b948c1632c124f248cb01 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Mon, 10 Aug 2020 08:21:14 +0200 Subject: [PATCH 058/100] 8249608: Vector register used by C2 compiled method corrupted at safepoint Always update 'max_vlen_in_bytes'. Reviewed-by: kvn, vlivanov, chagedorn --- src/hotspot/share/opto/superword.cpp | 4 +- .../TestVectorsNotSavedAtSafepoint.java | 102 ++++++++++++++++++ 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestVectorsNotSavedAtSafepoint.java diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index 3a9b6b555a9..4a708488c42 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -2637,8 +2637,10 @@ void SuperWord::output() { } } - if (vlen_in_bytes >= max_vlen_in_bytes && vlen > max_vlen) { + if (vlen > max_vlen) { max_vlen = vlen; + } + if (vlen_in_bytes > max_vlen_in_bytes) { max_vlen_in_bytes = vlen_in_bytes; } #ifdef ASSERT diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorsNotSavedAtSafepoint.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorsNotSavedAtSafepoint.java new file mode 100644 index 00000000000..ce524d301ed --- /dev/null +++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorsNotSavedAtSafepoint.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, Red Hat, Inc. 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8193518 8249608 + * @summary C2: Vector registers are sometimes corrupted at safepoint + * @run main/othervm -XX:-BackgroundCompilation -XX:+UseCountedLoopSafepoints -XX:LoopStripMiningIter=1000 TestVectorsNotSavedAtSafepoint test1 + * @run main/othervm -XX:-BackgroundCompilation TestVectorsNotSavedAtSafepoint test2 + */ + +import java.util.Arrays; + +public class TestVectorsNotSavedAtSafepoint { + + static void test1(byte[] barray1, byte[] barray2, byte[] barray3, long[] larray, long v) { + // Uses wide vectors, v in vector registers is live at the + // safepoint of the outer strip mined loop + for (int i = 0; i < larray.length; i++) { + larray[i] = v; + } + // Runs for few iterations so limited unrolling and short + // vectors + for (int i = 0; i < barray3.length; i++) { + barray3[i] = (byte)(barray1[i] + barray2[i]); + } + } + + public static void test2(int[] iArr, long[] lArr) { + // Loop with wide and non-wide vectors + for (int i = 0; i < lArr.length; i++) { + iArr[i] = 1; + lArr[i] = 1; + } + } + + static class GarbageProducerThread extends Thread { + public void run() { + for(;;) { + Object[] arrays = new Object[1024]; + for (int i = 0; i < arrays.length; i++) { + arrays[i] = new int[1024]; + } + } + } + } + + public static void main(String[] args) { + Thread garbage_producer = new GarbageProducerThread(); + garbage_producer.setDaemon(true); + garbage_producer.start(); + + if (args[0].equals("test1")) { + byte[] barray = new byte[10]; + long[] larray1 = new long[1000]; + long[] larray2 = new long[100_000_000]; + for (int i = 0; i < 20_000; i++) { + test1(barray, barray, barray, larray1, -1); + } + for (int i = 0; i < 100; i++) { + test1(barray, barray, barray, larray2, -1); + if (larray2[larray2.length-1] != -1) { + System.out.println("Iter " + i + " Failed with " + Long.toHexString(larray2[larray2.length-1])); + throw new RuntimeException("Test1 failed"); + } + } + } else { + int iArr[] = new int[100]; + long lArr[] = new long[100]; + for (int i = 0; i < 600_000; ++i) { + test2(iArr, lArr); + for (int j = 0; j < lArr.length; ++j) { + if (iArr[j] != 1 || lArr[j] != 1) { + throw new RuntimeException("Test2 failed at iteration " + i + ": iArr[" + j + "] = " + iArr[j] + ", lArr[" + j + "] = " + lArr[j]); + } + } + } + } + } +} + From 032a4d6b9f1af0d36ee777ab87d505224d8e1154 Mon Sep 17 00:00:00 2001 From: Nikola Grcevski Date: Mon, 10 Aug 2020 08:36:56 +0200 Subject: [PATCH 059/100] 8241007: Shenandoah: remove ShenandoahCriticalControlThreadPriority support Reviewed-by: adityam, shade --- .../gc/shenandoah/shenandoahControlThread.cpp | 2 +- .../gc/shenandoah/shenandoah_globals.hpp | 3 -- .../TestCriticalControlThreadPriority.java | 41 ------------------- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp index c0fae236f6e..5076811fbac 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp @@ -50,7 +50,7 @@ ShenandoahControlThread::ShenandoahControlThread() : _allocs_seen(0) { reset_gc_id(); - create_and_start(ShenandoahCriticalControlThreadPriority ? CriticalPriority : NearMaxPriority); + create_and_start(); _periodic_task.enroll(); _periodic_satb_flush_task.enroll(); if (ShenandoahPacing) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp index 217eb550898..b2eb4b2bfdf 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp @@ -191,9 +191,6 @@ "adjustment. Lower values make adjustments faster, at the " \ "expense of higher perf overhead. Time is in milliseconds.") \ \ - experimental(bool, ShenandoahCriticalControlThreadPriority, false, \ - "Run control thread runs at critical scheduling priority.") \ - \ diagnostic(bool, ShenandoahVerify, false, \ "Enable internal verification. This would catch many GC bugs, " \ "but it would also stall the collector during the verification, " \ diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java b/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java deleted file mode 100644 index 152a1ea077f..00000000000 --- a/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2019, Red Hat, Inc. 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -/* - * @test TestCriticalControlThreadPriority - * @summary Check that ShenandoahCriticalControlThreadPriority works - * @bug 8217343 - * @requires vm.gc.Shenandoah - * - * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority - * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority - */ - -public class TestCriticalControlThreadPriority { - - public static void main(String[] args) throws Exception { - // checking the initialization before entering main() - } - -} From 660272ce7cd20a03cacf9abb2983342eb221a388 Mon Sep 17 00:00:00 2001 From: Charlie Gracie Date: Mon, 10 Aug 2020 08:37:05 +0200 Subject: [PATCH 060/100] 8241574: Shenandoah: remove ShenandoahAssertToSpaceClosure Reviewed-by: zgu, bmathiske, shade --- src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp | 14 -------------- src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp | 11 ----------- 2 files changed, 25 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp index f5a0579d0c3..3050cf07a21 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp @@ -82,20 +82,6 @@ #include "services/mallocTracker.hpp" #include "utilities/powerOfTwo.hpp" -#ifdef ASSERT -template -void ShenandoahAssertToSpaceClosure::do_oop_work(T* p) { - T o = RawAccess<>::oop_load(p); - if (! CompressedOops::is_null(o)) { - oop obj = CompressedOops::decode_not_null(o); - shenandoah_assert_not_forwarded(p, obj); - } -} - -void ShenandoahAssertToSpaceClosure::do_oop(narrowOop* p) { do_oop_work(p); } -void ShenandoahAssertToSpaceClosure::do_oop(oop* p) { do_oop_work(p); } -#endif - class ShenandoahPretouchHeapTask : public AbstractGangTask { private: ShenandoahRegionIterator _regions; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index 38cc96b37c7..72d9450336c 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -105,17 +105,6 @@ public: virtual bool is_thread_safe() { return false; } }; -#ifdef ASSERT -class ShenandoahAssertToSpaceClosure : public OopClosure { -private: - template - void do_oop_work(T* p); -public: - void do_oop(narrowOop* p); - void do_oop(oop* p); -}; -#endif - typedef ShenandoahLock ShenandoahHeapLock; typedef ShenandoahLocker ShenandoahHeapLocker; From 1d480a7b96005f049c1dcb16344ca48f86f01f91 Mon Sep 17 00:00:00 2001 From: Dmitry Cherepanov Date: Mon, 10 Aug 2020 11:25:38 +0300 Subject: [PATCH 061/100] 8250636: iso8601_time returns incorrect offset part on MacOS Reviewed-by: dholmes, gziemski --- src/hotspot/share/runtime/os.cpp | 37 ++++++++++++++------------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index 8b61b5497cf..0581954e02f 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -88,18 +88,6 @@ static size_t cur_malloc_words = 0; // current size for MallocMaxTestWords DEBUG_ONLY(bool os::_mutex_init_done = false;) -static time_t get_timezone(const struct tm* time_struct) { -#if defined(_ALLBSD_SOURCE) - return time_struct->tm_gmtoff; -#elif defined(_WINDOWS) - long zone; - _get_timezone(&zone); - return static_cast(zone); -#else - return timezone; -#endif -} - int os::snprintf(char* buf, size_t len, const char* fmt, ...) { va_list args; va_start(args, fmt); @@ -152,21 +140,28 @@ char* os::iso8601_time(char* buffer, size_t buffer_length, bool utc) { return NULL; } } - const time_t zone = get_timezone(&time_struct); - // If daylight savings time is in effect, - // we are 1 hour East of our time zone const time_t seconds_per_minute = 60; const time_t minutes_per_hour = 60; const time_t seconds_per_hour = seconds_per_minute * minutes_per_hour; - time_t UTC_to_local = zone; - if (time_struct.tm_isdst > 0) { - UTC_to_local = UTC_to_local - seconds_per_hour; - } // No offset when dealing with UTC - if (utc) { - UTC_to_local = 0; + time_t UTC_to_local = 0; + if (!utc) { +#if defined(_WINDOWS) + long zone; + _get_timezone(&zone); + UTC_to_local = static_cast(zone); + + // If daylight savings time is in effect, + // we are 1 hour East of our time zone + if (time_struct.tm_isdst > 0) { + UTC_to_local = UTC_to_local - seconds_per_hour; + } +#else + // tm_gmtoff already includes adjustment for daylight saving + UTC_to_local = -(time_struct.tm_gmtoff); +#endif } // Compute the time zone offset. From 733218137289d6a0eb705103ed7be30f1e68d17a Mon Sep 17 00:00:00 2001 From: Charlie Gracie Date: Mon, 10 Aug 2020 12:12:40 +0300 Subject: [PATCH 062/100] 8251303: C2: remove unused _site_invoke_ratio and related code from InlineTree Reviewed-by: vlivanov, thartmann --- src/hotspot/share/opto/bytecodeInfo.cpp | 20 +++----------------- src/hotspot/share/opto/parse.hpp | 7 ------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/hotspot/share/opto/bytecodeInfo.cpp b/src/hotspot/share/opto/bytecodeInfo.cpp index ea32a469d06..10ff5860d33 100644 --- a/src/hotspot/share/opto/bytecodeInfo.cpp +++ b/src/hotspot/share/opto/bytecodeInfo.cpp @@ -42,13 +42,12 @@ InlineTree::InlineTree(Compile* c, const InlineTree *caller_tree, ciMethod* callee, JVMState* caller_jvms, int caller_bci, - float site_invoke_ratio, int max_inline_level) : + int max_inline_level) : C(c), _caller_jvms(caller_jvms), _method(callee), _caller_tree((InlineTree*) caller_tree), _count_inline_bcs(method()->code_size_for_inlining()), - _site_invoke_ratio(site_invoke_ratio), _max_inline_level(max_inline_level), _subtrees(c->comp_arena(), 2, 0, NULL), _msg(NULL) @@ -646,21 +645,8 @@ WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, return NULL; } -//------------------------------compute_callee_frequency----------------------- -float InlineTree::compute_callee_frequency( int caller_bci ) const { - int count = method()->interpreter_call_site_count(caller_bci); - int invcnt = method()->interpreter_invocation_count(); - float freq = (float)count/(float)invcnt; - // Call-site count / interpreter invocation count, scaled recursively. - // Always between 0.0 and 1.0. Represents the percentage of the method's - // total execution time used at this call site. - - return freq; -} - //------------------------------build_inline_tree_for_callee------------------- InlineTree *InlineTree::build_inline_tree_for_callee( ciMethod* callee_method, JVMState* caller_jvms, int caller_bci) { - float recur_frequency = _site_invoke_ratio * compute_callee_frequency(caller_bci); // Attempt inlining. InlineTree* old_ilt = callee_at(caller_bci, callee_method); if (old_ilt != NULL) { @@ -685,7 +671,7 @@ InlineTree *InlineTree::build_inline_tree_for_callee( ciMethod* callee_method, J } } // Allocate in the comp_arena to make sure the InlineTree is live when dumping a replay compilation file - InlineTree* ilt = new (C->comp_arena()) InlineTree(C, this, callee_method, caller_jvms, caller_bci, recur_frequency, _max_inline_level + max_inline_level_adjust); + InlineTree* ilt = new (C->comp_arena()) InlineTree(C, this, callee_method, caller_jvms, caller_bci, _max_inline_level + max_inline_level_adjust); _subtrees.append(ilt); NOT_PRODUCT( _count_inlines += 1; ) @@ -711,7 +697,7 @@ InlineTree *InlineTree::build_inline_tree_root() { Compile* C = Compile::current(); // Root of inline tree - InlineTree* ilt = new InlineTree(C, NULL, C->method(), NULL, -1, 1.0F, MaxInlineLevel); + InlineTree* ilt = new InlineTree(C, NULL, C->method(), NULL, -1, MaxInlineLevel); return ilt; } diff --git a/src/hotspot/share/opto/parse.hpp b/src/hotspot/share/opto/parse.hpp index adbb5ba3558..a6e7703796a 100644 --- a/src/hotspot/share/opto/parse.hpp +++ b/src/hotspot/share/opto/parse.hpp @@ -48,12 +48,7 @@ class InlineTree : public ResourceObj { ciMethod* _method; // method being called by the caller_jvms InlineTree* _caller_tree; uint _count_inline_bcs; // Accumulated count of inlined bytecodes - // Call-site count / interpreter invocation count, scaled recursively. - // Always between 0.0 and 1.0. Represents the percentage of the method's - // total execution time used at this call site. - const float _site_invoke_ratio; const int _max_inline_level; // the maximum inline level for this sub-tree (may be adjusted) - float compute_callee_frequency( int caller_bci ) const; GrowableArray _subtrees; @@ -67,7 +62,6 @@ protected: ciMethod* callee_method, JVMState* caller_jvms, int caller_bci, - float site_invoke_ratio, int max_inline_level); InlineTree *build_inline_tree_for_callee(ciMethod* callee_method, JVMState* caller_jvms, @@ -125,7 +119,6 @@ public: ciMethod *method() const { return _method; } int caller_bci() const { return _caller_jvms ? _caller_jvms->bci() : InvocationEntryBci; } uint count_inline_bcs() const { return _count_inline_bcs; } - float site_invoke_ratio() const { return _site_invoke_ratio; }; #ifndef PRODUCT private: From c2fa441d8ded94241fdac7005d6420f99b38af0b Mon Sep 17 00:00:00 2001 From: Nikola Grcevski Date: Mon, 10 Aug 2020 12:57:38 +0100 Subject: [PATCH 063/100] 8250521: Configure initial RTO to use minimal retry for loopback connections on Windows Reviewed-by: alanb --- .../windows/native/libnet/net_util_md.c | 51 +++++++++++++++++++ .../windows/native/libnet/net_util_md.h | 24 ++++++++- src/java.base/windows/native/libnio/ch/Net.c | 16 ++++-- 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/src/java.base/windows/native/libnet/net_util_md.c b/src/java.base/windows/native/libnet/net_util_md.c index e33cd70f5bd..83e30287196 100644 --- a/src/java.base/windows/native/libnet/net_util_md.c +++ b/src/java.base/windows/native/libnet/net_util_md.c @@ -770,6 +770,57 @@ NET_EnableFastTcpLoopback(int fd) { return result == SOCKET_ERROR ? WSAGetLastError() : 0; } +int +IsWindows10RS3OrGreater() { + OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 }; + DWORDLONG const cond_mask = VerSetConditionMask( + VerSetConditionMask( + VerSetConditionMask( + 0, VER_MAJORVERSION, VER_GREATER_EQUAL), + VER_MINORVERSION, VER_GREATER_EQUAL), + VER_BUILDNUMBER, VER_GREATER_EQUAL); + + osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_WIN10); + osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_WIN10); + osvi.dwBuildNumber = 16299; // RS3 (Redstone 3) + + return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER, cond_mask) != 0; +} + +/** + * Shortens the default Windows socket + * connect timeout. Recommended for usage + * on the loopback adapter only. + */ +JNIEXPORT jint JNICALL +NET_EnableFastTcpLoopbackConnect(int fd) { + TCP_INITIAL_RTO_PARAMETERS rto = { + TCP_INITIAL_RTO_UNSPECIFIED_RTT, // Use the default or overriden by the Administrator + 1 // Minimum possible value before Windows 10 RS3 + }; + + /** + * In Windows 10 RS3+ we can use the no retransmissions flag to + * completely remove the timeout delay, which is fixed to 500ms + * if Windows receives RST when the destination port is not open. + */ + if (IsWindows10RS3OrGreater()) { + rto.MaxSynRetransmissions = TCP_INITIAL_RTO_NO_SYN_RETRANSMISSIONS; + } + + DWORD result_byte_count = -1; + int result = WSAIoctl(fd, // descriptor identifying a socket + SIO_TCP_INITIAL_RTO, // dwIoControlCode + &rto, // pointer to TCP_INITIAL_RTO_PARAMETERS structure + sizeof(rto), // size, in bytes, of the input buffer + NULL, // pointer to output buffer + 0, // size of output buffer + &result_byte_count, // number of bytes returned + NULL, // OVERLAPPED structure + NULL); // completion routine + return (result == SOCKET_ERROR) ? WSAGetLastError() : 0; +} + /** * See net_util.h for documentation */ diff --git a/src/java.base/windows/native/libnet/net_util_md.h b/src/java.base/windows/native/libnet/net_util_md.h index 2edf008d181..b76935db3de 100644 --- a/src/java.base/windows/native/libnet/net_util_md.h +++ b/src/java.base/windows/native/libnet/net_util_md.h @@ -26,6 +26,7 @@ #include #include #include +#include /* used to disable connection reset messages on Windows XP */ #ifndef SIO_UDP_CONNRESET @@ -86,10 +87,29 @@ struct ipv6bind { #define GET_PORT(X) ((X)->sa.sa_family == AF_INET ? (X)->sa4.sin_port : (X)->sa6.sin6_port) +/** + * With dual socket implementation the + * IPv4 addresseses might be mapped as IPv6. + * The IPv4 loopback adapter address will + * be mapped as the following IPv6 ::ffff:127.0.0.1. + * For example, this is done by NET_InetAddressToSockaddr. + */ +#define IN6_IS_ADDR_V4MAPPED_LOOPBACK(x) ( \ + (((x)->s6_words[0] == 0) && \ + ((x)->s6_words[1] == 0) && \ + ((x)->s6_words[2] == 0) && \ + ((x)->s6_words[3] == 0) && \ + ((x)->s6_words[4] == 0) && \ + ((x)->s6_words[5] == 0xFFFF) && \ + ((x)->s6_words[6] == 0x007F) && \ + ((x)->s6_words[7] == 0x0100)) \ +) + #define IS_LOOPBACK_ADDRESS(x) ( \ ((x)->sa.sa_family == AF_INET) ? \ (ntohl((x)->sa4.sin_addr.s_addr) == INADDR_LOOPBACK) : \ - (IN6ADDR_ISLOOPBACK(x)) \ + ((IN6_IS_ADDR_LOOPBACK(&(x)->sa6.sin6_addr)) || \ + (IN6_IS_ADDR_V4MAPPED_LOOPBACK(&(x)->sa6.sin6_addr))) \ ) JNIEXPORT int JNICALL NET_SocketClose(int fd); @@ -119,6 +139,8 @@ JNIEXPORT int JNICALL NET_BindV6(struct ipv6bind *b, jboolean exclBind); JNIEXPORT int JNICALL NET_WinBind(int s, SOCKETADDRESS *sa, int len, jboolean exclBind); +JNIEXPORT jint JNICALL NET_EnableFastTcpLoopbackConnect(int fd); + /* XP versions of the native routines */ JNIEXPORT jobject JNICALL Java_java_net_NetworkInterface_getByName0_XP diff --git a/src/java.base/windows/native/libnio/ch/Net.c b/src/java.base/windows/native/libnio/ch/Net.c index 01b457cff61..cedb9934286 100644 --- a/src/java.base/windows/native/libnio/ch/Net.c +++ b/src/java.base/windows/native/libnio/ch/Net.c @@ -226,13 +226,25 @@ Java_sun_nio_ch_Net_connect0(JNIEnv *env, jclass clazz, jboolean preferIPv6, job { SOCKETADDRESS sa; int rv; + int so_rv; int sa_len = 0; SOCKET s = (SOCKET)fdval(env, fdo); + int type = 0, optlen = sizeof(type); if (NET_InetAddressToSockaddr(env, iao, port, &sa, &sa_len, preferIPv6) != 0) { return IOS_THROWN; } + so_rv = getsockopt(s, SOL_SOCKET, SO_TYPE, (char*)&type, &optlen); + + /** + * Windows has a very long socket connect timeout of 2 seconds. + * If it's the loopback adapter we can shorten the wait interval. + */ + if (so_rv == 0 && type == SOCK_STREAM && IS_LOOPBACK_ADDRESS(&sa)) { + NET_EnableFastTcpLoopbackConnect((jint)s); + } + rv = connect(s, &sa.sa, sa_len); if (rv != 0) { int err = WSAGetLastError(); @@ -243,9 +255,7 @@ Java_sun_nio_ch_Net_connect0(JNIEnv *env, jclass clazz, jboolean preferIPv6, job return IOS_THROWN; } else { /* Enable WSAECONNRESET errors when a UDP socket is connected */ - int type = 0, optlen = sizeof(type); - rv = getsockopt(s, SOL_SOCKET, SO_TYPE, (char*)&type, &optlen); - if (rv == 0 && type == SOCK_DGRAM) { + if (so_rv == 0 && type == SOCK_DGRAM) { setConnectionReset(s, TRUE); } } From c57d89ad1a7de75a3394a1e1f7a44cd0f05be3e0 Mon Sep 17 00:00:00 2001 From: Thomas Stuefe Date: Mon, 10 Aug 2020 15:42:20 +0200 Subject: [PATCH 064/100] 8251255: [linux] Add process-memory information to hs-err and VM.info Reviewed-by: dholmes, mdoerr --- src/hotspot/os/linux/os_linux.cpp | 67 ++++++++++++++++++++++++++++++- src/hotspot/os/linux/os_linux.hpp | 3 +- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp index b08caf4d5d3..e410e7a82f9 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -110,6 +110,9 @@ # include # include # include +#ifdef __GLIBC__ +# include +#endif #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -2156,7 +2159,10 @@ void os::print_os_info(outputStream* st) { os::Posix::print_load_average(st); st->cr(); - os::Linux::print_full_memory_info(st); + os::Linux::print_system_memory_info(st); + st->cr(); + + os::Linux::print_process_memory_info(st); st->cr(); os::Linux::print_proc_sys_info(st); @@ -2314,7 +2320,7 @@ void os::Linux::print_proc_sys_info(outputStream* st) { "/proc/sys/kernel/pid_max", st); } -void os::Linux::print_full_memory_info(outputStream* st) { +void os::Linux::print_system_memory_info(outputStream* st) { _print_ascii_file_h("/proc/meminfo", "/proc/meminfo", st, false); st->cr(); @@ -2326,6 +2332,63 @@ void os::Linux::print_full_memory_info(outputStream* st) { "/sys/kernel/mm/transparent_hugepage/defrag", st); } +void os::Linux::print_process_memory_info(outputStream* st) { + + st->print_cr("Process Memory:"); + + // Print virtual and resident set size; peak values; swap; and for + // rss its components if the kernel is recent enough. + ssize_t vmsize = -1, vmpeak = -1, vmswap = -1, + vmrss = -1, vmhwm = -1, rssanon = -1, rssfile = -1, rssshmem = -1; + const int num_values = 8; + int num_found = 0; + FILE* f = ::fopen("/proc/self/status", "r"); + char buf[256]; + while (::fgets(buf, sizeof(buf), f) != NULL && num_found < num_values) { + if ( (vmsize == -1 && sscanf(buf, "VmSize: " SSIZE_FORMAT " kB", &vmsize) == 1) || + (vmpeak == -1 && sscanf(buf, "VmPeak: " SSIZE_FORMAT " kB", &vmpeak) == 1) || + (vmswap == -1 && sscanf(buf, "VmSwap: " SSIZE_FORMAT " kB", &vmswap) == 1) || + (vmhwm == -1 && sscanf(buf, "VmHWM: " SSIZE_FORMAT " kB", &vmhwm) == 1) || + (vmrss == -1 && sscanf(buf, "VmRSS: " SSIZE_FORMAT " kB", &vmrss) == 1) || + (rssanon == -1 && sscanf(buf, "RssAnon: " SSIZE_FORMAT " kB", &rssanon) == 1) || + (rssfile == -1 && sscanf(buf, "RssFile: " SSIZE_FORMAT " kB", &rssfile) == 1) || + (rssshmem == -1 && sscanf(buf, "RssShmem: " SSIZE_FORMAT " kB", &rssshmem) == 1) + ) + { + num_found ++; + } + } + st->print_cr("Virtual Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", vmsize, vmpeak); + st->print("Resident Set Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", vmrss, vmhwm); + if (rssanon != -1) { // requires kernel >= 4.5 + st->print(" (anon: " SSIZE_FORMAT "K, file: " SSIZE_FORMAT "K, shmem: " SSIZE_FORMAT "K)", + rssanon, rssfile, rssshmem); + } + st->cr(); + if (vmswap != -1) { // requires kernel >= 2.6.34 + st->print_cr("Swapped out: " SSIZE_FORMAT "K", vmswap); + } + + // Print glibc outstanding allocations. + // (note: there is no implementation of mallinfo for muslc) +#ifdef __GLIBC__ + struct mallinfo mi = ::mallinfo(); + + // mallinfo is an old API. Member names mean next to nothing and, beyond that, are int. + // So values may have wrapped around. Still useful enough to see how much glibc thinks + // we allocated. + const size_t total_allocated = (size_t)(unsigned)mi.uordblks; + st->print("C-Heap outstanding allocations: " SIZE_FORMAT "K", total_allocated / K); + // Since mallinfo members are int, glibc values may have wrapped. Warn about this. + if ((vmrss * K) > UINT_MAX && (vmrss * K) > (total_allocated + UINT_MAX)) { + st->print(" (may have wrapped)"); + } + st->cr(); + +#endif // __GLIBC__ + +} + bool os::Linux::print_ld_preload_file(outputStream* st) { return _print_ascii_file("/etc/ld.so.preload", st, "/etc/ld.so.preload:"); } diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp index 754773a7d61..c242872945c 100644 --- a/src/hotspot/os/linux/os_linux.hpp +++ b/src/hotspot/os/linux/os_linux.hpp @@ -101,7 +101,8 @@ class Linux { static bool release_memory_special_shm(char* base, size_t bytes); static bool release_memory_special_huge_tlbfs(char* base, size_t bytes); - static void print_full_memory_info(outputStream* st); + static void print_process_memory_info(outputStream* st); + static void print_system_memory_info(outputStream* st); static bool print_container_info(outputStream* st); static void print_steal_info(outputStream* st); static void print_distro_info(outputStream* st); From b35a3bdee96206c042f909f6163b521122b26205 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Mon, 10 Aug 2020 10:54:56 -0400 Subject: [PATCH 065/100] 8251322: Improve BitMap::iterate Rewrite and inline BitMap::iterate. Reviewed-by: stuefe, dholmes, tschatzl --- src/hotspot/share/utilities/bitMap.cpp | 26 ------------------- src/hotspot/share/utilities/bitMap.hpp | 20 +++++++------- src/hotspot/share/utilities/bitMap.inline.hpp | 17 +++++++++++- 3 files changed, 27 insertions(+), 36 deletions(-) diff --git a/src/hotspot/share/utilities/bitMap.cpp b/src/hotspot/share/utilities/bitMap.cpp index 8dcc1da6ddc..1d33a5fe580 100644 --- a/src/hotspot/share/utilities/bitMap.cpp +++ b/src/hotspot/share/utilities/bitMap.cpp @@ -627,32 +627,6 @@ void BitMap::clear_large() { clear_large_range_of_words(0, size_in_words()); } -// Note that if the closure itself modifies the bitmap -// then modifications in and to the left of the _bit_ being -// currently sampled will not be seen. Note also that the -// interval [leftOffset, rightOffset) is right open. -bool BitMap::iterate(BitMapClosure* blk, idx_t leftOffset, idx_t rightOffset) { - verify_range(leftOffset, rightOffset); - - idx_t startIndex = to_words_align_down(leftOffset); - idx_t endIndex = to_words_align_up(rightOffset); - for (idx_t index = startIndex, offset = leftOffset; - offset < rightOffset && index < endIndex; - offset = (++index) << LogBitsPerWord) { - idx_t rest = map(index) >> (offset & (BitsPerWord - 1)); - for (; offset < rightOffset && rest != 0; offset++) { - if (rest & 1) { - if (!blk->do_bit(offset)) return false; - // resample at each closure application - // (see, for instance, CMS bug 4525989) - rest = map(index) >> (offset & (BitsPerWord -1)); - } - rest = rest >> 1; - } - } - return true; -} - BitMap::idx_t BitMap::count_one_bits_in_range_of_words(idx_t beg_full_word, idx_t end_full_word) const { idx_t sum = 0; for (idx_t i = beg_full_word; i < end_full_word; i++) { diff --git a/src/hotspot/share/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp index ffd0641f9ad..fb673cd0ae0 100644 --- a/src/hotspot/share/utilities/bitMap.hpp +++ b/src/hotspot/share/utilities/bitMap.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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 @@ -284,14 +284,16 @@ class BitMap { void clear_large(); inline void clear(); - // Iteration support. Returns "true" if the iteration completed, false - // if the iteration terminated early (because the closure "blk" returned - // false). - bool iterate(BitMapClosure* blk, idx_t leftIndex, idx_t rightIndex); - bool iterate(BitMapClosure* blk) { - // call the version that takes an interval - return iterate(blk, 0, size()); - } + // Iteration support. Applies the closure to the index for each set bit, + // starting from the least index in the range to the greatest, in order. + // The iteration terminates if the closure returns false. Returns true if + // the iteration completed, false if terminated early because the closure + // returned false. If the closure modifies the bitmap, modifications to + // bits at indices greater than the current index will affect which further + // indices the closure will be applied to. + // precondition: beg and end form a valid range. + bool iterate(BitMapClosure* cl, idx_t beg, idx_t end); + bool iterate(BitMapClosure* cl); // Looking for 1's and 0's at indices equal to or greater than "l_index", // stopping if none has been found before "r_index", and returning diff --git a/src/hotspot/share/utilities/bitMap.inline.hpp b/src/hotspot/share/utilities/bitMap.inline.hpp index d8747dfbc5c..fa168d212e1 100644 --- a/src/hotspot/share/utilities/bitMap.inline.hpp +++ b/src/hotspot/share/utilities/bitMap.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020, 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 @@ -242,6 +242,21 @@ BitMap::get_next_one_offset_aligned_right(idx_t l_offset, idx_t r_offset) const return get_next_bit_impl(l_offset, r_offset); } +inline bool BitMap::iterate(BitMapClosure* cl, idx_t beg, idx_t end) { + for (idx_t index = beg; true; ++index) { + index = get_next_one_offset(index, end); + if (index >= end) { + return true; + } else if (!cl->do_bit(index)) { + return false; + } + } +} + +inline bool BitMap::iterate(BitMapClosure* cl) { + return iterate(cl, 0, size()); +} + // Returns a bit mask for a range of bits [beg, end) within a single word. Each // bit in the mask is 0 if the bit is in the range, 1 if not in the range. The // returned mask can be used directly to clear the range, or inverted to set the From 8e687450d68ae56464fdde7e6712ad9fb5136792 Mon Sep 17 00:00:00 2001 From: Rahul Yadav Date: Mon, 10 Aug 2020 15:15:10 +0100 Subject: [PATCH 066/100] 8248006: Revisit exceptions thrown when creating an HttpClient fails due to unavailability of underlying resources This fix updates jdk.internal.net.http.HttpClientImpl to throw an UncheckedIOException instead of InternalError. Reviewed-by: chegar, dfuchs --- .../classes/java/net/http/HttpClient.java | 11 +- .../jdk/internal/net/http/HttpClientImpl.java | 2 +- .../httpclient/HttpClientExceptionTest.java | 105 ++++++++++++++++++ 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 test/jdk/java/net/httpclient/HttpClientExceptionTest.java diff --git a/src/java.net.http/share/classes/java/net/http/HttpClient.java b/src/java.net.http/share/classes/java/net/http/HttpClient.java index 7a383f2fd16..a21ee7f12dc 100644 --- a/src/java.net.http/share/classes/java/net/http/HttpClient.java +++ b/src/java.net.http/share/classes/java/net/http/HttpClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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,6 +26,8 @@ package java.net.http; import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.channels.Selector; import java.net.Authenticator; import java.net.CookieHandler; import java.net.InetSocketAddress; @@ -153,6 +155,8 @@ public abstract class HttpClient { * built instances. * * @return a new HttpClient + * @throws UncheckedIOException if necessary underlying IO resources required to + * {@linkplain Builder#build() build a new HttpClient} cannot be allocated. */ public static HttpClient newHttpClient() { return newBuilder().build(); @@ -352,6 +356,11 @@ public abstract class HttpClient { * builder. * * @return a new {@code HttpClient} + * + * @throws UncheckedIOException may be thrown if underlying IO resources required + * by the implementation cannot be allocated. For instance, + * if the implementation requires a {@link Selector}, and opening + * one fails due to {@linkplain Selector#open() lack of necessary resources}. */ public HttpClient build(); } diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java index bf3448cf2f8..1f7ed72cb7a 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java @@ -310,7 +310,7 @@ final class HttpClientImpl extends HttpClient implements Trackable { selmgr = new SelectorManager(this); } catch (IOException e) { // unlikely - throw new InternalError(e); + throw new UncheckedIOException(e); } selmgr.setDaemon(true); filters = new FilterFactory(); diff --git a/test/jdk/java/net/httpclient/HttpClientExceptionTest.java b/test/jdk/java/net/httpclient/HttpClientExceptionTest.java new file mode 100644 index 00000000000..f9c585d955e --- /dev/null +++ b/test/jdk/java/net/httpclient/HttpClientExceptionTest.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import org.testng.Assert; +import org.testng.annotations.Test; +import java.io.IOException; +import java.net.ProtocolFamily; +import java.net.http.HttpClient; +import java.nio.channels.DatagramChannel; +import java.nio.channels.Pipe; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; +import java.nio.channels.Channel; +import java.nio.channels.spi.AbstractSelector; +import java.nio.channels.spi.SelectorProvider; + +/* + * @test + * @bug 8248006 + * @summary The test checks if UncheckedIOException is thrown + * @build HttpClientExceptionTest + * @run testng/othervm -Djava.nio.channels.spi.SelectorProvider=HttpClientExceptionTest$CustomSelectorProvider + * HttpClientExceptionTest + */ + +public class HttpClientExceptionTest { + + static final int ITERATIONS = 10; + + @Test + public void testHttpClientException() { + for(int i = 0; i < ITERATIONS; i++) { + Assert.assertThrows(HttpClient.newBuilder()::build); + Assert.assertThrows(HttpClient::newHttpClient); + } + } + + public static class CustomSelectorProvider extends SelectorProvider { + + @Override + public DatagramChannel openDatagramChannel() throws IOException { + throw new IOException(); + } + + @Override + public DatagramChannel openDatagramChannel(ProtocolFamily family) throws IOException { + throw new IOException(); + } + + @Override + public Pipe openPipe() throws IOException { + throw new IOException(); + } + + @Override + public ServerSocketChannel openServerSocketChannel() throws IOException { + throw new IOException(); + } + + @Override + public SocketChannel openSocketChannel() throws IOException { + throw new IOException(); + } + + @Override + public Channel inheritedChannel() throws IOException { + return super.inheritedChannel(); + } + + @Override + public SocketChannel openSocketChannel(ProtocolFamily family) throws IOException { + return super.openSocketChannel(family); + } + + @Override + public ServerSocketChannel openServerSocketChannel(ProtocolFamily family) throws IOException { + return super.openServerSocketChannel(family); + } + + @Override + public AbstractSelector openSelector() throws IOException { + throw new IOException(); + } + } +} From 55e381b32faab5794a9c797871f800950781571d Mon Sep 17 00:00:00 2001 From: "Tagir F. Valeev" Date: Mon, 10 Aug 2020 16:14:03 +0000 Subject: [PATCH 067/100] 8247605: Avoid array allocation when concatenating with empty string Reviewed-by: redestad, plevart --- .../share/classes/java/util/TreeMap.java | 36 ++ .../java/util/Map/InPlaceOpsCollisions.java | 3 +- .../util/Map/MapWithCollisionsProviders.java | 2 + test/jdk/java/util/NavigableMap/LockStep.java | 467 +++++++++--------- .../bench/java/util/TreeMapUpdate.java | 34 +- 5 files changed, 304 insertions(+), 238 deletions(-) diff --git a/src/java.base/share/classes/java/util/TreeMap.java b/src/java.base/share/classes/java/util/TreeMap.java index 5aa95bc6482..75119d714fe 100644 --- a/src/java.base/share/classes/java/util/TreeMap.java +++ b/src/java.base/share/classes/java/util/TreeMap.java @@ -1790,6 +1790,42 @@ public class TreeMap return m.put(key, value); } + public V putIfAbsent(K key, V value) { + if (!inRange(key)) + throw new IllegalArgumentException("key out of range"); + return m.putIfAbsent(key, value); + } + + public V merge(K key, V value, BiFunction remappingFunction) { + if (!inRange(key)) + throw new IllegalArgumentException("key out of range"); + return m.merge(key, value, remappingFunction); + } + + public V computeIfAbsent(K key, Function mappingFunction) { + if (!inRange(key)) { + // Do not throw if mapping function returns null + // to preserve compatibility with default computeIfAbsent implementation + if (mappingFunction.apply(key) == null) return null; + throw new IllegalArgumentException("key out of range"); + } + return m.computeIfAbsent(key, mappingFunction); + } + + public V compute(K key, BiFunction remappingFunction) { + if (!inRange(key)) { + // Do not throw if remapping function returns null + // to preserve compatibility with default computeIfAbsent implementation + if (remappingFunction.apply(key, null) == null) return null; + throw new IllegalArgumentException("key out of range"); + } + return m.compute(key, remappingFunction); + } + + public V computeIfPresent(K key, BiFunction remappingFunction) { + return !inRange(key) ? null : m.computeIfPresent(key, remappingFunction); + } + public final V get(Object key) { return !inRange(key) ? null : m.get(key); } diff --git a/test/jdk/java/util/Map/InPlaceOpsCollisions.java b/test/jdk/java/util/Map/InPlaceOpsCollisions.java index ce624990f16..fabc30ab7fb 100644 --- a/test/jdk/java/util/Map/InPlaceOpsCollisions.java +++ b/test/jdk/java/util/Map/InPlaceOpsCollisions.java @@ -523,7 +523,8 @@ public class InPlaceOpsCollisions extends MapWithCollisionsProviders { new Object[]{"HashMap", (Supplier>) HashMap::new}, new Object[]{"LinkedHashMap", (Supplier>) LinkedHashMap::new}, new Object[]{"TreeMap", (Supplier>) TreeMap::new}, - new Object[]{"TreeMap(cmp)", (Supplier>) () -> new TreeMap<>(Comparator.reverseOrder())} + new Object[]{"TreeMap(cmp)", (Supplier>) () -> new TreeMap<>(Comparator.reverseOrder())}, + new Object[]{"TreeMap.descendingMap", (Supplier>) () -> new TreeMap<>().descendingMap()} ).iterator(); } } diff --git a/test/jdk/java/util/Map/MapWithCollisionsProviders.java b/test/jdk/java/util/Map/MapWithCollisionsProviders.java index 3e687a21b6f..1cb1998ee5e 100644 --- a/test/jdk/java/util/Map/MapWithCollisionsProviders.java +++ b/test/jdk/java/util/Map/MapWithCollisionsProviders.java @@ -193,6 +193,8 @@ public class MapWithCollisionsProviders { new IdentityHashMap<>(), keys, val)); cases.add(createCase("TreeMap with " + desc, new TreeMap<>(), keys, val)); + cases.add(createCase("Descending TreeMap with " + desc, + new TreeMap<>().descendingMap(), keys, val)); cases.add(createCase("WeakHashMap with " + desc, new WeakHashMap<>(), keys, val)); cases.add(createCase("ConcurrentHashMap with " + desc, diff --git a/test/jdk/java/util/NavigableMap/LockStep.java b/test/jdk/java/util/NavigableMap/LockStep.java index 6823087fb59..26b3b1deda5 100644 --- a/test/jdk/java/util/NavigableMap/LockStep.java +++ b/test/jdk/java/util/NavigableMap/LockStep.java @@ -46,11 +46,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.NavigableMap; import java.util.NavigableSet; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Random; import java.util.Set; import java.util.TreeMap; @@ -79,26 +79,26 @@ public class LockStep { static void realMain(String[] args) { size = intArg(args, 0, DEFAULT_SIZE); - lockSteps(new TreeMap(), - new ConcurrentSkipListMap()); - lockSteps(new TreeMap(), - Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class)); - lockSteps(new TreeMap(), - Collections.synchronizedNavigableMap(new TreeMap())); - lockSteps(new TreeMap(reverseOrder()), - new ConcurrentSkipListMap(reverseOrder())); + lockSteps(new TreeMap<>(), + new ConcurrentSkipListMap<>()); + lockSteps(new TreeMap<>(), + Collections.checkedNavigableMap(new TreeMap<>(), Integer.class, Integer.class)); + lockSteps(new TreeMap<>(), + Collections.synchronizedNavigableMap(new TreeMap<>())); + lockSteps(new TreeMap<>(reverseOrder()), + new ConcurrentSkipListMap<>(reverseOrder())); - lockSteps(new TreeSet(), - new ConcurrentSkipListSet()); - lockSteps(new TreeSet(), - Collections.checkedNavigableSet(new TreeSet(), Integer.class)); - lockSteps(new TreeSet(), - Collections.synchronizedNavigableSet(new TreeSet())); - lockSteps(new TreeSet(reverseOrder()), - new ConcurrentSkipListSet(reverseOrder())); + lockSteps(new TreeSet<>(), + new ConcurrentSkipListSet<>()); + lockSteps(new TreeSet<>(), + Collections.checkedNavigableSet(new TreeSet<>(), Integer.class)); + lockSteps(new TreeSet<>(), + Collections.synchronizedNavigableSet(new TreeSet<>())); + lockSteps(new TreeSet<>(reverseOrder()), + new ConcurrentSkipListSet<>(reverseOrder())); } - static void lockSteps(NavigableMap m1, NavigableMap m2) { + static void lockSteps(NavigableMap m1, NavigableMap m2) { if (maybe(4)) m1 = serialClone(m1); if (maybe(4)) m2 = serialClone(m2); lockStep(m1, @@ -119,7 +119,7 @@ public class LockStep { fullTailMap(m2.descendingMap())); } - static void lockSteps(NavigableSet s1, NavigableSet s2) { + static void lockSteps(NavigableSet s1, NavigableSet s2) { if (maybe(4)) s1 = serialClone(s1); if (maybe(4)) s2 = serialClone(s2); lockStep(s1, @@ -140,47 +140,47 @@ public class LockStep { fullTailSet(s2.descendingSet())); } - static boolean isAscending(NavigableMap m) { - Comparator cmp = m.comparator(); + static boolean isAscending(NavigableMap m) { + var cmp = m.comparator(); return (cmp == null || cmp.compare(1, 2) < 0); } - static NavigableMap fullSubMap(NavigableMap m) { + static NavigableMap fullSubMap(NavigableMap m) { return isAscending(m) ? m.subMap(Integer.MIN_VALUE, true, Integer.MAX_VALUE, true) : m.subMap(Integer.MAX_VALUE, true, Integer.MIN_VALUE, true); } - static NavigableMap fullHeadMap(NavigableMap m) { + static NavigableMap fullHeadMap(NavigableMap m) { return isAscending(m) ? m.headMap(Integer.MAX_VALUE, true) : m.headMap(Integer.MIN_VALUE, true); } - static NavigableMap fullTailMap(NavigableMap m) { + static NavigableMap fullTailMap(NavigableMap m) { return isAscending(m) ? m.tailMap(Integer.MIN_VALUE, true) : m.tailMap(Integer.MAX_VALUE, true); } - static boolean isAscending(NavigableSet s) { - Comparator cmp = s.comparator(); + static boolean isAscending(NavigableSet s) { + var cmp = s.comparator(); return (cmp == null || cmp.compare(1, 2) < 0); } - static NavigableSet fullSubSet(NavigableSet s) { + static NavigableSet fullSubSet(NavigableSet s) { return isAscending(s) ? s.subSet(Integer.MIN_VALUE, true, Integer.MAX_VALUE, true) : s.subSet(Integer.MAX_VALUE, true, Integer.MIN_VALUE, true); } - static NavigableSet fullHeadSet(NavigableSet s) { + static NavigableSet fullHeadSet(NavigableSet s) { return isAscending(s) ? s.headSet(Integer.MAX_VALUE, true) : s.headSet(Integer.MIN_VALUE, true); } - static NavigableSet fullTailSet(NavigableSet s) { + static NavigableSet fullTailSet(NavigableSet s) { return isAscending(s) ? s.tailSet(Integer.MIN_VALUE, true) : s.tailSet(Integer.MAX_VALUE, true); @@ -231,21 +231,17 @@ public class LockStep { equal(it.next(), expected); } - static Comparator comparator(NavigableSet s) { - Comparator cmp = s.comparator(); - return cmp != null ? cmp : new Comparator() { - public int compare(Object o1, Object o2) { - return ((Comparable) o1).compareTo(o2); }}; + static Comparator comparator(NavigableSet s) { + var cmp = s.comparator(); + return cmp != null ? cmp : Comparator.naturalOrder(); } - static Comparator comparator(NavigableMap m) { - Comparator cmp = m.comparator(); - return cmp != null ? cmp : new Comparator() { - public int compare(Object o1, Object o2) { - return ((Comparable) o1).compareTo(o2); }}; + static Comparator comparator(NavigableMap m) { + var cmp = m.comparator(); + return cmp != null ? cmp : Comparator.naturalOrder(); } - static void checkNavigableSet(final NavigableSet s) { + static void checkNavigableSet(final NavigableSet s) { if (s.comparator() == null) check(s.descendingSet().descendingSet().comparator() == null); equal(s.isEmpty(), s.size() == 0); @@ -259,7 +255,7 @@ public class LockStep { } } } - Comparator cmp = comparator(s); + var cmp = comparator(s); if (s.isEmpty()) { THROWS(NoSuchElementException.class, () -> s.first(), @@ -269,8 +265,8 @@ public class LockStep { equal(null, s.ceiling(1)); equal(null, s.higher(1)); } else { - Object a = s.first(); - Object z = s.last(); + Integer a = s.first(); + Integer z = s.last(); equal(s.lower(a), null); equal(s.higher(z), null); equal2(s, s.tailSet(a)); @@ -285,28 +281,27 @@ public class LockStep { equal2(s.headSet(a, true), singleton(a)); equal2(s.tailSet(z, true), singleton(z)); } - Iterator[] its = new Iterator[] { + Iterator[] its = new Iterator[] { s.iterator(), s.descendingSet().descendingSet().iterator(), }; - for (final Iterator it : its) + for (final Iterator it : its) if (maybe(4)) THROWS(IllegalStateException.class, () -> it.remove()); - Object prev = null; - for (Object e : s) { + Integer prev = null; + for (final Integer e : s) { check(s.contains(e)); - for (Iterator it : its) equalNext(it, e); + for (Iterator it : its) equalNext(it, e); equal(e, s.ceiling(e)); equal(e, s.floor(e)); check(s.higher(e) == null || cmp.compare(e, s.higher(e)) < 0); equal(s.lower(e), prev); - if (prev == null) { - } else { + if (prev != null) { check(cmp.compare(prev, e) < 0); } prev = e; } - for (final Iterator it : its) { + for (final Iterator it : its) { if (maybe(2)) check(! it.hasNext()); Fun fun = () -> it.next(); @@ -324,7 +319,7 @@ public class LockStep { check(! it2.hasNext()); } - static void equalSetsLeaf(final Set s1, final Set s2) { + static void equalSetsLeaf(final Set s1, final Set s2) { equal2(s1, s2); equal( s1.size(), s2.size()); equal( s1.isEmpty(), s2.isEmpty()); @@ -333,8 +328,8 @@ public class LockStep { equal( s1.containsAll(s2), s2.containsAll(s1)); } - static void equalNavigableSetsLeaf(final NavigableSet s1, - final NavigableSet s2) { + static void equalNavigableSetsLeaf(final NavigableSet s1, + final NavigableSet s2) { equal2(s1, s2); equal( s1.size(), s2.size()); equal( s1.isEmpty(), s2.isEmpty()); @@ -350,16 +345,16 @@ public class LockStep { checkNavigableSet(s2); } - static void equalNavigableSets(final NavigableSet s1, - final NavigableSet s2) { + static void equalNavigableSets(final NavigableSet s1, + final NavigableSet s2) { equalNavigableSetsLeaf(s1, s2); equalNavigableSetsLeaf(s1.descendingSet(), s2.descendingSet()); equalNavigableSetsLeaf(s1.descendingSet().descendingSet(), s2); - Object min = s1.isEmpty() ? Integer.MIN_VALUE : s1.first(); - Object max = s2.isEmpty() ? Integer.MAX_VALUE : s2.last(); + Integer min = s1.isEmpty() ? Integer.MIN_VALUE : s1.first(); + Integer max = s2.isEmpty() ? Integer.MAX_VALUE : s2.last(); if (s1.comparator() != null && s1.comparator().compare(min, max) > 0) { - Object tmp = min; min = max; max = tmp; + Integer tmp = min; min = max; max = tmp; } equalNavigableSetsLeaf(s1.subSet(min, true, max, true), @@ -368,31 +363,29 @@ public class LockStep { s2.tailSet(min, true)); equalNavigableSetsLeaf(s1.headSet(max, true), s2.headSet(max, true)); - equalNavigableSetsLeaf((NavigableSet) s1.subSet(min, max), - (NavigableSet) s2.subSet(min, max)); - equalNavigableSetsLeaf((NavigableSet) s1.tailSet(min), - (NavigableSet) s2.tailSet(min)); - equalNavigableSetsLeaf((NavigableSet) s1.headSet(max), - (NavigableSet) s2.headSet(max)); + equalNavigableSetsLeaf((NavigableSet) s1.subSet(min, max), + (NavigableSet) s2.subSet(min, max)); + equalNavigableSetsLeaf((NavigableSet) s1.tailSet(min), + (NavigableSet) s2.tailSet(min)); + equalNavigableSetsLeaf((NavigableSet) s1.headSet(max), + (NavigableSet) s2.headSet(max)); } // Destined for a Collections.java near you? static T[] concat(T[]... arrays) { int len = 0; - for (int i = 0; i < arrays.length; i++) - len += arrays[i].length; + for (T[] arr : arrays) len += arr.length; T[] a = (T[])java.lang.reflect.Array .newInstance(arrays[0].getClass().getComponentType(), len); int k = 0; - for (int i = 0; i < arrays.length; i++) { - T[] array = arrays[i]; - System.arraycopy(array, 0, a, k, array.length); - k += array.length; + for (T[] arr : arrays) { + System.arraycopy(arr, 0, a, k, arr.length); + k += arr.length; } return a; } - static void checkNavigableMap(final NavigableMap m) { + static void checkNavigableMap(final NavigableMap m) { if (m.comparator() == null) { check(m.descendingMap().descendingMap().comparator() == null); check(m.descendingKeySet().descendingSet().comparator() == null); @@ -402,7 +395,7 @@ public class LockStep { if (maybe(4)) equal2(m, serialClone(m)); equal2(m.keySet(), m.descendingKeySet()); - Comparator cmp = comparator(m); + var cmp = comparator(m); if (m.isEmpty()) { THROWS(NoSuchElementException.class, () -> m.firstKey(), @@ -420,8 +413,8 @@ public class LockStep { equal(null, m.ceilingEntry(1)); equal(null, m.higherEntry(1)); } else { - Object a = m.firstKey(); - Object z = m.lastKey(); + Integer a = m.firstKey(); + Integer z = m.lastKey(); equal(m.lowerKey(a), null); equal(m.higherKey(z), null); equal(a, m.firstEntry().getKey()); @@ -439,32 +432,32 @@ public class LockStep { equal2(m.tailMap(z, true), singletonMap(z, m.get(z))); } - Iterator[] kits = new Iterator[] { + Iterator[] kits = new Iterator[] { m.keySet().iterator(), m.descendingMap().descendingKeySet().iterator(), m.descendingKeySet().descendingSet().iterator(), }; - Iterator[] vits = new Iterator[] { + Iterator[] vits = new Iterator[] { m.values().iterator(), m.descendingMap().descendingMap().values().iterator(), }; - Iterator[] eits = new Iterator[] { + Iterator[] eits = new Iterator[] { m.entrySet().iterator(), m.descendingMap().descendingMap().entrySet().iterator(), }; - Iterator[] its = concat(kits, vits, eits); - for (final Iterator it : its) + Iterator[] its = concat(kits, vits, eits); + for (final Iterator it : its) if (maybe(4)) THROWS(IllegalStateException.class, () -> it.remove()); - Map.Entry prev = null; - for (Map.Entry e : (Set) m.entrySet()) { - Object k = e.getKey(); - Object v = e.getValue(); + Map.Entry prev = null; + for (var e : m.entrySet()) { + Integer k = e.getKey(); + Integer v = e.getValue(); check(m.containsKey(k)); check(m.containsValue(v)); - for (Iterator kit : kits) equalNext(kit, k); - for (Iterator vit : vits) equalNext(vit, v); - for (Iterator eit : eits) equalNext(eit, e); + for (var kit : kits) equalNext(kit, k); + for (var vit : vits) equalNext(vit, v); + for (var eit : eits) equalNext(eit, e); equal(k, m.ceilingKey(k)); equal(k, m.ceilingEntry(k).getKey()); equal(k, m.floorKey(k)); @@ -480,7 +473,7 @@ public class LockStep { } prev = e; } - for (final Iterator it : its) { + for (final var it : its) { if (maybe(2)) check(! it.hasNext()); Fun fun = () -> it.next(); @@ -488,8 +481,8 @@ public class LockStep { } } - static void equalNavigableMapsLeaf(final NavigableMap m1, - final NavigableMap m2) { + static void equalNavigableMapsLeaf(final NavigableMap m1, + final NavigableMap m2) { equal2(m1, m2); equal( m1.size(), m2.size()); equal( m1.isEmpty(), m2.isEmpty()); @@ -501,8 +494,8 @@ public class LockStep { checkNavigableMap(m2); } - static void equalNavigableMaps(NavigableMap m1, - NavigableMap m2) { + static void equalNavigableMaps(NavigableMap m1, + NavigableMap m2) { equalNavigableMapsLeaf(m1, m2); equalSetsLeaf(m1.keySet(), m2.keySet()); equalNavigableSets(m1.navigableKeySet(), @@ -515,8 +508,8 @@ public class LockStep { m2.descendingMap()); equalNavigableMapsLeaf(m1.descendingMap().descendingMap(), m2); - equalNavigableSetsLeaf((NavigableSet) m1.descendingMap().keySet(), - (NavigableSet) m2.descendingMap().keySet()); + equalNavigableSetsLeaf((NavigableSet) m1.descendingMap().keySet(), + (NavigableSet) m2.descendingMap().keySet()); equalNavigableSetsLeaf(m1.descendingMap().descendingKeySet(), m2.descendingMap().descendingKeySet()); equal2(m1.descendingMap().entrySet(), @@ -525,11 +518,11 @@ public class LockStep { //---------------------------------------------------------------- // submaps //---------------------------------------------------------------- - Object min = Integer.MIN_VALUE; - Object max = Integer.MAX_VALUE; + Integer min = Integer.MIN_VALUE; + Integer max = Integer.MAX_VALUE; if (m1.comparator() != null && m1.comparator().compare(min, max) > 0) { - Object tmp = min; min = max; max = tmp; + Integer tmp = min; min = max; max = tmp; } switch (rnd.nextInt(6)) { case 0: @@ -545,107 +538,119 @@ public class LockStep { m2.headMap(max, true)); break; case 3: - equalNavigableMapsLeaf((NavigableMap) m1.subMap(min, max), - (NavigableMap) m2.subMap(min, max)); + equalNavigableMapsLeaf((NavigableMap) m1.subMap(min, max), + (NavigableMap) m2.subMap(min, max)); break; case 4: - equalNavigableMapsLeaf((NavigableMap) m1.tailMap(min), - (NavigableMap) m2.tailMap(min)); + equalNavigableMapsLeaf((NavigableMap) m1.tailMap(min), + (NavigableMap) m2.tailMap(min)); break; case 5: - equalNavigableMapsLeaf((NavigableMap) m1.headMap(max), - (NavigableMap) m2.headMap(max)); + equalNavigableMapsLeaf((NavigableMap) m1.headMap(max), + (NavigableMap) m2.headMap(max)); break; } } - abstract static class MapFrobber { abstract void frob(NavigableMap m); } - abstract static class SetFrobber { abstract void frob(NavigableSet m); } + interface MapFrobber { void frob(NavigableMap m); } + interface SetFrobber { void frob(NavigableSet m); } - static MapFrobber randomAdder(NavigableMap m) { + static MapFrobber randomAdder(NavigableMap m) { final Integer k = unusedKey(m); final MapFrobber[] randomAdders = { - new MapFrobber() {void frob(NavigableMap m) { - equal(m.put(k, k+1), null); - equal(m.get(k), k+1); + map -> { + equal(map.put(k, k + 1), null); + equal(map.get(k), k + 1); if (maybe(4)) { - equal(m.put(k, k+1), k+1); - equal(m.get(k), k+1);}}}, - new MapFrobber() {void frob(NavigableMap m) { - m.descendingMap().put(k, k+1); - equal(m.get(k), k+1);}}, - new MapFrobber() {void frob(NavigableMap m) { - m.tailMap(k,true).headMap(k,true).put(k,k+1);}}, - new MapFrobber() {void frob(NavigableMap m) { - m.tailMap(k,true).headMap(k,true).descendingMap().put(k,k+1);}} + equal(map.put(k, k + 1), k + 1); + equal(map.get(k), k + 1);}}, + map -> { + map.descendingMap().put(k, k + 1); + equal(map.get(k), k + 1);}, + map -> map.tailMap(k,true).headMap(k,true).put(k, k + 1), + map -> { + equal(map.tailMap(k,true).headMap(k,true).putIfAbsent(k, k + 1), null); + equal(map.tailMap(k,true).headMap(k,true).putIfAbsent(k, k + 1), k + 1);}, + map -> { + equal(map.tailMap(k,true).headMap(k,true).merge(k,k,Integer::sum), k); + equal(map.tailMap(k,true).headMap(k,true).merge(k,1,Integer::sum), k+1);}, + map -> equal(map.subMap(k,true, k, true).computeIfAbsent(k, key -> key + 1), k + 1), + map -> { + equal(map.subMap(k,true, k, true).computeIfPresent(k, (key, val) -> 1), null); + equal(map.tailMap(k,true).compute(k, (key, val) -> { + equal(val, null); + return 1; + }), 1); + equal(map.headMap(k, true).computeIfPresent(k, (key, val) -> val + key), k + 1); + equal(map.tailMap(k, false).computeIfPresent(k, (key, val) -> 1), null); + equal(map.headMap(k, false).compute(k, (key, val) -> null), null); + equal(map.tailMap(k, false).computeIfAbsent(k, key -> null), null); + }, + map -> map.tailMap(k,true).headMap(k,true).descendingMap().put(k, k + 1) }; - return new MapFrobber() {void frob(NavigableMap m) { - randomAdders[rnd.nextInt(randomAdders.length)].frob(m); - if (maybe(2)) equal(m.get(k), k+1); + return map -> { + randomAdders[rnd.nextInt(randomAdders.length)].frob(map); + if (maybe(2)) equal(map.get(k), k + 1); if (maybe(4)) { - equal(m.put(k, k+1), k+1); - equal(m.get(k), k+1);}}}; + equal(map.put(k, k + 1), k + 1); + equal(map.get(k), k + 1);}}; } - static SetFrobber randomAdder(NavigableSet s) { + static SetFrobber randomAdder(NavigableSet s) { final Integer e = unusedElt(s); final SetFrobber[] randomAdders = { - new SetFrobber() {void frob(NavigableSet s) { - check(s.add(e));}}, - new SetFrobber() {void frob(NavigableSet s) { - s.descendingSet().add(e);}}, - new SetFrobber() {void frob(NavigableSet s) { - s.tailSet(e,true).headSet(e,true).add(e);}}, - new SetFrobber() {void frob(NavigableSet s) { - s.descendingSet().tailSet(e,true).headSet(e,true).add(e);}} + set -> check(set.add(e)), + set -> set.descendingSet().add(e), + set -> set.tailSet(e,true).headSet(e,true).add(e), + set -> set.descendingSet().tailSet(e,true).headSet(e,true).add(e) }; - return new SetFrobber() {void frob(NavigableSet s) { - if (maybe(2)) check(! s.contains(e)); - randomAdders[rnd.nextInt(randomAdders.length)].frob(s); - if (maybe(2)) check(! s.add(e)); - if (maybe(2)) check(s.contains(e));}}; + return set -> { + if (maybe(2)) check(! set.contains(e)); + randomAdders[rnd.nextInt(randomAdders.length)].frob(set); + if (maybe(2)) check(! set.add(e)); + if (maybe(2)) check(set.contains(e));}; } - static Integer unusedElt(NavigableSet s) { + static Integer unusedElt(NavigableSet s) { Integer e; do { e = rnd.nextInt(1024); } while (s.contains(e)); return e; } - static Integer unusedKey(NavigableMap m) { + static Integer unusedKey(NavigableMap m) { Integer k; do { k = rnd.nextInt(1024); } while (m.containsKey(k)); return k; } - static Integer usedKey(NavigableMap m) { + static Integer usedKey(NavigableMap m) { Integer x = rnd.nextInt(1024); - Integer floor = (Integer) m.floorKey(x); - Integer ceiling = (Integer) m.ceilingKey(x); + Integer floor = m.floorKey(x); + Integer ceiling = m.ceilingKey(x); if (floor != null) return floor; check(ceiling != null); return ceiling; } - static Integer usedElt(NavigableSet s) { + static Integer usedElt(NavigableSet s) { Integer x = rnd.nextInt(1024); - Integer floor = (Integer) s.floor(x); - Integer ceiling = (Integer) s.ceiling(x); + Integer floor = s.floor(x); + Integer ceiling = s.ceiling(x); if (floor != null) return floor; check(ceiling != null); return ceiling; } - static void checkUnusedKey(NavigableMap m, Object k) { + static void checkUnusedKey(NavigableMap m, Integer k) { check(! m.containsKey(k)); equal(m.get(k), null); if (maybe(2)) equal(m.remove(k), null); } - static void checkUnusedElt(NavigableSet s, Object e) { + static void checkUnusedElt(NavigableSet s, Integer e) { if (maybe(2)) check(! s.contains(e)); if (maybe(2)) { @@ -656,32 +661,32 @@ public class LockStep { check(! s.remove(e)); } - static Fun remover(final Iterator it) { + static Fun remover(final Iterator it) { return () -> it.remove(); } - static MapFrobber randomRemover(NavigableMap m) { + static MapFrobber randomRemover(NavigableMap m) { final Integer k = usedKey(m); final MapFrobber[] randomRemovers = { - new MapFrobber() {void frob(NavigableMap m) { - Map.Entry e = m.firstEntry(); - equal(m.pollFirstEntry(), e); - checkUnusedKey(m, e.getKey());}}, - new MapFrobber() {void frob(NavigableMap m) { - Map.Entry e = m.lastEntry(); - equal(m.pollLastEntry(), e); - checkUnusedKey(m, e.getKey());}}, - new MapFrobber() {void frob(NavigableMap m) { - check(m.remove(k) != null); - checkUnusedKey(m, k);}}, - new MapFrobber() {void frob(NavigableMap m) { - m.subMap(k, true, k, true).clear(); - checkUnusedKey(m, k);}}, - new MapFrobber() {void frob(NavigableMap m) { - m.descendingMap().subMap(k, true, k, true).clear(); - checkUnusedKey(m, k);}}, - new MapFrobber() {void frob(NavigableMap m) { - final Iterator it = m.keySet().iterator(); + map -> { + var e = map.firstEntry(); + equal(map.pollFirstEntry(), e); + checkUnusedKey(map, e.getKey());}, + map -> { + var e = map.lastEntry(); + equal(map.pollLastEntry(), e); + checkUnusedKey(map, e.getKey());}, + map -> { + check(map.remove(k) != null); + checkUnusedKey(map, k);}, + map -> { + map.subMap(k, true, k, true).clear(); + checkUnusedKey(map, k);}, + map -> { + map.descendingMap().subMap(k, true, k, true).clear(); + checkUnusedKey(map, k);}, + map -> { + final var it = map.keySet().iterator(); while (it.hasNext()) if (it.next().equals(k)) { it.remove(); @@ -689,9 +694,9 @@ public class LockStep { THROWS(IllegalStateException.class, () -> it.remove()); } - checkUnusedKey(m, k);}}, - new MapFrobber() {void frob(NavigableMap m) { - final Iterator it = m.navigableKeySet().descendingIterator(); + checkUnusedKey(map, k);}, + map -> { + final var it = map.navigableKeySet().descendingIterator(); while (it.hasNext()) if (it.next().equals(k)) { it.remove(); @@ -699,44 +704,44 @@ public class LockStep { THROWS(IllegalStateException.class, () -> it.remove()); } - checkUnusedKey(m, k);}}, - new MapFrobber() {void frob(NavigableMap m) { - final Iterator it = m.entrySet().iterator(); + checkUnusedKey(map, k);}, + map -> { + final var it = map.entrySet().iterator(); while (it.hasNext()) if (it.next().getKey().equals(k)) { it.remove(); if (maybe(2)) THROWS(IllegalStateException.class, remover(it)); } - checkUnusedKey(m, k);}}, + checkUnusedKey(map, k);}, }; return randomRemovers[rnd.nextInt(randomRemovers.length)]; } - static SetFrobber randomRemover(NavigableSet s) { + static SetFrobber randomRemover(NavigableSet s) { final Integer e = usedElt(s); final SetFrobber[] randomRemovers = { - new SetFrobber() {void frob(NavigableSet s) { - Object e = s.first(); - equal(s.pollFirst(), e); - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - Object e = s.last(); - equal(s.pollLast(), e); - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - check(s.remove(e)); - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - s.subSet(e, true, e, true).clear(); - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - s.descendingSet().subSet(e, true, e, true).clear(); - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - final Iterator it = s.iterator(); + set -> { + var fst = set.first(); + equal(set.pollFirst(), fst); + checkUnusedElt(set, fst);}, + set -> { + var lst = set.last(); + equal(set.pollLast(), lst); + checkUnusedElt(set, lst);}, + set -> { + check(set.remove(e)); + checkUnusedElt(set, e);}, + set -> { + set.subSet(e, true, e, true).clear(); + checkUnusedElt(set, e);}, + set -> { + set.descendingSet().subSet(e, true, e, true).clear(); + checkUnusedElt(set, e);}, + set -> { + final var it = set.iterator(); while (it.hasNext()) if (it.next().equals(e)) { it.remove(); @@ -744,9 +749,9 @@ public class LockStep { THROWS(IllegalStateException.class, () -> it.remove()); } - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - final Iterator it = s.descendingSet().iterator(); + checkUnusedElt(set, e);}, + set -> { + final var it = set.descendingSet().iterator(); while (it.hasNext()) if (it.next().equals(e)) { it.remove(); @@ -754,9 +759,9 @@ public class LockStep { THROWS(IllegalStateException.class, () -> it.remove()); } - checkUnusedElt(s, e);}}, - new SetFrobber() {void frob(NavigableSet s) { - final Iterator it = s.descendingIterator(); + checkUnusedElt(set, e);}, + set -> { + final var it = set.descendingIterator(); while (it.hasNext()) if (it.next().equals(e)) { it.remove(); @@ -764,94 +769,96 @@ public class LockStep { THROWS(IllegalStateException.class, () -> it.remove()); } - checkUnusedElt(s, e);}} + checkUnusedElt(set, e);} }; return randomRemovers[rnd.nextInt(randomRemovers.length)]; } - static void lockStep(NavigableMap m1, - NavigableMap m2) { + static void lockStep(NavigableMap m1, + NavigableMap m2) { if (! (thorough || maybe(3))) return; if (maybe(4)) m1 = serialClone(m1); if (maybe(4)) m2 = serialClone(m2); - List maps = Arrays.asList(m1, m2); - for (NavigableMap m : maps) testEmptyMap(m); + var maps = Arrays.asList(m1, m2); + for (var m : maps) testEmptyMap(m); final Set ints = new HashSet<>(); while (ints.size() < size) ints.add(rnd.nextInt(1024)); final Integer[] elts = ints.toArray(new Integer[size]); + equal(elts.length, size); for (int i = 0; i < size; i++) { MapFrobber adder = randomAdder(m1); - for (final NavigableMap m : maps) { + for (var m : maps) { adder.frob(m); equal(m.size(), i+1); } equalNavigableMaps(m1, m2); } - for (final NavigableMap m : maps) { - final Object e = usedKey(m); + for (var m : maps) { + final var e = usedKey(m); THROWS(IllegalArgumentException.class, - () -> {m.subMap(e,true,e,false) - .subMap(e,true,e,true);}, - () -> {m.subMap(e,false,e,true) - .subMap(e,true,e,true);}, + () -> m.subMap(e,true,e,false).subMap(e,true,e,true), + () -> m.subMap(e,false,e,true).subMap(e,true,e,true), () -> m.tailMap(e,false).tailMap(e,true), - () -> m.headMap(e,false).headMap(e,true)); + () -> m.headMap(e,false).headMap(e,true), + () -> m.headMap(e, false).put(e, 0), + () -> m.tailMap(e, false).putIfAbsent(e, 0), + () -> m.headMap(e, false).computeIfAbsent(e, k -> 1), + () -> m.tailMap(e, false).compute(e, (k, v) -> 0)); } //System.out.printf("%s%n", m1); for (int i = size; i > 0; i--) { MapFrobber remover = randomRemover(m1); - for (final NavigableMap m : maps) { + for (var m : maps) { remover.frob(m); equal(m.size(), i-1); } equalNavigableMaps(m1, m2); } - for (NavigableMap m : maps) testEmptyMap(m); + for (var m : maps) testEmptyMap(m); } - static void lockStep(NavigableSet s1, - NavigableSet s2) { + static void lockStep(NavigableSet s1, + NavigableSet s2) { if (! (thorough || maybe(3))) return; if (maybe(4)) s1 = serialClone(s1); if (maybe(4)) s2 = serialClone(s2); - List sets = Arrays.asList(s1, s2); - for (NavigableSet s : sets) testEmptySet(s); + var sets = Arrays.asList(s1, s2); + for (var s : sets) testEmptySet(s); final Set ints = new HashSet<>(); while (ints.size() < size) ints.add(rnd.nextInt(1024)); final Integer[] elts = ints.toArray(new Integer[size]); + equal(elts.length, size); for (int i = 0; i < size; i++) { SetFrobber adder = randomAdder(s1); - for (final NavigableSet s : sets) { + for (var s : sets) { adder.frob(s); equal(s.size(), i+1); } equalNavigableSets(s1, s2); } - for (final NavigableSet s : sets) { - final Object e = usedElt(s); + for (var s : sets) { + final Integer e = usedElt(s); THROWS(IllegalArgumentException.class, - () -> {s.subSet(e,true,e,false) - .subSet(e,true,e,true);}, - () -> {s.subSet(e,false,e,true) - .subSet(e,true,e,true);}, + () -> s.subSet(e,true,e,false).subSet(e,true,e,true), + () -> s.subSet(e,false,e,true).subSet(e,true,e,true), () -> s.tailSet(e,false).tailSet(e,true), () -> s.headSet(e,false).headSet(e,true)); } //System.out.printf("%s%n", s1); for (int i = size; i > 0; i--) { SetFrobber remover = randomRemover(s1); - for (final NavigableSet s : sets) { + for (var s : sets) { remover.frob(s); equal(s.size(), i-1); } equalNavigableSets(s1, s2); } - for (NavigableSet s : sets) testEmptySet(s); + for (var s : sets) testEmptySet(s); } //--------------------- Infrastructure --------------------------- @@ -862,7 +869,7 @@ public class LockStep { static void unexpected(Throwable t) { failed++; t.printStackTrace(); } static void check(boolean cond) { if (cond) pass(); else fail(); } static void equal(Object x, Object y) { - if (x == null ? y == null : x.equals(y)) pass(); + if (Objects.equals(x, y)) pass(); else {System.out.println(x + " not equal to " + y); fail();}} static void equal2(Object x, Object y) {equal(x, y); equal(y, x);} public static void main(String[] args) throws Throwable { diff --git a/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java b/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java index d43a070cc40..2a5a9cf0bed 100644 --- a/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java +++ b/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java @@ -39,11 +39,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.Map; +import java.util.NavigableMap; import java.util.Random; import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Supplier; +import java.util.function.UnaryOperator; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -54,6 +56,9 @@ import java.util.stream.IntStream; @Fork(3) @State(Scope.Thread) public class TreeMapUpdate { + @Param({"TreeMap", "descendingMap", "tailMap"}) + public String mode; + @Param({"10", "1000", "100000"}) public int size; @@ -68,10 +73,25 @@ public class TreeMapUpdate { private Supplier> supplier; + private UnaryOperator> transformer; + private Integer[] keys; @Setup public void setUp() { + switch(mode) { + case "TreeMap": + transformer = map -> map; + break; + case "descendingMap": + transformer = map -> map.descendingMap(); + break; + case "tailMap": + transformer = map -> map.tailMap(0, true); + break; + default: + throw new IllegalStateException(mode); + } supplier = comparator ? () -> new TreeMap<>(Comparator.reverseOrder()) : TreeMap::new; keys = IntStream.range(0, size).boxed().toArray(Integer[]::new); Random rnd = seed == 0 ? new Random() : new Random(seed); @@ -86,12 +106,12 @@ public class TreeMapUpdate { @Benchmark public Map baseline() { // Just create map (empty or pre-filled) - return supplier.get(); + return transformer.apply(supplier.get()); } @Benchmark public Map put(Blackhole bh) { - Map map = supplier.get(); + Map map = transformer.apply(supplier.get()); Integer[] keys = this.keys; for (Integer key : keys) { bh.consume(map.put(key, key)); @@ -101,7 +121,7 @@ public class TreeMapUpdate { @Benchmark public Map putIfAbsent(Blackhole bh) { - Map map = supplier.get(); + Map map = transformer.apply(supplier.get()); Integer[] keys = this.keys; for (Integer key : keys) { bh.consume(map.putIfAbsent(key, key)); @@ -111,7 +131,7 @@ public class TreeMapUpdate { @Benchmark public Map computeIfAbsent(Blackhole bh) { - Map map = supplier.get(); + Map map = transformer.apply(supplier.get()); Integer[] keys = this.keys; for (Integer key : keys) { bh.consume(map.computeIfAbsent(key, k -> k)); @@ -121,7 +141,7 @@ public class TreeMapUpdate { @Benchmark public Map compute(Blackhole bh) { - Map map = supplier.get(); + Map map = transformer.apply(supplier.get()); Integer[] keys = this.keys; for (Integer key : keys) { bh.consume(map.compute(key, (k, old) -> k)); @@ -131,7 +151,7 @@ public class TreeMapUpdate { @Benchmark public Map computeIfPresent(Blackhole bh) { - Map map = supplier.get(); + Map map = transformer.apply(supplier.get()); Integer[] keys = this.keys; for (Integer key : keys) { bh.consume(map.computeIfPresent(key, (k, old) -> k)); @@ -141,7 +161,7 @@ public class TreeMapUpdate { @Benchmark public Map merge(Blackhole bh) { - Map map = supplier.get(); + Map map = transformer.apply(supplier.get()); Integer[] keys = this.keys; for (Integer key : keys) { bh.consume(map.merge(key, key, (k1, k2) -> k1)); From db1e207a72061e926679499adbd0bd2be88d4e85 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Mon, 10 Aug 2020 09:54:34 -0700 Subject: [PATCH 068/100] 8249703: test/jdk/java/io/File/GetXSpace.java fails on macos Reviewed-by: naoto --- test/jdk/ProblemList.txt | 1 - test/jdk/java/io/File/GetXSpace.java | 35 +++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index cc99f6146b2..30cb4a651db 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -590,7 +590,6 @@ javax/management/monitor/DerivedGaugeMonitorTest.java 8042211 generic-al # jdk_io java/io/pathNames/GeneralWin32.java 8180264 windows-all -java/io/File/GetXSpace.java 8249703 macosx-all ############################################################################ diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java index 6cd31ab12dc..3ca1558ffe6 100644 --- a/test/jdk/java/io/File/GetXSpace.java +++ b/test/jdk/java/io/File/GetXSpace.java @@ -35,6 +35,8 @@ import java.io.File; import java.io.FilePermission; import java.io.InputStreamReader; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.FileStore; import java.security.Permission; import java.util.ArrayList; import java.util.regex.Matcher; @@ -47,9 +49,12 @@ public class GetXSpace { private static SecurityManager [] sma = { null, new Allow(), new DenyFSA(), new DenyRead() }; - private static final String osName = System.getProperty("os.name"); + private static final String OS_NAME = System.getProperty("os.name"); + private static final boolean IS_MAC = OS_NAME.startsWith("Mac"); + private static final boolean IS_WIN = OS_NAME.startsWith("Windows"); + // FileSystem Total Used Available Use% MountedOn - private static final Pattern dfPattern = Pattern.compile("([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s].*)\n"); + private static final Pattern DF_PATTERN = Pattern.compile("([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s].*)\n"); private static int fail = 0; private static int pass = 0; @@ -129,7 +134,7 @@ public class GetXSpace { } out.println(sb); - Matcher m = dfPattern.matcher(sb); + Matcher m = DF_PATTERN.matcher(sb); int j = 0; while (j < sb.length()) { if (m.find(j)) { @@ -138,7 +143,7 @@ public class GetXSpace { String name = f; if (name == null) { // cygwin's df lists windows path as FileSystem (1st group) - name = osName.startsWith("Windows") ? m.group(1) : m.group(4); + name = IS_WIN ? m.group(1) : m.group(4); } al.add(new Space(m.group(2), m.group(3), name));; } @@ -201,13 +206,31 @@ public class GetXSpace { // if the file system can dynamically change size, this check will fail if (ts != s.total()) { - fail(s.name(), s.total(), "!=", ts); + long blockSize = 1; + long numBlocks = 0; + try { + FileStore fileStore = Files.getFileStore(f.toPath()); + blockSize = fileStore.getBlockSize(); + numBlocks = fileStore.getTotalSpace()/blockSize; + } catch (IOException e) { + throw new RuntimeException(e); + } + + + // On macOS, the number of 1024 byte blocks might be incorrectly + // calculated by 'df' using integer division by 2 of the number of + // 512 byte blocks, resulting in a size smaller than the actual + // value when the number of blocks is odd. + if (!IS_MAC || blockSize != 512 || numBlocks % 2 == 0 + || ts - s.total() != 512) { + fail(s.name(), s.total(), "!=", ts); + } } else { pass(); } // unix df returns statvfs.f_bavail - long tsp = (!osName.startsWith("Windows") ? us : fs); + long tsp = (!IS_WIN ? us : fs); if (!s.woomFree(tsp)) { fail(s.name(), s.free(), "??", tsp); } else { From b5f785ba9bcd9969d153f60d7bbe193778ed3c10 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 10 Aug 2020 17:16:56 +0000 Subject: [PATCH 069/100] 8246816: XMLGregorianCalendar.hashCode() produces far too many identical hashes Reviewed-by: naoto, rriggs --- .../datatype/XMLGregorianCalendarImpl.java | 47 +---------- .../xml/datatype/XMLGregorianCalendar.java | 17 ++-- .../jaxp/unittest/datatype/HashCodeTest.java | 80 +++++++++++++++++++ 3 files changed, 91 insertions(+), 53 deletions(-) create mode 100644 test/jaxp/javax/xml/jaxp/unittest/datatype/HashCodeTest.java diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java index 68e44a142b6..46582fefd1b 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2020, 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 @@ -190,7 +190,7 @@ import jdk.xml.internal.SecuritySupport; * @author Sunitha Reddy * @see javax.xml.datatype.Duration * @since 1.5 - * @LastModified: June 2018 + * @LastModified: Aug 2020 */ public class XMLGregorianCalendarImpl @@ -1682,49 +1682,6 @@ public class XMLGregorianCalendarImpl return Pfield.compareTo(Qfield); } - /** - *

      Indicates whether parameter obj is "equal to" this one.

      - * - * @param obj to compare. - * - * @return true when compare(this,(XMLGregorianCalendar)obj) == EQUAL.. - */ - public boolean equals(Object obj) { - - if (obj == null || !(obj instanceof XMLGregorianCalendar)) { - return false; - } - if (obj == this) { - return true; - } - return compare((XMLGregorianCalendar) obj) == DatatypeConstants.EQUAL; - } - - /** - *

      Returns a hash code consistent with the definition of the equals method.

      - * - * @return hash code of this object. - */ - public int hashCode() { - - // Following two dates compare to EQUALS since in different timezones. - // 2000-01-15T12:00:00-05:00 == 2000-01-15T13:00:00-04:00 - // - // Must ensure both instances generate same hashcode by normalizing - // this to UTC timezone. - int timezone = getTimezone(); - if (timezone == DatatypeConstants.FIELD_UNDEFINED) { - timezone = 0; - } - XMLGregorianCalendar gc = this; - if (timezone != 0) { - gc = this.normalizeToTimezone(getTimezone()); - } - return gc.getYear() + gc.getMonth() + gc.getDay() + - gc.getHour() + gc.getMinute() + gc.getSecond(); - } - - /** *

      Constructs a new XMLGregorianCalendar object by * parsing its lexical string representation as defined in diff --git a/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java b/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java index 747d81bccd7..cbaa2553879 100644 --- a/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java +++ b/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -28,6 +28,7 @@ package javax.xml.datatype; import javax.xml.namespace.QName; import java.math.BigDecimal; import java.math.BigInteger; +import java.util.Arrays; import java.util.TimeZone; import java.util.GregorianCalendar; @@ -688,10 +689,12 @@ public abstract class XMLGregorianCalendar */ @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof XMLGregorianCalendar)) { return false; } + if (obj == this) { + return true; + } return compare((XMLGregorianCalendar) obj) == DatatypeConstants.EQUAL; } @@ -716,12 +719,10 @@ public abstract class XMLGregorianCalendar if (timezone != 0) { gc = this.normalize(); } - return gc.getYear() - + gc.getMonth() - + gc.getDay() - + gc.getHour() - + gc.getMinute() - + gc.getSecond(); + + int[] elements = {gc.getYear(), gc.getMonth(), gc.getDay(), gc.getHour(), + gc.getMinute(), gc.getSecond(), gc.getMillisecond()}; + return Arrays.hashCode(elements); } /** diff --git a/test/jaxp/javax/xml/jaxp/unittest/datatype/HashCodeTest.java b/test/jaxp/javax/xml/jaxp/unittest/datatype/HashCodeTest.java new file mode 100644 index 00000000000..6d16c676918 --- /dev/null +++ b/test/jaxp/javax/xml/jaxp/unittest/datatype/HashCodeTest.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package datatype; + +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import org.testng.annotations.Test; +import org.testng.Assert; +import org.testng.annotations.DataProvider; + +/* + * @test + * @bug 8246816 + * @run testng datatype.HashCodeTest + * @summary Test hashCode generation. + */ +public class HashCodeTest { + /* + DataProvider: for testHashCode + Data: datetime1, datetime2, flag indicating if their hashCodes are equal + */ + @DataProvider(name = "testHashCode") + public Object[][] getData() { + + return new Object[][]{ + // the reported case: identical hash codes before the patch + {"2020-04-24T12:53:00+02:00", "2020-06-04T06:58:17.727Z", false}, + // a case mentioned in the dev note of hashCode() implementation + {"2000-01-15T12:00:00-05:00", "2000-01-15T13:00:00-04:00", true}, + /** + * Comparing with a datetime that needs to be normalized. + * Before the patch, XMLGregorianCalendarImpl called the normalizeToTimezone + * method that will set UNDEFINED fractional second to zero. + */ + {"2000-01-01T03:19:04Z", "1999-12-31T23:49:04-03:30", true}, + // another case mentioned in the javadoc of XMLGregorianCalendar::normalize() + {"2000-03-04T23:00:00+03:00", "2000-03-04T20:00:00Z", true}, + }; + } + + @Test(dataProvider = "testHashCode") + public final void testHashCode(String dt1, String dt2, boolean equal) throws Exception { + DatatypeFactory dataTypeFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal1 = dataTypeFactory.newXMLGregorianCalendar(dt1); + XMLGregorianCalendar cal2 = dataTypeFactory.newXMLGregorianCalendar(dt2); + + // identical hash codes before the patch + int hashCode1 = cal1.hashCode(); + int hashCode2 = cal2.hashCode(); + + if (equal) { + Assert.assertTrue(cal1.equals(cal2)); + Assert.assertEquals(hashCode1, hashCode2); + } else { + Assert.assertFalse(cal1.equals(cal2)); + Assert.assertNotEquals(hashCode1, hashCode2); + } + } +} From d0d925c13a612af8bc1ff43895d01fc4af2e1b60 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Mon, 10 Aug 2020 10:25:17 -0700 Subject: [PATCH 070/100] 8251017: java/io/File/GetXSpace.java fails on UNIX Reviewed-by: naoto --- test/jdk/java/io/File/GetXSpace.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java index 3ca1558ffe6..b3a5ba5d7ca 100644 --- a/test/jdk/java/io/File/GetXSpace.java +++ b/test/jdk/java/io/File/GetXSpace.java @@ -24,6 +24,7 @@ /** * @test * @bug 4057701 6286712 6364377 + * @requires (os.family == "linux" | os.family == "mac" | os.family == "windows") * @run build GetXSpace * @run shell GetXSpace.sh * @summary Basic functionality of File.get-X-Space methods. From ed5696dd2ce318b2480c96b5eeaf319853ce5d89 Mon Sep 17 00:00:00 2001 From: Charlie Gracie Date: Mon, 10 Aug 2020 19:21:50 +0100 Subject: [PATCH 071/100] 8251361: Potential race between Logger configuration and GCs in HttpURLConWithProxy test Keep a static reference to the logger to prevent its inadvertent garbage collection while the test is running. Reviewed-by: dfuchs --- .../net/HttpURLConnection/HttpURLConWithProxy.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/jdk/java/net/HttpURLConnection/HttpURLConWithProxy.java b/test/jdk/java/net/HttpURLConnection/HttpURLConWithProxy.java index c8ab781ac44..53d74d06c2e 100644 --- a/test/jdk/java/net/HttpURLConnection/HttpURLConWithProxy.java +++ b/test/jdk/java/net/HttpURLConnection/HttpURLConWithProxy.java @@ -48,17 +48,21 @@ import java.util.logging.LogRecord; public class HttpURLConWithProxy { + private static Logger logger = + Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection"); + public static void main(String... arg) throws Exception { // Remove the default nonProxyHosts to use localhost for testing System.setProperty("http.nonProxyHosts", ""); System.setProperty("http.proxyHost", "1.1.1.1"); System.setProperty("http.proxyPort", "1111"); - String HTTPLOG = "sun.net.www.protocol.http.HttpURLConnection"; - Logger.getLogger(HTTPLOG).setLevel(Level.ALL); + + // Use the logger to help verify the Proxy was used + logger.setLevel(Level.ALL); Handler h = new ProxyHandler(); h.setLevel(Level.ALL); - Logger.getLogger(HTTPLOG).addHandler(h); + logger.addHandler(h); ServerSocket ss; URL url; From 1cc09ccaef9a3695dd2862e3ee121e141e0a8a13 Mon Sep 17 00:00:00 2001 From: Zdenek Zambersky Date: Tue, 4 Aug 2020 17:19:21 -0300 Subject: [PATCH 072/100] 8251117: Cannot check P11Key size in P11Cipher and P11AEADCipher Reviewed-by: valeriep --- .../share/classes/sun/security/pkcs11/P11AEADCipher.java | 4 +++- .../share/classes/sun/security/pkcs11/P11Cipher.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java index 9f3a5a1e62f..82d0dc164f4 100644 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java @@ -280,7 +280,9 @@ final class P11AEADCipher extends CipherSpi { SecureRandom sr) throws InvalidKeyException, InvalidAlgorithmParameterException { reset(true); - if (fixedKeySize != -1 && key.getEncoded().length != fixedKeySize) { + if (fixedKeySize != -1 && + ((key instanceof P11Key) ? ((P11Key) key).length() >> 3 : + key.getEncoded().length) != fixedKeySize) { throw new InvalidKeyException("Key size is invalid"); } P11Key newKey = P11SecretKeyFactory.convertKey(token, key, ALGO); diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java index 7fa3c0db82a..470a888cd84 100644 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java @@ -345,7 +345,9 @@ final class P11Cipher extends CipherSpi { SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException { reset(true); - if (fixedKeySize != -1 && key.getEncoded().length != fixedKeySize) { + if (fixedKeySize != -1 && + ((key instanceof P11Key) ? ((P11Key) key).length() >> 3 : + key.getEncoded().length) != fixedKeySize) { throw new InvalidKeyException("Key size is invalid"); } switch (opmode) { From eaf70e0ab8c52c9689f2db8164a2b0fb591c88e9 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Tue, 4 Aug 2020 13:58:11 -0700 Subject: [PATCH 073/100] 8247516: DSO.closestSymbolToPC() should use dbg.lookup() rather than rely on java ELF file support Reviewed-by: sspitsyn, ysuenaga --- .../hotspot/debugger/bsd/SharedObject.java | 6 +- .../hotspot/debugger/linux/SharedObject.java | 6 +- .../sun/jvm/hotspot/debugger/posix/DSO.java | 79 +------------------ .../hotspot/debugger/proc/SharedObject.java | 6 +- 4 files changed, 17 insertions(+), 80 deletions(-) diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java index 2f72f7d5d46..a21c2c21a74 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -44,5 +44,9 @@ class SharedObject extends DSO { return dbg.getAddressValue(addr); } + public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException { + return dbg.lookup(dbg.getAddressValue(pcAsAddr)); + } + private BsdDebugger dbg; } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java index 2c3f7b56614..00be154ad39 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -44,5 +44,9 @@ class SharedObject extends DSO { return dbg.getAddressValue(addr); } + public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException { + return dbg.lookup(dbg.getAddressValue(pcAsAddr)); + } + private LinuxDebugger dbg; } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java index 9ad1996547c..01c4821e0cb 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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,48 +25,20 @@ package sun.jvm.hotspot.debugger.posix; import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.debugger.cdbg.*; -import sun.jvm.hotspot.debugger.posix.elf.*; import sun.jvm.hotspot.utilities.memo.*; /** Provides a simple wrapper around the ELF library which handles relocation. */ public abstract class DSO implements LoadObject { - private MemoizedObject file; // contains ELFFile private String filename; private Address addr; private long size; - private IsDSO dso = new IsDSO(); - class IsDSO extends MemoizedBoolean { - protected boolean computeValue() { - return getFile().getHeader().getFileType() == ELFHeader.FT_DYN; - } - }; - - class ELFFileByName extends MemoizedObject { - protected Object computeValue() { - return ELFFileParser.getParser().parse(DSO.this.filename); - } - }; - - class ELFFileByAddress extends MemoizedObject { - protected Object computeValue() { - return ELFFileParser.getParser().parse(new AddressDataSource(DSO.this.addr)); - } - }; - - public DSO(String filename, long size, Address relocation) throws ELFException { + public DSO(String filename, long size, Address relocation) { this.filename = filename; this.size = size; this.addr = relocation; - this.file = new ELFFileByName(); - } - - public DSO(long size, Address relocation) throws ELFException { - this.addr = relocation; - this.size = size; - this.file = new ELFFileByAddress(); } public String getName() { @@ -77,17 +49,6 @@ public abstract class DSO implements LoadObject { return addr; } - /** if this .so is unloaded and re-loaded in the same process at a different - base, change the base by calling this to avoid re-parsing the ELF. */ - public void setBase(Address newBase) { - addr = newBase; - if (filename == null) { - // ELFFile was created by address. we have to re-parse it. - file = new ELFFileByAddress(); - dso = new IsDSO(); - } - } - public long getSize() { return size; } @@ -102,39 +63,11 @@ public abstract class DSO implements LoadObject { return null; } - public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException { - boolean dso = isDSO(); - long offset = dso? pcAsAddr.minus(addr) : getAddressValue(pcAsAddr); - ELFSymbol sym = getFile().getHeader().getELFSymbol(offset); - return (sym != null)? createClosestSymbol(sym.getName(), offset - sym.getValue()) : null; - } - public LineNumberInfo lineNumberForPC(Address pc) throws DebuggerException { // FIXME: after stabs parser return null; } - /** return true if file is a .so */ - public boolean isDSO() { - return dso.getValue(); - } - - /** Look up a symbol; returns absolute address or null if symbol was - not found. */ - public Address lookupSymbol(String symbol) throws ELFException { - ELFSymbol sym = getFile().getHeader().getELFSymbol(symbol); - if (sym == null) { - return null; - } - - long value = sym.getValue(); - if (isDSO()) { - return addr.addOffsetTo(value); - } else { - return newAddress(value); - } - } - public boolean equals(Object o) { if (o == null || !(o instanceof DSO)) { return false; @@ -147,14 +80,6 @@ public abstract class DSO implements LoadObject { return getBase().hashCode(); } - protected ELFFile getFile() { - return (ELFFile) file.getValue(); - } - protected abstract Address newAddress(long addr); protected abstract long getAddressValue(Address addr); - - protected ClosestSymbol createClosestSymbol(String name, long diff) { - return new ClosestSymbol(name, diff); - } } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java index c6a5262824d..95aa7e2e550 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -44,5 +44,9 @@ class SharedObject extends DSO { return dbg.getAddressValue(addr); } + public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException { + return dbg.lookup(dbg.getAddressValue(pcAsAddr)); + } + private ProcDebugger dbg; } From 36b129fe843b920d4937d22b3ad4b8f03de58fdd Mon Sep 17 00:00:00 2001 From: Yasumasa Suenaga Date: Wed, 5 Aug 2020 09:24:02 +0900 Subject: [PATCH 074/100] 8250826: jhsdb does not work with coredump which comes from Substrate VM Reviewed-by: cjplummer, sspitsyn --- .../linux/native/libsaproc/libproc_impl.h | 1 + .../linux/native/libsaproc/ps_core.c | 17 ++++++++++++++--- .../macosx/native/libsaproc/libproc_impl.h | 1 + .../macosx/native/libsaproc/ps_core.c | 8 ++++---- .../share/native/libsaproc/ps_core_common.c | 16 ++++++++++++---- .../share/native/libsaproc/ps_core_common.h | 4 ++-- 6 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h index 9144a3d1cee..9463aa67c93 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h @@ -67,6 +67,7 @@ typedef struct map_info { off_t offset; // file offset of this mapping uintptr_t vaddr; // starting virtual address size_t memsz; // size of the mapping + uint32_t flags; // acces flags struct map_info* next; } map_info; diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c index 0bc009a6c5f..4087d1c0f71 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c @@ -351,7 +351,7 @@ static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) { case PT_LOAD: { if (core_php->p_filesz != 0) { if (add_map_info(ph, ph->core->core_fd, core_php->p_offset, - core_php->p_vaddr, core_php->p_filesz) == NULL) goto err; + core_php->p_vaddr, core_php->p_filesz, core_php->p_flags) == NULL) goto err; } break; } @@ -390,10 +390,21 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li if (existing_map == NULL){ if (add_map_info(ph, lib_fd, lib_php->p_offset, - target_vaddr, lib_php->p_memsz) == NULL) { + target_vaddr, lib_php->p_memsz, lib_php->p_flags) == NULL) { goto err; } + } else if (lib_php->p_flags != existing_map->flags) { + // Access flags for this memory region are different between the library + // and coredump. It might be caused by mprotect() call at runtime. + // We should respect the coredump. + continue; } else { + // Read only segments in ELF should not be any different from PT_LOAD segments + // in the coredump. + // Also the first page of the ELF header might be included + // in the coredump (See JDK-7133122). + // Thus we need to replace the PT_LOAD segment with the library version. + // // Coredump stores value of p_memsz elf field // rounded up to page boundary. @@ -460,7 +471,7 @@ static bool read_exec_segments(struct ps_prochandle* ph, ELF_EHDR* exec_ehdr) { case PT_LOAD: { // add only non-writable segments of non-zero filesz if (!(exec_php->p_flags & PF_W) && exec_php->p_filesz != 0) { - if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz) == NULL) goto err; + if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz, exec_php->p_flags) == NULL) goto err; } break; } diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h index 8c60e445d36..3084a5283c7 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.h @@ -113,6 +113,7 @@ typedef struct map_info { uint64_t offset; // file offset of this mapping uint64_t vaddr; // starting virtual address size_t memsz; // size of the mapping + uint32_t flags; // access flags struct map_info* next; } map_info; diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c index fe70b0b78d4..229abedadad 100644 --- a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c +++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c @@ -248,7 +248,7 @@ static bool read_core_segments(struct ps_prochandle* ph) { print_debug("failed to read LC_SEGMENT_64 i = %d!\n", i); goto err; } - if (add_map_info(ph, fd, segcmd.fileoff, segcmd.vmaddr, segcmd.vmsize) == NULL) { + if (add_map_info(ph, fd, segcmd.fileoff, segcmd.vmaddr, segcmd.vmsize, segcmd.flags) == NULL) { print_debug("Failed to add map_info at i = %d\n", i); goto err; } @@ -788,7 +788,7 @@ static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) { case PT_LOAD: { if (core_php->p_filesz != 0) { if (add_map_info(ph, ph->core->core_fd, core_php->p_offset, - core_php->p_vaddr, core_php->p_filesz) == NULL) goto err; + core_php->p_vaddr, core_php->p_filesz, core_php->p_flags) == NULL) goto err; } break; } @@ -827,7 +827,7 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li if (existing_map == NULL){ if (add_map_info(ph, lib_fd, lib_php->p_offset, - target_vaddr, lib_php->p_filesz) == NULL) { + target_vaddr, lib_php->p_filesz, lib_php->p_flags) == NULL) { goto err; } } else { @@ -893,7 +893,7 @@ static bool read_exec_segments(struct ps_prochandle* ph, ELF_EHDR* exec_ehdr) { case PT_LOAD: { // add only non-writable segments of non-zero filesz if (!(exec_php->p_flags & PF_W) && exec_php->p_filesz != 0) { - if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz) == NULL) goto err; + if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz, exec_php->p_flags) == NULL) goto err; } break; } diff --git a/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c b/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c index 57eb2f2e175..09526beedc2 100644 --- a/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c +++ b/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c @@ -41,6 +41,13 @@ #include "sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext.h" #endif +// Define a segment permission flag allowing read if there is a read flag. Otherwise use 0. +#ifdef PF_R +#define MAP_R_FLAG PF_R +#else +#define MAP_R_FLAG 0 +#endif + #ifdef LINUX // I have no idea why this function is called ps_pread() on macos but ps_pdread on linux. #define ps_pread ps_pdread @@ -113,7 +120,7 @@ void core_release(struct ps_prochandle* ph) { } } -static map_info* allocate_init_map(int fd, off_t offset, uintptr_t vaddr, size_t memsz) { +static map_info* allocate_init_map(int fd, off_t offset, uintptr_t vaddr, size_t memsz, uint32_t flags) { map_info* map; if ( (map = (map_info*) calloc(1, sizeof(map_info))) == NULL) { print_debug("can't allocate memory for map_info\n"); @@ -125,14 +132,15 @@ static map_info* allocate_init_map(int fd, off_t offset, uintptr_t vaddr, size_t map->offset = offset; map->vaddr = vaddr; map->memsz = memsz; + map->flags = flags; return map; } // add map info with given fd, offset, vaddr and memsz map_info* add_map_info(struct ps_prochandle* ph, int fd, off_t offset, - uintptr_t vaddr, size_t memsz) { + uintptr_t vaddr, size_t memsz, uint32_t flags) { map_info* map; - if ((map = allocate_init_map(fd, offset, vaddr, memsz)) == NULL) { + if ((map = allocate_init_map(fd, offset, vaddr, memsz, flags)) == NULL) { return NULL; } @@ -149,7 +157,7 @@ static map_info* add_class_share_map_info(struct ps_prochandle* ph, off_t offset uintptr_t vaddr, size_t memsz) { map_info* map; if ((map = allocate_init_map(ph->core->classes_jsa_fd, - offset, vaddr, memsz)) == NULL) { + offset, vaddr, memsz, MAP_R_FLAG)) == NULL) { return NULL; } diff --git a/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.h b/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.h index 87155b26559..8531c6545ef 100644 --- a/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.h +++ b/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2020, 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 @@ -27,7 +27,7 @@ map_info* core_lookup(struct ps_prochandle *ph, uintptr_t addr); map_info* add_map_info(struct ps_prochandle* ph, int fd, off_t offset, - uintptr_t vaddr, size_t memsz); + uintptr_t vaddr, size_t memsz, uint32_t flags); void core_release(struct ps_prochandle* ph); bool read_string(struct ps_prochandle* ph, uintptr_t addr, char* buf, size_t size); bool init_classsharing_workaround(struct ps_prochandle* ph); From 45c4d9d5196b538a4007ed01c4f7b388ed4328ec Mon Sep 17 00:00:00 2001 From: Alexander Matveev Date: Tue, 4 Aug 2020 17:47:51 -0700 Subject: [PATCH 075/100] 8250646: hdiutil detach fix JDK-8245311 still fails sometimes Reviewed-by: herrick, asemenyuk --- .../jpackage/internal/MacDmgBundler.java | 19 ++++++++++++++++--- .../jpackage/internal/RetryExecutor.java | 8 ++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java index eeaf30b5f01..c599bc1e040 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java +++ b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java @@ -446,9 +446,22 @@ public class MacDmgBundler extends MacBaseInstallerBundler { // "hdiutil detach" might not work right away due to resource busy error, so // repeat detach several times. RetryExecutor retryExecutor = new RetryExecutor(); - // 10 times with 3 second delays. - retryExecutor.setMaxAttemptsCount(10).setAttemptTimeoutMillis(3000) - .execute(pb); + // Image can get detach even if we got resource busy error, so stop + // trying to detach it if it is no longer attached. + retryExecutor.setExecutorInitializer(exec -> { + if (!Files.exists(mountedRoot)) { + retryExecutor.abort(); + } + }); + try { + // 10 times with 3 second delays. + retryExecutor.setMaxAttemptsCount(10).setAttemptTimeoutMillis(3000) + .execute(pb); + } catch (IOException ex) { + if (!retryExecutor.isAborted()) { + throw ex; + } + } } // Compress it to a new image diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java index 586477abb27..2370389d52b 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java +++ b/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java @@ -53,6 +53,10 @@ public final class RetryExecutor { aborted = true; } + boolean isAborted() { + return aborted; + } + static RetryExecutor retryOnKnownErrorMessage(String v) { RetryExecutor result = new RetryExecutor(); return result.setExecutorInitializer(exec -> { @@ -75,6 +79,10 @@ public final class RetryExecutor { private void executeLoop(Supplier execSupplier) throws IOException { aborted = false; for (;;) { + if (aborted) { + break; + } + try { Executor exec = execSupplier.get(); if (executorInitializer != null) { From 6b8c16cf418d43df561477d4147e1fdc8bf7c98a Mon Sep 17 00:00:00 2001 From: David Holmes Date: Tue, 4 Aug 2020 21:11:45 -0400 Subject: [PATCH 076/100] 8248906: runtime/Thread/ThreadObjAccessAtExit.java fails due to OutOfMemoryErrors Reviewed-by: mdoerr --- test/hotspot/jtreg/runtime/Thread/ThreadObjAccessAtExit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/runtime/Thread/ThreadObjAccessAtExit.java b/test/hotspot/jtreg/runtime/Thread/ThreadObjAccessAtExit.java index f34124eac2f..77ad8affbec 100644 --- a/test/hotspot/jtreg/runtime/Thread/ThreadObjAccessAtExit.java +++ b/test/hotspot/jtreg/runtime/Thread/ThreadObjAccessAtExit.java @@ -30,8 +30,8 @@ * @library /testlibrary /test/lib * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox - * @comment run with a small heap, but we need at least 7M for ZGC - * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx7m -XX:-DisableExplicitGC ThreadObjAccessAtExit + * @comment run with a small heap, but we need at least 11M for ZGC with JFR + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx11m -XX:-DisableExplicitGC ThreadObjAccessAtExit */ import sun.hotspot.WhiteBox; From 30c8811d11fd8d1a1ee1368cd90044e5b06e4259 Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Wed, 5 Aug 2020 10:54:18 +0800 Subject: [PATCH 077/100] 8251031: Some vmTestbase/nsk/monitoring/RuntimeMXBean tests fail with hostnames starting from digits Reviewed-by: dholmes, cjplummer, sspitsyn --- .../RuntimeMXBean/RuntimeMXBean006/RuntimeMXBean006.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean006/RuntimeMXBean006.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean006/RuntimeMXBean006.java index 0814979050c..72a7e150849 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean006/RuntimeMXBean006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean006/RuntimeMXBean006.java @@ -56,7 +56,8 @@ public class RuntimeMXBean006 extends MonitoringTestBase implements Initializabl public void initialize() { runtime = monitoringFactory.getRuntimeMXBean(); /* Name should be on the format @. */ - namePattern = Pattern.compile("^[0-9]+@(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])$"); + namePattern = Pattern.compile("^[0-9]+@(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*" + + "[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"); } private void testGetName() { From a53ecac07c5a6a23788f174b41c8880ca9120a5d Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Tue, 4 Aug 2020 20:04:47 -0700 Subject: [PATCH 078/100] 8251128: remove vmTestbase/vm/compiler/jbe/combine Reviewed-by: kvn --- .../vmTestbase/vm/compiler/jbe/combine/README | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README deleted file mode 100644 index 581714bde22..00000000000 --- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/combine/README +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2002, 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 -under the terms of the GNU General Public License version 2 only, as -published by the Free Software Foundation. - -This code is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -version 2 for more details (a copy is included in the LICENSE file that -accompanied this code). - -You should have received a copy of the GNU General Public License version -2 along with this work; if not, write to the Free Software Foundation, -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - -Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -or visit www.oracle.com if you need additional information or have any -questions. - -Test a combination of optimization techniques that includes redundant expression -elimination, code motion (including loop invariant hoisting), strength reduction, - -motion (including loop invariant hoisting), strength reduction, constant folding, etc. From 61ebb6adb75c7f0f7965c0e7a3e1eb7258943a14 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Tue, 4 Aug 2020 20:05:47 -0700 Subject: [PATCH 079/100] 8249030: clean up FileInstaller $test.src $cwd in vmTestbase_nsk_jdi tests Reviewed-by: dholmes, sspitsyn --- .../_itself_/awevent001/TestDescription.java | 1 - .../Accessible/isPackagePrivate/accipp001/TestDescription.java | 1 - .../Accessible/isPackagePrivate/accipp002/TestDescription.java | 1 - .../jdi/Accessible/isPrivate/isPrivate001/TestDescription.java | 1 - .../jdi/Accessible/isPrivate/isprivate002/TestDescription.java | 1 - .../Accessible/isProtected/isProtected001/TestDescription.java | 1 - .../Accessible/isProtected/isprotected002/TestDescription.java | 1 - .../nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java | 1 - .../nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java | 1 - .../nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java | 1 - .../jdi/Accessible/modifiers/modifiers001/TestDescription.java | 1 - .../jdi/Accessible/modifiers/modifiers002/TestDescription.java | 1 - .../jdi/Argument/description/description001/TestDescription.java | 1 - .../nsk/jdi/Argument/isValid/isvalid001/TestDescription.java | 1 - .../nsk/jdi/Argument/isValid/isvalid002/TestDescription.java | 1 - .../nsk/jdi/Argument/isValid/isvalid003/TestDescription.java | 1 - .../nsk/jdi/Argument/isValid/isvalid004/TestDescription.java | 1 - .../nsk/jdi/Argument/isValid/isvalid005/TestDescription.java | 1 - .../nsk/jdi/Argument/label/label001/TestDescription.java | 1 - .../jdi/Argument/mustSpecify/mustspecify001/TestDescription.java | 1 - .../nsk/jdi/Argument/name/name001/TestDescription.java | 1 - .../nsk/jdi/Argument/setValue/setvalue001/TestDescription.java | 1 - .../nsk/jdi/Argument/setValue/setvalue002/TestDescription.java | 1 - .../nsk/jdi/Argument/value/value001/TestDescription.java | 1 - .../nsk/jdi/Argument/value/value002/TestDescription.java | 1 - .../nsk/jdi/Argument/value/value003/TestDescription.java | 1 - .../nsk/jdi/Argument/value/value004/TestDescription.java | 1 - .../jdi/ArrayReference/getValue/getvalue001/TestDescription.java | 1 - .../jdi/ArrayReference/getValue/getvalue002/TestDescription.java | 1 - .../jdi/ArrayReference/getValue/getvalue003/TestDescription.java | 1 - .../ArrayReference/getValues/getvalues001/TestDescription.java | 1 - .../ArrayReference/getValues/getvalues002/TestDescription.java | 1 - .../ArrayReference/getValues/getvalues003/TestDescription.java | 1 - .../getValues_ii/getvaluesii001/TestDescription.java | 1 - .../getValues_ii/getvaluesii002/TestDescription.java | 1 - .../getValues_ii/getvaluesii003/TestDescription.java | 1 - .../getValues_ii/getvaluesii004/TestDescription.java | 1 - .../getValues_ii/getvaluesii005/TestDescription.java | 1 - .../nsk/jdi/ArrayReference/length/length001/TestDescription.java | 1 - .../jdi/ArrayReference/setValue/setvalue001/TestDescription.java | 1 - .../jdi/ArrayReference/setValue/setvalue002/TestDescription.java | 1 - .../jdi/ArrayReference/setValue/setvalue003/TestDescription.java | 1 - .../setValues_ilii/setvaluesilii001/TestDescription.java | 1 - .../setValues_ilii/setvaluesilii002/TestDescription.java | 1 - .../setValues_ilii/setvaluesilii003/TestDescription.java | 1 - .../setValues_ilii/setvaluesilii004/TestDescription.java | 1 - .../setValues_ilii/setvaluesilii005/TestDescription.java | 1 - .../setValues_l/setvaluesl001/TestDescription.java | 1 - .../setValues_l/setvaluesl002/TestDescription.java | 1 - .../setValues_l/setvaluesl003/TestDescription.java | 1 - .../componentsignature001/TestDescription.java | 1 - .../componentsignature002/TestDescription.java | 1 - .../componentType/componenttype001/TestDescription.java | 1 - .../componentTypeName/componenttypename001/TestDescription.java | 1 - .../componentTypeName/componenttypename002/TestDescription.java | 1 - .../ArrayType/newInstance/newinstance001/TestDescription.java | 1 - .../ArrayType/newInstance/newinstance002/TestDescription.java | 1 - .../ArrayType/newInstance/newinstance003/TestDescription.java | 1 - .../ArrayType/newInstance/newinstance004/TestDescription.java | 1 - .../jdi/AttachingConnector/attach/attach001/TestDescription.java | 1 - .../jdi/AttachingConnector/attach/attach002/TestDescription.java | 1 - .../jdi/AttachingConnector/attach/attach003/TestDescription.java | 1 - .../jdi/AttachingConnector/attach/attach004/TestDescription.java | 1 - .../jdi/AttachingConnector/attach/attach005/TestDescription.java | 1 - .../attachnosuspend/attachnosuspend001/TestDescription.java | 1 - .../attachnosuspend/attachnosuspend002/TestDescription.java | 1 - .../attachnosuspend/attachnosuspend003/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java | 1 - .../nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java | 1 - .../booleanValue/booleanvalue001/TestDescription.java | 1 - .../booleanValue/booleanvalue002/TestDescription.java | 1 - .../jdi/BooleanArgument/isValid/isvalid001/TestDescription.java | 1 - .../jdi/BooleanArgument/isValid/isvalid002/TestDescription.java | 1 - .../BooleanArgument/setValue/setvalue001/TestDescription.java | 1 - .../BooleanArgument/setValue/setvalue002/TestDescription.java | 1 - .../stringValueOf/stringvalueof001/TestDescription.java | 1 - .../stringValueOf/stringvalueof002/TestDescription.java | 1 - .../jdi/BooleanType/_itself_/booleantype001/TestDescription.java | 1 - .../nsk/jdi/BooleanValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/BooleanValue/equals/equals002/TestDescription.java | 1 - .../jdi/BooleanValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/BooleanValue/value/value001/TestDescription.java | 1 - .../BreakpointEvent/_itself_/breakpoint001/TestDescription.java | 1 - .../BreakpointEvent/_itself_/breakpoint002/TestDescription.java | 1 - .../BreakpointRequest/_bounds_/filters001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter003/TestDescription.java | 1 - .../addInstanceFilter/instancefilter004/TestDescription.java | 1 - .../addThreadFilter/threadfilter001/TestDescription.java | 1 - .../addThreadFilter/threadfilter002/TestDescription.java | 1 - .../addThreadFilter/threadfilter003/TestDescription.java | 1 - .../addThreadFilter/threadfilter004/TestDescription.java | 1 - .../BreakpointRequest/location/location001/TestDescription.java | 1 - .../nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java | 1 - .../jdi/ByteValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/ByteValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/ByteValue/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/ByteValue/value/value001/TestDescription.java | 1 - .../nsk/jdi/CharType/_itself_/chartype001/TestDescription.java | 1 - .../jdi/CharValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/CharValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/CharValue/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/CharValue/value/value001/TestDescription.java | 1 - .../definedClasses/definedclasses001/TestDescription.java | 1 - .../definedClasses/definedclasses002/TestDescription.java | 1 - .../definedClasses/definedclasses003/TestDescription.java | 1 - .../definedClasses/definedclasses004/TestDescription.java | 1 - .../definedClasses/definedclasses005/TestDescription.java | 1 - .../visibleClasses/visibleclasses001/TestDescription.java | 1 - .../visibleClasses/visibleclasses002/TestDescription.java | 1 - .../reflectedType/reflectype001/TestDescription.java | 1 - .../reflectedType/reflectype002/TestDescription.java | 1 - .../toString/tostring001/TestDescription.java | 1 - .../referenceType/refType001/TestDescription.java | 1 - .../jdi/ClassPrepareEvent/thread/thread001/TestDescription.java | 1 - .../ClassPrepareRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/filter001/TestDescription.java | 1 - .../addClassExclusionFilter/filter002/TestDescription.java | 1 - .../addClassExclusionFilter/filter003/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt001/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt003/TestDescription.java | 1 - .../addClassFilter_s/filter_s001/TestDescription.java | 1 - .../addClassFilter_s/filter_s002/TestDescription.java | 1 - .../addSourceNameFilter001/addSourceNameFilter001.java | 1 - .../addSourceNameFilter002/addSourceNameFilter002.java | 1 - .../allInterfaces/allinterfaces001/TestDescription.java | 1 - .../allInterfaces/allinterfaces002/TestDescription.java | 1 - .../concreteMethodByName/method001/TestDescription.java | 1 - .../concreteMethodByName/method002/TestDescription.java | 1 - .../jdi/ClassType/interfaces/interfaces001/TestDescription.java | 1 - .../jdi/ClassType/interfaces/interfaces002/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod001/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod002/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod003/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod004/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod005/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod006/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod007/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod008/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod009/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod010/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod011/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod012/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod013/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod014/TestDescription.java | 1 - .../ClassType/invokeMethod/invokemethod015/TestDescription.java | 1 - .../nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java | 1 - .../ClassType/newInstance/newinstance001/TestDescription.java | 1 - .../ClassType/newInstance/newinstance002/TestDescription.java | 1 - .../ClassType/newInstance/newinstance003/TestDescription.java | 1 - .../ClassType/newInstance/newinstance004/TestDescription.java | 1 - .../ClassType/newInstance/newinstance005/TestDescription.java | 1 - .../ClassType/newInstance/newinstance006/TestDescription.java | 1 - .../ClassType/newInstance/newinstance007/TestDescription.java | 1 - .../ClassType/newInstance/newinstance008/TestDescription.java | 1 - .../ClassType/newInstance/newinstance009/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java | 1 - .../nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java | 1 - .../jdi/ClassType/subclasses/subclasses001/TestDescription.java | 1 - .../jdi/ClassType/subclasses/subclasses002/TestDescription.java | 1 - .../jdi/ClassType/superclass/superclass001/TestDescription.java | 1 - .../jdi/ClassType/superclass/superclass002/TestDescription.java | 1 - .../ClassUnloadEvent/className/classname001/TestDescription.java | 1 - .../classSignature/signature001/TestDescription.java | 1 - .../ClassUnloadRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/exclfilter001/TestDescription.java | 1 - .../addClassExclusionFilter/exclfilter002/TestDescription.java | 1 - .../addClassFilter/filter001/TestDescription.java | 1 - .../addClassFilter/filter002/TestDescription.java | 1 - .../nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java | 1 - .../defaultArguments/defaultArguments001/TestDescription.java | 1 - .../defaultArguments/defaultArguments002/TestDescription.java | 1 - .../defaultArguments/defaultArguments003/TestDescription.java | 1 - .../Connector/description/description001/TestDescription.java | 1 - .../nsk/jdi/Connector/name/name001/TestDescription.java | 1 - .../nsk/jdi/Connector/toString/tostring001/TestDescription.java | 1 - .../jdi/Connector/transport/transport001/TestDescription.java | 1 - .../nsk/jdi/ConstantField/values001/TestDescription.java | 1 - .../jdi/DoubleType/_itself_/doubletype001/TestDescription.java | 1 - .../jdi/DoubleValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/DoubleValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/DoubleValue/equals/equals002/TestDescription.java | 1 - .../jdi/DoubleValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/DoubleValue/value/value001/TestDescription.java | 1 - .../nsk/jdi/Event/_itself_/event001/TestDescription.java | 1 - .../nsk/jdi/Event/_itself_/event002/TestDescription.java | 1 - .../nsk/jdi/Event/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/Event/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/Event/request/request001/TestDescription.java | 1 - .../EventIterator/nextEvent/nextevent001/TestDescription.java | 1 - .../nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove/remove001/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove/remove002/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove/remove003/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove/remove004/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java | 1 - .../nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java | 1 - .../EventRequest/_bounds_/eventrequest001/TestDescription.java | 1 - .../addCountFilter/addcountfilter001/TestDescription.java | 1 - .../nsk/jdi/EventRequest/disable/disable001/TestDescription.java | 1 - .../nsk/jdi/EventRequest/disable/disable002/TestDescription.java | 1 - .../nsk/jdi/EventRequest/disable/disable003/TestDescription.java | 1 - .../nsk/jdi/EventRequest/enable/enable001/TestDescription.java | 1 - .../nsk/jdi/EventRequest/enable/enable002/TestDescription.java | 1 - .../EventRequest/getProperty/getproperty001/TestDescription.java | 1 - .../jdi/EventRequest/hashCode/hashcode001/TestDescription.java | 1 - .../jdi/EventRequest/isEnabled/isenabled001/TestDescription.java | 1 - .../EventRequest/putProperty/putproperty001/TestDescription.java | 1 - .../EventRequest/setEnabled/setenabled001/TestDescription.java | 1 - .../EventRequest/setEnabled/setenabled002/TestDescription.java | 1 - .../EventRequest/setEnabled/setenabled003/TestDescription.java | 1 - .../setSuspendPolicy/setsuspendpolicy001/TestDescription.java | 1 - .../suspendPolicy/suspendpolicy001/TestDescription.java | 1 - .../_bounds_/requests001/TestDescription.java | 1 - .../accessWatchpointRequests/accwtchpreq001/TestDescription.java | 1 - .../accessWatchpointRequests/accwtchpreq002/TestDescription.java | 1 - .../breakpointRequests/breakpreq001/TestDescription.java | 1 - .../breakpointRequests/breakpreq002/TestDescription.java | 1 - .../classPrepareRequests/clsprepreq001/TestDescription.java | 1 - .../classPrepareRequests/clsprepreq002/TestDescription.java | 1 - .../classUnloadRequests/clsunlreq001/TestDescription.java | 1 - .../classUnloadRequests/clsunlreq002/TestDescription.java | 1 - .../craccwtchpreq002/TestDescription.java | 1 - .../craccwtchpreq003/TestDescription.java | 1 - .../createBreakpointRequest/crbreakpreq002/TestDescription.java | 1 - .../createBreakpointRequest/crbreakpreq003/TestDescription.java | 1 - .../createClassPrepareRequest/cpreg001/TestDescription.java | 1 - .../createClassUnloadRequest/cureg001/TestDescription.java | 1 - .../createExceptionRequest/crexreq009/TestDescription.java | 1 - .../createExceptionRequest/crexreq010/TestDescription.java | 1 - .../createMethodEntryRequest/menreg001/TestDescription.java | 1 - .../createMethodExitRequest/mexreg001/TestDescription.java | 1 - .../crmodwtchpreq002/TestDescription.java | 1 - .../crmodwtchpreq003/TestDescription.java | 1 - .../createStepRequest/crstepreq001/TestDescription.java | 1 - .../createStepRequest/crstepreq002/TestDescription.java | 1 - .../createStepRequest/crstepreq003/TestDescription.java | 1 - .../createStepRequest/crstepreq004/TestDescription.java | 1 - .../createStepRequest/crstepreq005/TestDescription.java | 1 - .../createStepRequest/crstepreq006/TestDescription.java | 1 - .../createStepRequest/crstepreq007/TestDescription.java | 1 - .../createStepRequest/crstepreq008/TestDescription.java | 1 - .../createStepRequest/crstepreq009/TestDescription.java | 1 - .../createStepRequest/crstepreq010/TestDescription.java | 1 - .../createThreadDeathRequest/tdreg001/TestDescription.java | 1 - .../createThreadStartRequest/tsreg001/TestDescription.java | 1 - .../createVMDeathRequest/vmdreg001/TestDescription.java | 1 - .../deleteAllBreakpoints/delallbreakp002/TestDescription.java | 1 - .../deleteEventRequest/delevtreq002/TestDescription.java | 1 - .../deleteEventRequest/delevtreq003/TestDescription.java | 1 - .../deleteEventRequests/delevtreqs002/TestDescription.java | 1 - .../exceptionRequests/excreq001/TestDescription.java | 1 - .../exceptionRequests/excreq002/TestDescription.java | 1 - .../hashCode/hashcode001/TestDescription.java | 1 - .../methodEntryRequests/methentreq001/TestDescription.java | 1 - .../methodEntryRequests/methentreq002/TestDescription.java | 1 - .../methodExitRequests/methexitreq001/TestDescription.java | 1 - .../methodExitRequests/methexitreq002/TestDescription.java | 1 - .../modwtchpreq001/TestDescription.java | 1 - .../modwtchpreq002/TestDescription.java | 1 - .../stepRequests/stepreq001/TestDescription.java | 1 - .../stepRequests/stepreq002/TestDescription.java | 1 - .../threadDeathRequests/thrdeathreq001/TestDescription.java | 1 - .../threadDeathRequests/thrdeathreq002/TestDescription.java | 1 - .../threadStartRequests/thrstartreq001/TestDescription.java | 1 - .../threadStartRequests/thrstartreq002/TestDescription.java | 1 - .../vmDeathRequests/vmdeathreq001/TestDescription.java | 1 - .../EventSet/eventIterator/eventiterator001/TestDescription.java | 1 - .../EventSet/eventIterator/eventiterator002/TestDescription.java | 1 - .../EventSet/eventIterator/eventiterator003/TestDescription.java | 1 - .../EventSet/eventIterator/eventiterator004/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume001/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume002/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume003/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume004/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume005/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume006/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume007/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume008/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume009/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume010/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume011/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume012/TestDescription.java | 1 - .../nsk/jdi/EventSet/resume/resume013/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy001/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy002/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy003/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy004/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy005/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy006/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy007/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy008/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy009/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy010/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy011/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy012/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy013/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy014/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy015/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy016/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy017/TestDescription.java | 1 - .../EventSet/suspendPolicy/suspendpolicy018/TestDescription.java | 1 - .../nsk/jdi/EventSet/toString/tostring001/TestDescription.java | 1 - .../virtualMachine/virtualmachine001/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java | 1 - .../jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java | 1 - .../catchLocation/location001/TestDescription.java | 1 - .../catchLocation/location002/TestDescription.java | 1 - .../ExceptionEvent/exception/exception001/TestDescription.java | 1 - .../ExceptionRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/filter001/TestDescription.java | 1 - .../addClassExclusionFilter/filter002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt001/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt003/TestDescription.java | 1 - .../addClassFilter_s/filter_s001/TestDescription.java | 1 - .../addClassFilter_s/filter_s002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter003/TestDescription.java | 1 - .../addInstanceFilter/instancefilter004/TestDescription.java | 1 - .../addThreadFilter/threadfilter001/TestDescription.java | 1 - .../addThreadFilter/threadfilter002/TestDescription.java | 1 - .../addThreadFilter/threadfilter003/TestDescription.java | 1 - .../addThreadFilter/threadfilter004/TestDescription.java | 1 - .../ExceptionRequest/exception/exception001/TestDescription.java | 1 - .../notifyCaught/notifycaught001/TestDescription.java | 1 - .../notifyUncaught/notifyuncaught001/TestDescription.java | 1 - .../nsk/jdi/Field/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/Field/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/Field/equals/equals003/TestDescription.java | 1 - .../nsk/jdi/Field/equals/equals005/TestDescription.java | 1 - .../nsk/jdi/Field/hashCode/hashcode001/TestDescription.java | 1 - .../Field/isEnumConstant/isenumconstant001/TestDescription.java | 1 - .../nsk/jdi/Field/isTransient/istrans001/TestDescription.java | 1 - .../nsk/jdi/Field/isVolatile/isvol001/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java | 1 - .../nsk/jdi/Field/typeName/typename001/TestDescription.java | 1 - .../nsk/jdi/Field/typeName/typename002/TestDescription.java | 1 - .../nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java | 1 - .../jdi/FloatValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/FloatValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/FloatValue/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/FloatValue/value/value001/TestDescription.java | 1 - .../jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java | 1 - .../IntegerArgument/intValue/intvalue001/TestDescription.java | 1 - .../IntegerArgument/intValue/intvalue002/TestDescription.java | 1 - .../jdi/IntegerArgument/isValid/isvalid001/TestDescription.java | 1 - .../jdi/IntegerArgument/isValid/isvalid002/TestDescription.java | 1 - .../jdi/IntegerArgument/isValid/isvalid003/TestDescription.java | 1 - .../nsk/jdi/IntegerArgument/max/max001/TestDescription.java | 1 - .../nsk/jdi/IntegerArgument/min/min001/TestDescription.java | 1 - .../IntegerArgument/setValue/setvalue001/TestDescription.java | 1 - .../stringValueOf/stringvalueof001/TestDescription.java | 1 - .../jdi/IntegerType/_itself_/integertype001/TestDescription.java | 1 - .../jdi/IntegerValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/IntegerValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/IntegerValue/equals/equals002/TestDescription.java | 1 - .../jdi/IntegerValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/IntegerValue/value/value001/TestDescription.java | 1 - .../implementors/implementors001/TestDescription.java | 1 - .../subinterfaces/subinterfaces001/TestDescription.java | 1 - .../superinterfaces/superinterfaces001/TestDescription.java | 1 - .../jdi/LaunchingConnector/launch/launch001/TestDescription.java | 1 - .../jdi/LaunchingConnector/launch/launch002/TestDescription.java | 1 - .../jdi/LaunchingConnector/launch/launch003/TestDescription.java | 1 - .../jdi/LaunchingConnector/launch/launch004/TestDescription.java | 1 - .../launchnosuspend/launchnosuspend001/TestDescription.java | 1 - .../jdi/ListeningConnector/accept/accept001/TestDescription.java | 1 - .../jdi/ListeningConnector/accept/accept002/TestDescription.java | 1 - .../listennosuspend/listennosuspend001/TestDescription.java | 1 - .../startListening/startlis001/TestDescription.java | 1 - .../startListening/startlis002/TestDescription.java | 1 - .../stopListening/stoplis001/TestDescription.java | 1 - .../stopListening/stoplis002/TestDescription.java | 1 - .../supportsmultipleconnections001/TestDescription.java | 1 - .../nsk/jdi/LocalVariable/equals/equals001/TestDescription.java | 1 - .../genericSignature/gensignature001/TestDescription.java | 1 - .../jdi/LocalVariable/hashCode/hashcode001/TestDescription.java | 1 - .../LocalVariable/isArgument/isargument001/TestDescription.java | 1 - .../LocalVariable/isVisible/isvisible001/TestDescription.java | 1 - .../nsk/jdi/LocalVariable/name/name001/TestDescription.java | 1 - .../LocalVariable/signature/signature001/TestDescription.java | 1 - .../jdi/LocalVariable/toString/tostring001/TestDescription.java | 1 - .../nsk/jdi/LocalVariable/type/type001/TestDescription.java | 1 - .../nsk/jdi/LocalVariable/type/type002/TestDescription.java | 1 - .../jdi/LocalVariable/typeName/typename001/TestDescription.java | 1 - .../jdi/LocalVariable/typeName/typename002/TestDescription.java | 1 - .../nsk/jdi/Locatable/location/location001/TestDescription.java | 1 - .../nsk/jdi/Locatable/location/location002/TestDescription.java | 1 - .../nsk/jdi/Locatable/location/location003/TestDescription.java | 1 - .../nsk/jdi/Locatable/location/location004/TestDescription.java | 1 - .../nsk/jdi/Locatable/location/location005/TestDescription.java | 1 - .../nsk/jdi/Locatable/location/location006/TestDescription.java | 1 - .../nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java | 1 - .../nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java | 1 - .../Location/declaringType/declaringtype001/TestDescription.java | 1 - .../nsk/jdi/Location/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/Location/hashCode/hashcode001/TestDescription.java | 1 - .../jdi/Location/lineNumber/linenumber001/TestDescription.java | 1 - .../Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java | 1 - .../Location/lineNumber_s/linenumber_s001/TestDescription.java | 1 - .../nsk/jdi/Location/method/method001/TestDescription.java | 1 - .../jdi/Location/sourceName/sourcename001/TestDescription.java | 1 - .../Location/sourceName_s/sourceName_s002/sourceName_s002.java | 1 - .../Location/sourceName_s/sourcename_s001/TestDescription.java | 1 - .../jdi/Location/sourcePath/sourcepath001/TestDescription.java | 1 - .../Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java | 1 - .../Location/sourcePath_s/sourcepath_s001/TestDescription.java | 1 - .../nsk/jdi/LongType/_itself_/longtype001/TestDescription.java | 1 - .../jdi/LongValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/LongValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/LongValue/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/LongValue/value/value001/TestDescription.java | 1 - .../nsk/jdi/Method/_bounds_/bounds001/TestDescription.java | 1 - .../allLineLocations/alllinelocations001/TestDescription.java | 1 - .../allLineLocations/alllinelocations002/TestDescription.java | 1 - .../allLineLocations_ss002/allLineLocations_ss002.java | 1 - .../allLineLocations_ss003/allLineLocations_ss003.java | 1 - .../alllinelocations_ss001/TestDescription.java | 1 - .../argumentTypeNames/argumenttypenames001/TestDescription.java | 1 - .../argumentTypeNames/argumenttypenames002/TestDescription.java | 1 - .../argumentTypeNames/argumenttypenames003/TestDescription.java | 1 - .../Method/argumentTypes/argumenttypes001/TestDescription.java | 1 - .../Method/argumentTypes/argumenttypes002/TestDescription.java | 1 - .../nsk/jdi/Method/arguments/arguments001/TestDescription.java | 1 - .../nsk/jdi/Method/arguments/arguments002/TestDescription.java | 1 - .../nsk/jdi/Method/arguments/arguments003/TestDescription.java | 1 - .../nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java | 1 - .../nsk/jdi/Method/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/Method/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java | 1 - .../nsk/jdi/Method/isBridge/isbridge001/TestDescription.java | 1 - .../Method/isConstructor/isconstructor001/TestDescription.java | 1 - .../nsk/jdi/Method/isNative/isnative001/TestDescription.java | 1 - .../nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java | 1 - .../nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java | 1 - .../nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java | 1 - .../isStaticInitializer/isstinitializer001/TestDescription.java | 1 - .../Method/isSynchronized/issynchronized001/TestDescription.java | 1 - .../nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java | 1 - .../locationofcodeindex001/TestDescription.java | 1 - .../locationsOfLine/locationsofline001/TestDescription.java | 1 - .../locationsOfLine_ssi002/locationsOfLine_ssi002.java | 1 - .../locationsOfLine_ssi003/locationsOfLine_ssi003.java | 1 - .../locationsofline_ssi001/TestDescription.java | 1 - .../nsk/jdi/Method/returnType/returntype001/TestDescription.java | 1 - .../nsk/jdi/Method/returnType/returntype002/TestDescription.java | 1 - .../nsk/jdi/Method/returnType/returntype003/TestDescription.java | 1 - .../returnTypeNames/returntypenames001/TestDescription.java | 1 - .../returnTypeNames/returntypenames002/TestDescription.java | 1 - .../returnTypeNames/returntypenames003/TestDescription.java | 1 - .../nsk/jdi/Method/variables/variables001/TestDescription.java | 1 - .../nsk/jdi/Method/variables/variables002/TestDescription.java | 1 - .../variablesByName/variablesbyname001/TestDescription.java | 1 - .../variablesByName/variablesbyname002/TestDescription.java | 1 - .../jdi/MethodEntryEvent/method/method001/TestDescription.java | 1 - .../jdi/MethodEntryEvent/method/method002/TestDescription.java | 1 - .../MethodEntryRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/filter001/TestDescription.java | 1 - .../addClassExclusionFilter/filter002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt001/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt003/TestDescription.java | 1 - .../addClassFilter_s/filter_s001/TestDescription.java | 1 - .../addClassFilter_s/filter_s002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter003/TestDescription.java | 1 - .../addInstanceFilter/instancefilter004/TestDescription.java | 1 - .../addThreadFilter/threadfilter001/TestDescription.java | 1 - .../addThreadFilter/threadfilter002/TestDescription.java | 1 - .../addThreadFilter/threadfilter003/TestDescription.java | 1 - .../addThreadFilter/threadfilter004/TestDescription.java | 1 - .../MethodExitEvent/_itself_/methodexit001/TestDescription.java | 1 - .../jdi/MethodExitEvent/method/method001/TestDescription.java | 1 - .../jdi/MethodExitEvent/method/method002/TestDescription.java | 1 - .../returnValue/returnValue001/returnValue001.java | 1 - .../returnValue/returnValue002/returnValue002.java | 1 - .../returnValue/returnValue003/returnValue003.java | 1 - .../returnValue/returnValue004/returnValue004.java | 1 - .../MethodExitRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/filter001/TestDescription.java | 1 - .../addClassExclusionFilter/filter002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt001/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt003/TestDescription.java | 1 - .../addClassFilter_s/filter_s001/TestDescription.java | 1 - .../addClassFilter_s/filter_s002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter003/TestDescription.java | 1 - .../addInstanceFilter/instancefilter004/TestDescription.java | 1 - .../addThreadFilter/threadfilter001/TestDescription.java | 1 - .../addThreadFilter/threadfilter002/TestDescription.java | 1 - .../addThreadFilter/threadfilter003/TestDescription.java | 1 - .../addThreadFilter/threadfilter004/TestDescription.java | 1 - .../nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/Mirror/toString/tostring001/TestDescription.java | 1 - .../Mirror/virtualMachine/virtualmachine001/TestDescription.java | 1 - .../_itself_/mwevent001/TestDescription.java | 1 - .../valueToBe/valuetobe001/TestDescription.java | 1 - .../valueToBe/valuetobe002/TestDescription.java | 1 - .../MonitorContendedEnterRequest001/TestDescription.java | 1 - .../MonitorContendedEnterRequest002/TestDescription.java | 1 - .../addClassExclusionFilter/TestDescription.java | 1 - .../addClassFilter_ClassName/TestDescription.java | 1 - .../addClassFilter_ReferenceType/TestDescription.java | 1 - .../addInstanceFilter/TestDescription.java | 1 - .../addThreadFilter/TestDescription.java | 1 - .../MonitorContendedEnteredRequest001/TestDescription.java | 1 - .../MonitorContendedEnteredRequest002/TestDescription.java | 1 - .../addClassExclusionFilter/TestDescription.java | 1 - .../addClassFilter_ClassName/TestDescription.java | 1 - .../addClassFilter_ReferenceType/TestDescription.java | 1 - .../addInstanceFilter/TestDescription.java | 1 - .../addThreadFilter/TestDescription.java | 1 - .../MonitorWaitRequest001/TestDescription.java | 1 - .../MonitorWaitRequest002/TestDescription.java | 1 - .../addClassExclusionFilter/TestDescription.java | 1 - .../addClassFilter_ClassName/TestDescription.java | 1 - .../addClassFilter_ReferenceType/TestDescription.java | 1 - .../MonitorWaitRequest/addInstanceFilter/TestDescription.java | 1 - .../jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java | 1 - .../MonitorWaitedRequest001/TestDescription.java | 1 - .../MonitorWaitedRequest002/TestDescription.java | 1 - .../addClassExclusionFilter/TestDescription.java | 1 - .../addClassFilter_ClassName/TestDescription.java | 1 - .../addClassFilter_ReferenceType/TestDescription.java | 1 - .../MonitorWaitedRequest/addInstanceFilter/TestDescription.java | 1 - .../MonitorWaitedRequest/addThreadFilter/TestDescription.java | 1 - .../jdi/ObjectReference/_bounds_/bounds001/TestDescription.java | 1 - .../jdi/ObjectReference/_bounds_/bounds002/TestDescription.java | 1 - .../jdi/ObjectReference/_bounds_/bounds003/TestDescription.java | 1 - .../disableCollection/disablecollection001/TestDescription.java | 1 - .../disableCollection/disablecollection002/TestDescription.java | 1 - .../entryCount/entrycount001/TestDescription.java | 1 - .../entryCount/entrycount002/TestDescription.java | 1 - .../jdi/ObjectReference/equals/equals001/TestDescription.java | 1 - .../ObjectReference/getValue/getvalue001/TestDescription.java | 1 - .../ObjectReference/getValue/getvalue002/TestDescription.java | 1 - .../ObjectReference/getValue/getvalue003/TestDescription.java | 1 - .../ObjectReference/getValue/getvalue004/TestDescription.java | 1 - .../ObjectReference/getValues/getvalues001/TestDescription.java | 1 - .../ObjectReference/getValues/getvalues002/TestDescription.java | 1 - .../ObjectReference/getValues/getvalues003/TestDescription.java | 1 - .../ObjectReference/hashCode/hashcode001/TestDescription.java | 1 - .../invokeMethod/invokemethod001/TestDescription.java | 1 - .../invokeMethod/invokemethod002/TestDescription.java | 1 - .../invokeMethod/invokemethod003/TestDescription.java | 1 - .../invokeMethod/invokemethod004/TestDescription.java | 1 - .../invokeMethod/invokemethod005/TestDescription.java | 1 - .../invokeMethod/invokemethod006/TestDescription.java | 1 - .../invokeMethod/invokemethod007/TestDescription.java | 1 - .../invokeMethod/invokemethod008/TestDescription.java | 1 - .../invokeMethod/invokemethod009/TestDescription.java | 1 - .../invokeMethod/invokemethod010/TestDescription.java | 1 - .../invokeMethod/invokemethod011/TestDescription.java | 1 - .../invokeMethod/invokemethod012/TestDescription.java | 1 - .../invokeMethod/invokemethod013/TestDescription.java | 1 - .../invokeMethod/invokemethod014/TestDescription.java | 1 - .../isCollected/iscollected001/TestDescription.java | 1 - .../owningThread/owningthread001/TestDescription.java | 1 - .../owningThread/owningthread002/TestDescription.java | 1 - .../referenceType/referencetype001/TestDescription.java | 1 - .../referenceType/referencetype002/TestDescription.java | 1 - .../referenceType/referencetype003/TestDescription.java | 1 - .../referenceType/referencetype004/TestDescription.java | 1 - .../referenceType/referencetype005/TestDescription.java | 1 - .../referenceType/referencetype006/TestDescription.java | 1 - .../referenceType/referencetype007/TestDescription.java | 1 - .../referringObjects001/referringObjects001.java | 1 - .../referringObjects002/referringObjects002.java | 1 - .../referringObjects003/referringObjects003.java | 1 - .../referringObjects004/referringObjects004.java | 1 - .../ObjectReference/setValue/setvalue001/TestDescription.java | 1 - .../ObjectReference/setValue/setvalue002/TestDescription.java | 1 - .../ObjectReference/setValue/setvalue003/TestDescription.java | 1 - .../ObjectReference/setValue/setvalue004/TestDescription.java | 1 - .../ObjectReference/setValue/setvalue005/TestDescription.java | 1 - .../ObjectReference/uniqueID/uniqueid001/TestDescription.java | 1 - .../waitingThreads/waitingthreads001/TestDescription.java | 1 - .../waitingThreads/waitingthreads002/TestDescription.java | 1 - .../waitingThreads/waitingthreads003/TestDescription.java | 1 - .../waitingThreads/waitingthreads004/TestDescription.java | 1 - .../baseDirectory/directory001/TestDescription.java | 1 - .../bootClassPath/bootpath001/TestDescription.java | 1 - .../classPath/classpath001/TestDescription.java | 1 - .../plugAttachConnect001/plugAttachConnect001.java | 1 - .../plugAttachConnect002/plugAttachConnect002.java | 1 - .../plugAttachConnect003/plugAttachConnect003.java | 1 - .../plugLaunchConnect001/plugLaunchConnect001.java | 1 - .../plugLaunchConnect002/plugLaunchConnect002.java | 1 - .../plugLaunchConnect003/plugLaunchConnect003.java | 1 - .../plugListenConnect001/plugListenConnect001.java | 1 - .../plugListenConnect002/plugListenConnect002.java | 1 - .../plugListenConnect003/plugListenConnect003.java | 1 - .../MultiConnectors/plugMultiConnect001/plugMultiConnect001.java | 1 - .../MultiConnectors/plugMultiConnect002/plugMultiConnect002.java | 1 - .../MultiConnectors/plugMultiConnect003/plugMultiConnect003.java | 1 - .../MultiConnectors/plugMultiConnect004/plugMultiConnect004.java | 1 - .../MultiConnectors/plugMultiConnect005/plugMultiConnect005.java | 1 - .../MultiConnectors/plugMultiConnect006/plugMultiConnect006.java | 1 - .../transportService001/transportService001.java | 1 - .../transportService002/transportService002.java | 1 - .../transportService003/transportService003.java | 1 - .../PrimitiveType/_itself_/primitivetype001/TestDescription.java | 1 - .../booleanValue/booleanvalue001/TestDescription.java | 1 - .../PrimitiveValue/byteValue/bytevalue001/TestDescription.java | 1 - .../PrimitiveValue/charValue/charvalue001/TestDescription.java | 1 - .../doubleValue/doublevalue001/TestDescription.java | 1 - .../doubleValue/doublevalue002/TestDescription.java | 1 - .../PrimitiveValue/floatValue/floatvalue001/TestDescription.java | 1 - .../jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java | 1 - .../PrimitiveValue/longValue/longvalue001/TestDescription.java | 1 - .../PrimitiveValue/shortValue/shortvalue001/TestDescription.java | 1 - .../jdi/ReferenceType/_bounds_/bounds001/TestDescription.java | 1 - .../jdi/ReferenceType/_bounds_/bounds002/TestDescription.java | 1 - .../ReferenceType/allFields/allfields001/TestDescription.java | 1 - .../ReferenceType/allFields/allfields002/TestDescription.java | 1 - .../ReferenceType/allFields/allfields003/TestDescription.java | 1 - .../ReferenceType/allFields/allfields004/TestDescription.java | 1 - .../ReferenceType/allFields/allfields005/TestDescription.java | 1 - .../ReferenceType/allFields/allfields006/TestDescription.java | 1 - .../allLineLocations/alllinelocations001/TestDescription.java | 1 - .../allLineLocations/alllinelocations002/TestDescription.java | 1 - .../allLineLocations_ss003/allLineLocations_ss003.java | 1 - .../allLineLocations_ss004/allLineLocations_ss004.java | 1 - .../alllinelocations_ss001/TestDescription.java | 1 - .../alllinelocations_ss002/TestDescription.java | 1 - .../ReferenceType/allMethods/allmethods001/TestDescription.java | 1 - .../ReferenceType/allMethods/allmethods002/TestDescription.java | 1 - .../ReferenceType/allMethods/allmethods003/TestDescription.java | 1 - .../ReferenceType/allMethods/allmethods004/TestDescription.java | 1 - .../ReferenceType/allMethods/allmethods005/TestDescription.java | 1 - .../ReferenceType/allMethods/allmethods006/TestDescription.java | 1 - .../availableStrata/availableStrata002/availableStrata002.java | 1 - .../availableStrata/availablestrata001/TestDescription.java | 1 - .../classLoader/classloader001/TestDescription.java | 1 - .../ReferenceType/classObject/classobj001/TestDescription.java | 1 - .../ReferenceType/classObject/classobj002/TestDescription.java | 1 - .../ReferenceType/classObject/classobj003/TestDescription.java | 1 - .../defaultStratum/defaultStratum002/defaultStratum002.java | 1 - .../defaultStratum/defaultStratum003/defaultStratum003.java | 1 - .../defaultStratum/defaultStratum004/defaultStratum004.java | 1 - .../defaultStratum/defaultstratum001/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/equals/equals002/TestDescription.java | 1 - .../failedToInitialize001/TestDescription.java | 1 - .../failedToInitialize/failedtoinit002/TestDescription.java | 1 - .../fieldByName/fieldbyname001/TestDescription.java | 1 - .../fieldByName/fieldbyname002/TestDescription.java | 1 - .../fieldByName/fieldbyname003/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/fields/fields001/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/fields/fields002/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/fields/fields003/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/fields/fields004/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/fields/fields005/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/fields/fields006/TestDescription.java | 1 - .../genericSignature/genericSignature001/TestDescription.java | 1 - .../genericSignature/genericSignature002/TestDescription.java | 1 - .../jdi/ReferenceType/getValue/getvalue001/TestDescription.java | 1 - .../jdi/ReferenceType/getValue/getvalue002/TestDescription.java | 1 - .../jdi/ReferenceType/getValue/getvalue003/TestDescription.java | 1 - .../jdi/ReferenceType/getValue/getvalue004/TestDescription.java | 1 - .../jdi/ReferenceType/getValue/getvalue005/TestDescription.java | 1 - .../ReferenceType/getValues/getvalues001/TestDescription.java | 1 - .../ReferenceType/getValues/getvalues002/TestDescription.java | 1 - .../ReferenceType/getValues/getvalues003/TestDescription.java | 1 - .../jdi/ReferenceType/hashCode/hashcode001/TestDescription.java | 1 - .../jdi/ReferenceType/hashCode/hashcode002/TestDescription.java | 1 - .../jdi/ReferenceType/instances/instances001/instances001.java | 1 - .../jdi/ReferenceType/instances/instances002/instances002.java | 1 - .../jdi/ReferenceType/instances/instances003/instances003.java | 1 - .../ReferenceType/instances/instances004/TestDescription.java | 1 - .../jdi/ReferenceType/instances/instances005/instances005.java | 1 - .../ReferenceType/isAbstract/isAbstract001/TestDescription.java | 1 - .../ReferenceType/isAbstract/isabstract002/TestDescription.java | 1 - .../ReferenceType/isAbstract/isabstract003/TestDescription.java | 1 - .../jdi/ReferenceType/isFinal/isfinal001/TestDescription.java | 1 - .../jdi/ReferenceType/isFinal/isfinal002/TestDescription.java | 1 - .../ReferenceType/isInitialized/isinit001/TestDescription.java | 1 - .../ReferenceType/isInitialized/isinit002/TestDescription.java | 1 - .../ReferenceType/isInitialized/isinit003/TestDescription.java | 1 - .../ReferenceType/isPrepared/isprepared001/TestDescription.java | 1 - .../ReferenceType/isPrepared/isprepared002/TestDescription.java | 1 - .../jdi/ReferenceType/isStatic/isstatic001/TestDescription.java | 1 - .../jdi/ReferenceType/isStatic/isstatic002/TestDescription.java | 1 - .../ReferenceType/isVerified/isVerified001/TestDescription.java | 1 - .../ReferenceType/isVerified/isverified002/TestDescription.java | 1 - .../ReferenceType/isVerified/isverified003/TestDescription.java | 1 - .../locationsOfLine_i/locationsofline_i001/TestDescription.java | 1 - .../locationsOfLine_i/locationsofline_i002/TestDescription.java | 1 - .../locationsOfLine_ssi003/locationsOfLine_ssi003.java | 1 - .../locationsOfLine_ssi004/locationsOfLine_ssi004.java | 1 - .../locationsofline_ssi001/TestDescription.java | 1 - .../locationsofline_ssi002/TestDescription.java | 1 - .../jdi/ReferenceType/methods/methods001/TestDescription.java | 1 - .../jdi/ReferenceType/methods/methods002/TestDescription.java | 1 - .../jdi/ReferenceType/methods/methods003/TestDescription.java | 1 - .../jdi/ReferenceType/methods/methods004/TestDescription.java | 1 - .../jdi/ReferenceType/methods/methods005/TestDescription.java | 1 - .../jdi/ReferenceType/methods/methods006/TestDescription.java | 1 - .../methodsByName_s/methbyname_s001/TestDescription.java | 1 - .../methodsByName_s/methbyname_s002/TestDescription.java | 1 - .../methodsByName_s/methbyname_s003/TestDescription.java | 1 - .../methodsByName_s/methbyname_s004/TestDescription.java | 1 - .../methodsByName_ss/methbyname_ss001/TestDescription.java | 1 - .../methodsByName_ss/methbyname_ss002/TestDescription.java | 1 - .../methodsByName_ss/methbyname_ss003/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/name/name001/TestDescription.java | 1 - .../nsk/jdi/ReferenceType/name/name002/TestDescription.java | 1 - .../nestedTypes/nestedtypes001/TestDescription.java | 1 - .../nestedTypes/nestedtypes002/TestDescription.java | 1 - .../sourceDebugExtension/srcdebugx001/TestDescription.java | 1 - .../sourceDebugExtension/srcdebugx002/TestDescription.java | 1 - .../ReferenceType/sourceName/sourcename001/TestDescription.java | 1 - .../ReferenceType/sourceName/sourcename002/TestDescription.java | 1 - .../ReferenceType/sourceName/sourcename003/TestDescription.java | 1 - .../ReferenceType/sourceName/sourcename004/TestDescription.java | 1 - .../ReferenceType/sourceNames/sourceNames003/sourceNames003.java | 1 - .../sourceNames/sourcenames001/TestDescription.java | 1 - .../sourceNames/sourcenames002/TestDescription.java | 1 - .../ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java | 1 - .../sourcePaths/sourcepaths001/TestDescription.java | 1 - .../sourcePaths/sourcepaths002/TestDescription.java | 1 - .../visibleFields/visibfield001/TestDescription.java | 1 - .../visibleFields/visibfield002/TestDescription.java | 1 - .../visibleFields/visibfield003/TestDescription.java | 1 - .../visibleFields/visibfield004/TestDescription.java | 1 - .../visibleFields/visibfield005/TestDescription.java | 1 - .../visibleFields/visibfield006/TestDescription.java | 1 - .../visibleMethods/visibmethod001/TestDescription.java | 1 - .../visibleMethods/visibmethod002/TestDescription.java | 1 - .../visibleMethods/visibmethod003/TestDescription.java | 1 - .../visibleMethods/visibmethod004/TestDescription.java | 1 - .../visibleMethods/visibmethod005/TestDescription.java | 1 - .../visibleMethods/visibmethod006/TestDescription.java | 1 - .../visibleMethods/visibmethod007/TestDescription.java | 1 - .../jdi/Scenarios/invokeMethod/popframes001/TestDescription.java | 1 - .../invokeMethod/redefineclasses001/TestDescription.java | 1 - .../jdi/SelectedArgument/choices/choices001/TestDescription.java | 1 - .../jdi/SelectedArgument/isValid/isvalid001/TestDescription.java | 1 - .../jdi/SelectedArgument/isValid/isvalid002/TestDescription.java | 1 - .../nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java | 1 - .../jdi/ShortValue/compareTo/compareto001/TestDescription.java | 1 - .../nsk/jdi/ShortValue/equals/equals001/TestDescription.java | 1 - .../nsk/jdi/ShortValue/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/ShortValue/value/value001/TestDescription.java | 1 - .../nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java | 1 - .../nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java | 1 - .../getArgumentValues001/getArgumentValues001.java | 1 - .../getArgumentValues002/getArgumentValues002.java | 1 - .../getArgumentValues003/getArgumentValues003.java | 1 - .../nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java | 1 - .../nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java | 1 - .../nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java | 1 - .../jdi/StackFrame/getValues/getvalues001/TestDescription.java | 1 - .../jdi/StackFrame/getValues/getvalues002/TestDescription.java | 1 - .../jdi/StackFrame/getValues/getvalues003/TestDescription.java | 1 - .../nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java | 1 - .../nsk/jdi/StackFrame/location/location001/TestDescription.java | 1 - .../nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java | 1 - .../nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java | 1 - .../nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java | 1 - .../nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java | 1 - .../nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java | 1 - .../nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java | 1 - .../jdi/StackFrame/thisObject/thisobject001/TestDescription.java | 1 - .../jdi/StackFrame/thisObject/thisobject002/TestDescription.java | 1 - .../nsk/jdi/StackFrame/thread/thread001/TestDescription.java | 1 - .../nsk/jdi/StackFrame/toString/tostring001/TestDescription.java | 1 - .../visiblevarbyname001/TestDescription.java | 1 - .../visiblevarbyname002/TestDescription.java | 1 - .../visibleVariables/visiblevariables001/TestDescription.java | 1 - .../visibleVariables/visiblevariables002/TestDescription.java | 1 - .../nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java | 1 - .../nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java | 1 - .../nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java | 1 - .../nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java | 1 - .../nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/filter001/TestDescription.java | 1 - .../addClassExclusionFilter/filter002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt001/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt003/TestDescription.java | 1 - .../addClassFilter_s/filter_s001/TestDescription.java | 1 - .../addClassFilter_s/filter_s002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter003/TestDescription.java | 1 - .../addInstanceFilter/instancefilter004/TestDescription.java | 1 - .../nsk/jdi/StepRequest/depth/depth001/TestDescription.java | 1 - .../nsk/jdi/StepRequest/depth/depth002/TestDescription.java | 1 - .../nsk/jdi/StepRequest/depth/depth003/TestDescription.java | 1 - .../nsk/jdi/StepRequest/size/size001/TestDescription.java | 1 - .../nsk/jdi/StepRequest/size/size002/TestDescription.java | 1 - .../nsk/jdi/StepRequest/thread/thread001/TestDescription.java | 1 - .../jdi/StringArgument/isValid/isvalid001/TestDescription.java | 1 - .../jdi/StringArgument/isValid/isvalid002/TestDescription.java | 1 - .../jdi/StringArgument/isValid/isvalid003/TestDescription.java | 1 - .../nsk/jdi/StringReference/value/value001/TestDescription.java | 1 - .../jdi/ThreadDeathEvent/thread/thread001/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter001/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter002/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter003/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter004/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter005/TestDescription.java | 1 - .../jdi/ThreadGroupReference/name/name001/TestDescription.java | 1 - .../ThreadGroupReference/parent/parent001/TestDescription.java | 1 - .../ThreadGroupReference/resume/resume001/TestDescription.java | 1 - .../ThreadGroupReference/suspend/suspend001/TestDescription.java | 1 - .../threadGroups/threadgroups001/TestDescription.java | 1 - .../ThreadGroupReference/threads/threads001/TestDescription.java | 1 - .../toString/tostring001/TestDescription.java | 1 - .../jdi/ThreadReference/_bounds_/bounds001/TestDescription.java | 1 - .../currentContendedMonitor/currentcm001/TestDescription.java | 1 - .../forceEarlyReturn001/forceEarlyReturn001.java | 1 - .../forceEarlyReturn002/forceEarlyReturn002.java | 1 - .../forceEarlyReturn003/forceEarlyReturn003.java | 1 - .../forceEarlyReturn004/forceEarlyReturn004.java | 1 - .../forceEarlyReturn005/forceEarlyReturn005.java | 1 - .../forceEarlyReturn/forceEarlyReturn006/TestDescription.java | 1 - .../forceEarlyReturn/forceEarlyReturn007/TestDescription.java | 1 - .../forceEarlyReturn008/forceEarlyReturn008.java | 1 - .../forceEarlyReturn009/forceEarlyReturn009.java | 1 - .../forceEarlyReturn/forceEarlyReturn010/TestDescription.java | 1 - .../forceEarlyReturn/forceEarlyReturn011/TestDescription.java | 1 - .../forceEarlyReturn/forceEarlyReturn012/TestDescription.java | 1 - .../forceEarlyReturn013/forceEarlyReturn013.java | 1 - .../forceEarlyReturn014/forceEarlyReturn014.java | 1 - .../forceEarlyReturn015/forceEarlyReturn015.java | 1 - .../nsk/jdi/ThreadReference/frame/frame001/TestDescription.java | 1 - .../frameCount/framecount001/TestDescription.java | 1 - .../jdi/ThreadReference/frames/frames001/TestDescription.java | 1 - .../ThreadReference/frames_ii/frames_ii001/TestDescription.java | 1 - .../ThreadReference/frames_ii/frames_ii002/TestDescription.java | 1 - .../ThreadReference/interrupt/interrupt001/TestDescription.java | 1 - .../isAtBreakpoint/isatbreakpoint001/TestDescription.java | 1 - .../isSuspended/issuspended001/TestDescription.java | 1 - .../isSuspended/issuspended002/TestDescription.java | 1 - .../isSuspended/issuspended003/TestDescription.java | 1 - .../isSuspended/issuspended004/TestDescription.java | 1 - .../nsk/jdi/ThreadReference/name/name001/TestDescription.java | 1 - .../ownedMonitors/ownedmonitors001/TestDescription.java | 1 - .../ownedMonitors/ownedmonitors002/TestDescription.java | 1 - .../ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java | 1 - .../ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java | 1 - .../ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java | 1 - .../ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java | 1 - .../ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java | 1 - .../ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java | 1 - .../ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java | 1 - .../ownedMonitorsAndFrames008/TestDescription.java | 1 - .../ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java | 1 - .../ThreadReference/popFrames/popframes001/TestDescription.java | 1 - .../ThreadReference/popFrames/popframes002/TestDescription.java | 1 - .../ThreadReference/popFrames/popframes003/TestDescription.java | 1 - .../ThreadReference/popFrames/popframes004/TestDescription.java | 1 - .../ThreadReference/popFrames/popframes005/TestDescription.java | 1 - .../ThreadReference/popFrames/popframes006/TestDescription.java | 1 - .../ThreadReference/popFrames/popframes007/TestDescription.java | 1 - .../jdi/ThreadReference/resume/resume001/TestDescription.java | 1 - .../nsk/jdi/ThreadReference/status/status003/status003.java | 1 - .../nsk/jdi/ThreadReference/status/status004/status004.java | 1 - .../nsk/jdi/ThreadReference/status/status005/status005.java | 1 - .../nsk/jdi/ThreadReference/status/status006/status006.java | 1 - .../nsk/jdi/ThreadReference/status/status007/status007.java | 1 - .../nsk/jdi/ThreadReference/status/status008/status008.java | 1 - .../nsk/jdi/ThreadReference/stop/stop001/TestDescription.java | 1 - .../nsk/jdi/ThreadReference/stop/stop002/TestDescription.java | 1 - .../jdi/ThreadReference/suspend/suspend001/TestDescription.java | 1 - .../suspendCount/suspendcount001/TestDescription.java | 1 - .../threadGroup/threadgroup001/TestDescription.java | 1 - .../jdi/ThreadStartEvent/thread/thread001/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter001/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter002/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter003/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter004/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter005/TestDescription.java | 1 - .../nsk/jdi/Transport/name/name001/TestDescription.java | 1 - .../nsk/jdi/Type/hashCode/hashcode001/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java | 1 - .../nsk/jdi/Type/signature/signature001/TestDescription.java | 1 - .../nsk/jdi/Type/signature/signature002/TestDescription.java | 1 - .../nsk/jdi/Type/signature/signature003/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype001/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype002/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype003/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype004/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype005/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype006/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype007/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype008/TestDescription.java | 1 - .../TypeComponent/declaringType/decltype009/TestDescription.java | 1 - .../genericSignature/genericSignature001/TestDescription.java | 1 - .../genericSignature/genericSignature002/TestDescription.java | 1 - .../jdi/TypeComponent/isFinal/isfinal001/TestDescription.java | 1 - .../jdi/TypeComponent/isFinal/isfinal002/TestDescription.java | 1 - .../jdi/TypeComponent/isFinal/isfinal003/TestDescription.java | 1 - .../jdi/TypeComponent/isFinal/isfinal004/TestDescription.java | 1 - .../isPackagePrivate/ispackageprivate001/TestDescription.java | 1 - .../isPackagePrivate/ispackageprivate002/TestDescription.java | 1 - .../TypeComponent/isPrivate/isprivate001/TestDescription.java | 1 - .../TypeComponent/isPrivate/isprivate002/TestDescription.java | 1 - .../isProtected/isprotected001/TestDescription.java | 1 - .../isProtected/isprotected002/TestDescription.java | 1 - .../jdi/TypeComponent/isPublic/ispublic001/TestDescription.java | 1 - .../jdi/TypeComponent/isPublic/ispublic002/TestDescription.java | 1 - .../jdi/TypeComponent/isStatic/isstatic001/TestDescription.java | 1 - .../jdi/TypeComponent/isStatic/isstatic002/TestDescription.java | 1 - .../jdi/TypeComponent/isStatic/isstatic003/TestDescription.java | 1 - .../jdi/TypeComponent/isStatic/isstatic004/TestDescription.java | 1 - .../isSynthetic/issynthetic001/TestDescription.java | 1 - .../isSynthetic/issynthetic002/TestDescription.java | 1 - .../nsk/jdi/TypeComponent/name/name001/TestDescription.java | 1 - .../nsk/jdi/TypeComponent/name/name002/TestDescription.java | 1 - .../nsk/jdi/TypeComponent/name/name003/TestDescription.java | 1 - .../nsk/jdi/TypeComponent/signature/sign001/TestDescription.java | 1 - .../nsk/jdi/TypeComponent/signature/sign002/TestDescription.java | 1 - .../nsk/jdi/TypeComponent/signature/sign003/TestDescription.java | 1 - .../_itself_/canntbemod001/TestDescription.java | 1 - .../jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java | 1 - .../jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java | 1 - .../jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java | 1 - .../_itself_/disconnect001/TestDescription.java | 1 - .../_itself_/disconnect002/TestDescription.java | 1 - .../_itself_/disconnect003/TestDescription.java | 1 - .../VMOutOfMemoryException001/VMOutOfMemoryException001.java | 1 - .../nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java | 1 - .../nsk/jdi/Value/_itself_/value001/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java | 1 - .../jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java | 1 - .../vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java | 1 - .../VirtualMachine/allClasses/allclasses001/TestDescription.java | 1 - .../VirtualMachine/allClasses/allclasses002/TestDescription.java | 1 - .../VirtualMachine/allThreads/allthreads001/TestDescription.java | 1 - .../canAddMethod/canaddmethod001/TestDescription.java | 1 - .../canBeModified/canbemodified001/TestDescription.java | 1 - .../canGetBytecodes/cangetbytecodes001/TestDescription.java | 1 - .../cangccm001/TestDescription.java | 1 - .../canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java | 1 - .../canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java | 1 - .../canGetSourceDebugExtension/cangetsde001/TestDescription.java | 1 - .../canGetSyntheticAttribute/cangetattr001/TestDescription.java | 1 - .../canPopFrames/canpopframes001/TestDescription.java | 1 - .../canredefineclasses001/TestDescription.java | 1 - .../canRequestVMDeathEvent/canreqvmdev001/TestDescription.java | 1 - .../curc001/TestDescription.java | 1 - .../canUseInstanceFilters/canusefilters001/TestDescription.java | 1 - .../canWatchFieldAccess/canwatchaccess001/TestDescription.java | 1 - .../canwatchmod001/TestDescription.java | 1 - .../classesByName/classesbyname001/TestDescription.java | 1 - .../description/description001/TestDescription.java | 1 - .../jdi/VirtualMachine/dispose/dispose001/TestDescription.java | 1 - .../jdi/VirtualMachine/dispose/dispose002/TestDescription.java | 1 - .../jdi/VirtualMachine/dispose/dispose003/TestDescription.java | 1 - .../jdi/VirtualMachine/dispose/dispose004/TestDescription.java | 1 - .../jdi/VirtualMachine/dispose/dispose005/TestDescription.java | 1 - .../VirtualMachine/eventQueue/eventqueue001/TestDescription.java | 1 - .../eventRequestManager/eventrmanager001/TestDescription.java | 1 - .../nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java | 1 - .../nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java | 1 - .../getDefaultStratum/getdefaultstratum001/TestDescription.java | 1 - .../instanceCounts/instancecounts001/instancecounts001.java | 1 - .../instanceCounts/instancecounts002/TestDescription.java | 1 - .../instanceCounts/instancecounts003/instancecounts003.java | 1 - .../instanceCounts/instancecounts004/instancecounts004.java | 1 - .../mirrorOf_bool/mirrorof_bool001/TestDescription.java | 1 - .../mirrorOf_byte/mirrorof_byte001/TestDescription.java | 1 - .../mirrorOf_char/mirrorof_char001/TestDescription.java | 1 - .../mirrorOf_double/mirrorof_double001/TestDescription.java | 1 - .../mirrorOf_float/mirrorof_float001/TestDescription.java | 1 - .../mirrorOf_int/mirrorof_int001/TestDescription.java | 1 - .../mirrorOf_long/mirrorof_long001/TestDescription.java | 1 - .../mirrorOf_short/mirrorof_short001/TestDescription.java | 1 - .../mirrorOf_string/mirrorof_string001/TestDescription.java | 1 - .../nsk/jdi/VirtualMachine/name/name001/TestDescription.java | 1 - .../jdi/VirtualMachine/process/process001/TestDescription.java | 1 - .../redefineClasses/redefineclasses001/TestDescription.java | 1 - .../redefineClasses/redefineclasses002/TestDescription.java | 1 - .../redefineClasses/redefineclasses003/TestDescription.java | 1 - .../redefineClasses/redefineclasses004/TestDescription.java | 1 - .../redefineClasses/redefineclasses005/TestDescription.java | 1 - .../redefineClasses/redefineclasses006/TestDescription.java | 1 - .../redefineClasses/redefineclasses007/TestDescription.java | 1 - .../redefineClasses/redefineclasses008/TestDescription.java | 1 - .../redefineClasses/redefineclasses009/TestDescription.java | 1 - .../redefineClasses/redefineclasses010/TestDescription.java | 1 - .../redefineClasses/redefineclasses011/TestDescription.java | 1 - .../redefineClasses/redefineclasses012/TestDescription.java | 1 - .../redefineClasses/redefineclasses013/TestDescription.java | 1 - .../redefineClasses/redefineclasses014/TestDescription.java | 1 - .../redefineClasses/redefineclasses015/TestDescription.java | 1 - .../redefineClasses/redefineclasses016/TestDescription.java | 1 - .../redefineClasses/redefineclasses020/TestDescription.java | 1 - .../redefineClasses/redefineclasses021/TestDescription.java | 1 - .../redefineClasses/redefineclasses022/TestDescription.java | 1 - .../redefineClasses/redefineclasses023/TestDescription.java | 1 - .../redefineClasses/redefineclasses024/TestDescription.java | 1 - .../redefineClasses/redefineclasses025/TestDescription.java | 1 - .../redefineClasses/redefineclasses026/TestDescription.java | 1 - .../redefineClasses/redefineclasses027/TestDescription.java | 1 - .../redefineClasses/redefineclasses028/TestDescription.java | 1 - .../redefineClasses/redefineclasses029/TestDescription.java | 1 - .../redefineClasses/redefineclasses030/TestDescription.java | 1 - .../redefineClasses/redefineclasses031/TestDescription.java | 1 - .../redefineClasses/redefineclasses032/TestDescription.java | 1 - .../redefineClasses/redefineclasses034/TestDescription.java | 1 - .../redefineClasses/redefineclasses035/TestDescription.java | 1 - .../nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java | 1 - .../setDefaultStratum002/setDefaultStratum002.java | 1 - .../setDefaultStratum003/setDefaultStratum003.java | 1 - .../setDefaultStratum/setdefaultstratum001/TestDescription.java | 1 - .../jdi/VirtualMachine/suspend/suspend001/TestDescription.java | 1 - .../topLevelThreadGroups/toplevelgroups001/TestDescription.java | 1 - .../jdi/VirtualMachine/version/version001/TestDescription.java | 1 - .../allConnectors/allconnectors001/TestDescription.java | 1 - .../attachingConnectors/attaching001/TestDescription.java | 1 - .../connectedVirtualMachines/convm001/TestDescription.java | 1 - .../connectedVirtualMachines/convm002/TestDescription.java | 1 - .../connectedVirtualMachines/convm003/TestDescription.java | 1 - .../createVirtualMachine/createVM001/TestDescription.java | 1 - .../createVirtualMachine/createVM002/TestDescription.java | 1 - .../createVirtualMachine/createVM003/TestDescription.java | 1 - .../createVirtualMachine/createVM004/TestDescription.java | 1 - .../createVirtualMachine/createVM005/TestDescription.java | 1 - .../defaultConnector/default001/TestDescription.java | 1 - .../launchingConnectors/launching001/TestDescription.java | 1 - .../listeningConnectors/listening001/TestDescription.java | 1 - .../majorInterfaceVersion/major001/TestDescription.java | 1 - .../minorInterfaceVersion/minor001/TestDescription.java | 1 - .../nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java | 1 - .../nsk/jdi/VoidType/toString/tostring001/TestDescription.java | 1 - .../vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java | 1 - .../nsk/jdi/VoidValue/equals/equals002/TestDescription.java | 1 - .../nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java | 1 - .../nsk/jdi/VoidValue/toString/tostring001/TestDescription.java | 1 - .../jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java | 1 - .../nsk/jdi/WatchpointEvent/field/field001/TestDescription.java | 1 - .../jdi/WatchpointEvent/object/object001/TestDescription.java | 1 - .../valueCurrent/valuecur001/TestDescription.java | 1 - .../WatchpointRequest/_bounds_/filters001/TestDescription.java | 1 - .../addClassExclusionFilter/filter001/TestDescription.java | 1 - .../addClassExclusionFilter/filter002/TestDescription.java | 1 - .../addClassExclusionFilter/filter003/TestDescription.java | 1 - .../addClassExclusionFilter/filter004/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt001/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt002/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt003/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt004/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt005/TestDescription.java | 1 - .../addClassFilter_rt/filter_rt006/TestDescription.java | 1 - .../addClassFilter_s/filter_s001/TestDescription.java | 1 - .../addClassFilter_s/filter_s002/TestDescription.java | 1 - .../addClassFilter_s/filter_s003/TestDescription.java | 1 - .../addClassFilter_s/filter_s004/TestDescription.java | 1 - .../addInstanceFilter/instancefilter001/TestDescription.java | 1 - .../addInstanceFilter/instancefilter002/TestDescription.java | 1 - .../addInstanceFilter/instancefilter003/TestDescription.java | 1 - .../addInstanceFilter/instancefilter004/TestDescription.java | 1 - .../addInstanceFilter/instancefilter005/TestDescription.java | 1 - .../addInstanceFilter/instancefilter006/TestDescription.java | 1 - .../addInstanceFilter/instancefilter007/TestDescription.java | 1 - .../addInstanceFilter/instancefilter008/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter001/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter002/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter003/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter004/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter005/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter006/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter007/TestDescription.java | 1 - .../addThreadFilter/addthreadfilter008/TestDescription.java | 1 - .../jdi/WatchpointRequest/field/field001/TestDescription.java | 1 - .../jdi/WatchpointRequest/field/field002/TestDescription.java | 1 - .../ClassPrepareEvents001/ClassPrepareEvents001.java | 1 - .../stress/MonitorEvents/MonitorEvents001/TestDescription.java | 1 - .../stress/MonitorEvents/MonitorEvents002/TestDescription.java | 1 - .../jdi/stress/serial/forceEarlyReturn001/TestDescription.java | 1 - .../jdi/stress/serial/forceEarlyReturn002/TestDescription.java | 1 - .../nsk/jdi/stress/serial/heapwalking001/TestDescription.java | 1 - .../nsk/jdi/stress/serial/heapwalking002/TestDescription.java | 1 - .../nsk/jdi/stress/serial/mixed001/TestDescription.java | 1 - .../nsk/jdi/stress/serial/mixed002/TestDescription.java | 1 - .../nsk/jdi/stress/serial/monitorEvents001/TestDescription.java | 1 - .../nsk/jdi/stress/serial/monitorEvents002/TestDescription.java | 1 - .../stress/serial/ownedMonitorsAndFrames001/TestDescription.java | 1 - .../stress/serial/ownedMonitorsAndFrames002/TestDescription.java | 1 - 1144 files changed, 1144 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java index 93c56addb02..00a47f5424f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AccessWatchpointEvent._itself_.awevent001 * nsk.jdi.AccessWatchpointEvent._itself_.awevent001t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java index ad21279e756..cdd99cf5a63 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPackagePrivate.accipp001 * nsk.jdi.Accessible.isPackagePrivate.accipp001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java index 03da587e75d..7d16b61df14 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPackagePrivate.accipp002 * nsk.jdi.Accessible.isPackagePrivate.accipp002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java index d480ebfb416..2f5a4afeb11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPrivate.isPrivate001 * nsk.jdi.Accessible.isPrivate.isPrivate001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java index 36018424375..491ee0a7051 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPrivate.isprivate002 * nsk.jdi.Accessible.isPrivate.isprivate002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java index 48f5d730d3f..f283beb4a6f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isProtected.isProtected001 * nsk.jdi.Accessible.isProtected.isProtected001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java index 23a2dc24e6f..e0052a14299 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isProtected.isprotected002 * nsk.jdi.Accessible.isProtected.isprotected002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java index 2b016ac3706..f1e4827690f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPublic.isPublic001 * nsk.jdi.Accessible.isPublic.isPublic001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java index de1afa5e086..36e409fb51c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPublic.ispublic002 * nsk.jdi.Accessible.isPublic.ispublic002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java index 73c327c151e..633a41632ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.isPublic.ispublic003 * nsk.jdi.Accessible.isPublic.ispublic003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java index 15b8e981051..2c4fffd6918 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.modifiers.modifiers001 * nsk.jdi.Accessible.modifiers.modifiers001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java index 3aa294f2c26..c5baa18c54f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Accessible.modifiers.modifiers002 * nsk.jdi.Accessible.modifiers.modifiers002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java index 13160956c41..784e8a6e325 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.description.description001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.description.description001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java index df6ff6f3fad..bddfd2bcdb5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.isValid.isvalid001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.isValid.isvalid001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java index dc4a629ff74..c914a3a872b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.isValid.isvalid002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.isValid.isvalid002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java index 07730666b65..d5e915c1031 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.isValid.isvalid003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.isValid.isvalid003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java index 369fcd148c2..2610752d76c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.isValid.isvalid004 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.isValid.isvalid004 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java index 3b10d1d5e0a..b05f067f231 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.isValid.isvalid005 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.isValid.isvalid005 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java index cb8575d435d..da6ad33cc88 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.label.label001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.label.label001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java index fd06ac9bc3c..ddb13bb334f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.mustSpecify.mustspecify001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.mustSpecify.mustspecify001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java index 1cce6196e22..886dcadcc77 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.name.name001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.name.name001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java index 659576419bd..669e227f45c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.setValue.setvalue001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.setValue.setvalue001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java index 53f5aead6e7..9999c3473c0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.setValue.setvalue002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.setValue.setvalue002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java index 974fb15c143..d019d817d1e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.value.value001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.value.value001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java index 19d5136871b..0ee6195dfbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.value.value002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Argument.value.value002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java index 1572e15a409..464b7750bf1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.value.value003 * nsk.jdi.Argument.value.value003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004/TestDescription.java index 149f806b376..8ce3a8989e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Argument.value.value004 * nsk.jdi.Argument.value.value004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java index a591d37bfa5..3c0f65e5bf6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValue.getvalue001 * nsk.jdi.ArrayReference.getValue.getvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java index b4f57ad04b0..95d4bf3eb19 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValue.getvalue002 * nsk.jdi.ArrayReference.getValue.getvalue002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java index 46db4cbe221..491c735b1d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValue.getvalue003 * nsk.jdi.ArrayReference.getValue.getvalue003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java index a299fc158af..4591eaf6cfd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues.getvalues001 * nsk.jdi.ArrayReference.getValues.getvalues001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java index 34b586309af..b58c9e660c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues.getvalues002 * nsk.jdi.ArrayReference.getValues.getvalues002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java index 895c54b5440..868d22ec916 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues.getvalues003 * nsk.jdi.ArrayReference.getValues.getvalues003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java index e38c4bbf1ff..af98d12e61b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii001 * nsk.jdi.ArrayReference.getValues_ii.getvaluesii001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java index d885d97fc93..56ca8e773a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii002 * nsk.jdi.ArrayReference.getValues_ii.getvaluesii002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java index 579d2eeea27..cac6ef78cf2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii003 * nsk.jdi.ArrayReference.getValues_ii.getvaluesii003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java index 2edc4fee5af..df98bc197e5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii004 * nsk.jdi.ArrayReference.getValues_ii.getvaluesii004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java index 30da601f592..ef10f83631f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.getValues_ii.getvaluesii005 * nsk.jdi.ArrayReference.getValues_ii.getvaluesii005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java index b807c2ffe0d..74fb095a4c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.length.length001 * nsk.jdi.ArrayReference.length.length001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java index 4628f356f84..3fbdbaf6119 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java @@ -71,7 +71,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValue.setvalue001 * nsk.jdi.ArrayReference.setValue.setvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java index 72913a5f525..f6fa3ee22d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValue.setvalue002 * nsk.jdi.ArrayReference.setValue.setvalue002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java index 50fb25695b2..0d41f634102 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java @@ -81,7 +81,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValue.setvalue003 * nsk.jdi.ArrayReference.setValue.setvalue003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java index 1a69531b533..e12795b86db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii001 * nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java index 23eb5c93894..42ea1d8984e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii002 * nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java index a2b97262909..6e226ca1048 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java @@ -83,7 +83,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii003 * nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java index 6d67705d4cc..39858e520fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java @@ -73,7 +73,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii004 * nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java index 15acaa8bcb0..52cc3dc5c68 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii005 * nsk.jdi.ArrayReference.setValues_ilii.setvaluesilii005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java index c2ccf452b28..0db8c4cf2c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java @@ -75,7 +75,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_l.setvaluesl001 * nsk.jdi.ArrayReference.setValues_l.setvaluesl001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java index 8ba9379c161..c917d7ed1e3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java @@ -82,7 +82,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_l.setvaluesl002 * nsk.jdi.ArrayReference.setValues_l.setvaluesl002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java index 3e881aaad95..88745af5e95 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java @@ -84,7 +84,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayReference.setValues_l.setvaluesl003 * nsk.jdi.ArrayReference.setValues_l.setvaluesl003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java index b1e703883eb..d362e420cfe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.componentSignature.componentsignature001 * nsk.jdi.ArrayType.componentSignature.componentsignature001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java index 0efa294bda1..5266e5db5f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.componentSignature.componentsignature002 * nsk.jdi.ArrayType.componentSignature.componentsignature002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java index 3901203b96b..5d6f6d1df01 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.componentType.componenttype001 * nsk.jdi.ArrayType.componentType.componenttype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java index b5a06bf3e55..6bec55236c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.componentTypeName.componenttypename001 * nsk.jdi.ArrayType.componentTypeName.componenttypename001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java index 55df3bfb1b6..1dc92b0e962 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.componentTypeName.componenttypename002 * nsk.jdi.ArrayType.componentTypeName.componenttypename002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java index b4e8722862b..39a8e9e4c78 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.newInstance.newinstance001 * nsk.jdi.ArrayType.newInstance.newinstance001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java index edf2d9d650c..d72be3008e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.newInstance.newinstance002 * nsk.jdi.ArrayType.newInstance.newinstance002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java index cd9844c15cc..89bdb495523 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.newInstance.newinstance003 * nsk.jdi.ArrayType.newInstance.newinstance003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java index ef350a7189e..7eefe248990 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ArrayType.newInstance.newinstance004 * nsk.jdi.ArrayType.newInstance.newinstance004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java index 3c8f78ecdd3..dcfece2048a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach001 * nsk.jdi.AttachingConnector.attach.attach001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java index dd1e88e65fa..09b1a1acc67 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach002 * nsk.jdi.AttachingConnector.attach.attach002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java index d41a835ada3..11a73683ff6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.AttachingConnector.attach.attach003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java index 11d59a2020b..3a4e69bf0c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java @@ -36,7 +36,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach004.TestDriver * @run driver PropertyResolvingWrapper * nsk.jdi.AttachingConnector.attach.attach004.TestDriver diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java index 9136df49351..049eeeab955 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java @@ -36,7 +36,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach004.TestDriver * @run driver PropertyResolvingWrapper * nsk.jdi.AttachingConnector.attach.attach004.TestDriver diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java index 55d23675ee6..bedda9e1940 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attachnosuspend.attachnosuspend001 * nsk.jdi.AttachingConnector.attachnosuspend.attachnosuspend001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java index df9650ad812..21eb9e76221 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java @@ -35,7 +35,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach004.TestDriver * @run driver PropertyResolvingWrapper * nsk.jdi.AttachingConnector.attach.attach004.TestDriver diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java index 53507ad3bd9..f1226751613 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java @@ -35,7 +35,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.AttachingConnector.attach.attach004.TestDriver * @run driver PropertyResolvingWrapper * nsk.jdi.AttachingConnector.attach.attach004.TestDriver diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java index d5fcc116edf..dc2cff8bea0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc01x001 * nsk.jdi.BScenarios.hotswap.tc01x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java index 519ea3b2c3a..a5cac801cf9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc01x002 * nsk.jdi.BScenarios.hotswap.tc01x002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java index 3cf356a3ce4..c0b2432fb43 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc02x001 * nsk.jdi.BScenarios.hotswap.tc02x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java index ac19172c5c3..1a41f71c8e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc02x002 * nsk.jdi.BScenarios.hotswap.tc02x002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java index 34aebb7ca07..5f93113f217 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc03x001 * nsk.jdi.BScenarios.hotswap.tc03x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java index 706b5d761c5..9926e34477d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc04x001 * nsk.jdi.BScenarios.hotswap.tc04x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java index 640730ed4cd..8b8f95977d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc04x002 * nsk.jdi.BScenarios.hotswap.tc04x002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java index c253b81c916..f7497adeb47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc05x001 * nsk.jdi.BScenarios.hotswap.tc05x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java index e894c9f7aa7..4dccef0591a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc05x002 * nsk.jdi.BScenarios.hotswap.tc05x002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java index 4c5dd5a114a..0eba41fa8c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc06x001 * nsk.jdi.BScenarios.hotswap.tc06x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java index 39dd08175c2..e205aa8dd1a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc07x001 * nsk.jdi.BScenarios.hotswap.tc07x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java index 2b4c06804f8..a6dd149ac78 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc08x001 * nsk.jdi.BScenarios.hotswap.tc08x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java index 98b85f82b92..2da62a1cba7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc09x001 * nsk.jdi.BScenarios.hotswap.tc09x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java index b4e5cd8e7ac..28e15cd77c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc09x002 * nsk.jdi.BScenarios.hotswap.tc09x002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java index 229e0cd7fba..ea1858d1887 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc10x001 * nsk.jdi.BScenarios.hotswap.tc10x001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java index 77b32746b3a..e65441bdbdf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.hotswap.tc10x002 * nsk.jdi.BScenarios.hotswap.tc10x002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java index 366232f1517..20e0642ce38 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc01x001 * nsk.jdi.BScenarios.multithrd.tc01x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java index ff0175af276..c3910a5a1bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc02x001 * nsk.jdi.BScenarios.multithrd.tc02x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java index 800fa741b18..89e4382e103 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc02x002 * nsk.jdi.BScenarios.multithrd.tc02x002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java index 226c0c2130d..dc4b2e134f9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc02x003 * nsk.jdi.BScenarios.multithrd.tc02x003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java index b22b0775516..77a36632ee0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc02x004 * nsk.jdi.BScenarios.multithrd.tc02x004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java index 0b7eedb0560..fe29990d4ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc03x001 * nsk.jdi.BScenarios.multithrd.tc03x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java index e196970bf18..e2f7378baf3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.multithrd.tc04x001 * nsk.jdi.BScenarios.multithrd.tc04x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java index 57d1b678427..31dd678bdfe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc01x001 * nsk.jdi.BScenarios.singlethrd.tc01x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java index 830fa9006db..ba60e971475 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc01x002 * nsk.jdi.BScenarios.singlethrd.tc01x002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java index f791e5192e7..c676ea6397a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc02x001 * nsk.jdi.BScenarios.singlethrd.tc02x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java index 1d7ea063201..1475c505302 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc03x001 * nsk.jdi.BScenarios.singlethrd.tc03x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java index 6cfc53b6c17..038fb2de77a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc03x002 * nsk.jdi.BScenarios.singlethrd.tc03x002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java index 7a9f9b16736..09c378ebd8d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc03x003 * nsk.jdi.BScenarios.singlethrd.tc03x003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java index 7aafe7a7560..8a0a57c0796 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc04x001 * nsk.jdi.BScenarios.singlethrd.tc04x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java index d3eec2e4013..ed4227e1bba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BScenarios.singlethrd.tc05x001 * nsk.jdi.BScenarios.singlethrd.tc05x001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java index 26ca8dbfc88..cf8e89b7969 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java @@ -81,7 +81,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.booleanValue.booleanvalue001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.booleanValue.booleanvalue001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java index 15dce51fdb6..ced09c07447 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.booleanValue.booleanvalue002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.booleanValue.booleanvalue002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java index 9d224ea009f..8798bdd3962 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.isValid.isvalid001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.isValid.isvalid001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java index e2012bb7be2..69711cbeb21 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.isValid.isvalid002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.isValid.isvalid002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java index 99a3d642157..b4553950caf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.setValue.setvalue001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.setValue.setvalue001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java index 960ac3f5917..b8a01296dd0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.setValue.setvalue002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.setValue.setvalue002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java index 3f48a3b7ad8..adc42df3f46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.stringValueOf.stringvalueof001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.stringValueOf.stringvalueof001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java index db7baac54b3..e7b2cdf4322 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java @@ -75,7 +75,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanArgument.stringValueOf.stringvalueof002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.BooleanArgument.stringValueOf.stringvalueof002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java index 2101fb0aa85..f20659bb913 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanType._itself_.booleantype001 * nsk.jdi.BooleanType._itself_.booleantype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java index e8bb10d5aa9..64440dd5bc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanValue.equals.equals001 * nsk.jdi.BooleanValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java index 25d22e5df5c..bc1cd05985b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanValue.equals.equals002 * nsk.jdi.BooleanValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java index e7af7f96e69..d4f4d62d39f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanValue.hashCode.hashcode001 * nsk.jdi.BooleanValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java index 8c2f27c68b6..45ee2ec2f4e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BooleanValue.value.value001 * nsk.jdi.BooleanValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java index 15bc1127b72..5dd722d02c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java @@ -78,7 +78,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointEvent._itself_.breakpoint001 * nsk.jdi.BreakpointEvent._itself_.breakpoint001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java index ef9e2c5b2a8..18e265cbae9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointEvent._itself_.breakpoint002 * nsk.jdi.BreakpointEvent._itself_.breakpoint002t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java index cee61e10abf..3cc9b04f31a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest._bounds_.filters001 * nsk.jdi.BreakpointRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java index f580dae4b92..7ee3f94de81 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter001 * nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java index bc68e5d40a0..e5d2664d8e5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter002 * nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java index da42c200065..4f57ef4e833 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter003 * nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java index 30615643833..8cb9433e21c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter004 * nsk.jdi.BreakpointRequest.addInstanceFilter.instancefilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java index 54348cd43fd..735f37515da 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter001 * nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java index 2bc4574d36c..b8d9e041b79 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter002 * nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java index 4a44c724144..b007cb0af4e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter003 * nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java index bab4f929e32..5c8e69174ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter004 * nsk.jdi.BreakpointRequest.addThreadFilter.threadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java index 267eaff0b83..1e475e35c8f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.BreakpointRequest.location.location001 * nsk.jdi.BreakpointRequest.location.location001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java index 8b45ef22042..48deef17dc4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ByteType._itself_.bytetype001 * nsk.jdi.ByteType._itself_.bytetype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java index 6a04b76379f..74512080d7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ByteValue.compareTo.compareto001 * nsk.jdi.ByteValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java index a24924e809c..8cfeb28117f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ByteValue.equals.equals001 * nsk.jdi.ByteValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java index 79b8d8eaf09..c19fe92dc88 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ByteValue.equals.equals002 * nsk.jdi.ByteValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java index b984a70b85f..4a80e6be58a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ByteValue.hashCode.hashcode001 * nsk.jdi.ByteValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java index 3159c31cb55..5d669a6aa72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ByteValue.value.value001 * nsk.jdi.ByteValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java index 8940efe6df8..a42d1a97cae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.CharType._itself_.chartype001 * nsk.jdi.CharType._itself_.chartype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java index 0d8a1c093c7..c577aeb411e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.CharValue.compareTo.compareto001 * nsk.jdi.CharValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java index 1fb9507dc3c..a96241e6d60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.CharValue.equals.equals001 * nsk.jdi.CharValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java index 7ede6f98428..63f2c30278a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.CharValue.equals.equals002 * nsk.jdi.CharValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java index 132dcaefcb0..72b5cddbc29 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.CharValue.hashCode.hashcode001 * nsk.jdi.CharValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java index de6d8a7a2c7..c17c1e9b431 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.CharValue.value.value001 * nsk.jdi.CharValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java index 520e7e5f233..b39b270b71b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses001 * nsk.jdi.ClassLoaderReference.definedClasses.definedclasses001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java index 3e7fd78aef0..31598116c45 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses002 * nsk.jdi.ClassLoaderReference.definedClasses.definedclasses002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java index 370e9b29fe5..096983732a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses003 * nsk.jdi.ClassLoaderReference.definedClasses.definedclasses003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java index b0717970a36..96f88ef9da4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses004 * nsk.jdi.ClassLoaderReference.definedClasses.definedclasses004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java index 825ae938354..4855e46dbf2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.definedClasses.definedclasses005 * nsk.jdi.ClassLoaderReference.definedClasses.definedclasses005a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java index 6379024e7ef..6e44f7fa3c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java @@ -85,7 +85,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses001 * nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java index a3bdb1ebe20..86787627486 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses002 * nsk.jdi.ClassLoaderReference.visibleClasses.visibleclasses002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java index 4d107efecb2..a9609d9e974 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassObjectReference.reflectedType.reflectype001 * nsk.jdi.ClassObjectReference.reflectedType.reflectype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java index 7576ee36ffb..29b87eeac77 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassObjectReference.reflectedType.reflectype002 * nsk.jdi.ClassObjectReference.reflectedType.reflectype002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java index f2ad8f6687c..0dff4befc56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassObjectReference.toString.tostring001 * nsk.jdi.ClassObjectReference.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java index 11ea84cec54..f981bec5ea4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java @@ -79,7 +79,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareEvent.referenceType.refType001 * nsk.jdi.ClassPrepareEvent.referenceType.refType001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java index 609d193db0e..fe75c043c42 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareEvent.thread.thread001 * nsk.jdi.ClassPrepareEvent.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java index f165155c808..3608e1e797d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest._bounds_.filters001 * nsk.jdi.ClassPrepareRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java index 9919c145b81..83e0377c323 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter001 * nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java index 332ac00462f..738c9a74076 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter002 * nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java index 64c0a41a9c1..6fd8bab7164 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter003 * nsk.jdi.ClassPrepareRequest.addClassExclusionFilter.filter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java index dc823fdde8a..903c52c4810 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt001 * nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 8fbba6c4e12..4c53e6475bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt002 * nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java index e6812a43e44..9dc65f82ffd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -73,7 +73,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt003 * nsk.jdi.ClassPrepareRequest.addClassFilter_rt.filter_rt003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java index c4a052e8bd9..79ddb2e59d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s001 * nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java index d131b3de9e2..800e56feff0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s002 * nsk.jdi.ClassPrepareRequest.addClassFilter_s.filter_s002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java index 65f66e07d97..9a0c562c79d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java @@ -49,7 +49,6 @@ * @build nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter001.addSourceNameFilter001 * nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter001.TestClass2 * nsk.share.jdi.TestClass1 - * @run driver jdk.test.lib.FileInstaller . . * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter001.addSourceNameFilter001 * -verbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java index c8523b5a297..23fe8c79337 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassPrepareRequest.addSourceNameFilter.addSourceNameFilter002.addSourceNameFilter002 * nsk.share.jdi.TestClass1 * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java index 18f8870a2cc..6b0c19a0a29 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.allInterfaces.allinterfaces001 * nsk.jdi.ClassType.allInterfaces.allinterfaces001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java index eb5be2f7601..d80e21e3eff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.allInterfaces.allinterfaces002 * nsk.jdi.ClassType.allInterfaces.allinterfaces002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java index 62f9d0053f2..3e93765ac7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.concreteMethodByName.method001 * nsk.jdi.ClassType.concreteMethodByName.method001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java index 88a7b0f333d..5ee8abf9151 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.concreteMethodByName.method002 * nsk.jdi.ClassType.concreteMethodByName.method002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java index 177f1e2ed8b..812983e5bb8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.interfaces.interfaces001 * nsk.jdi.ClassType.interfaces.interfaces001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java index 61f9ece0714..f914f2b6d05 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.interfaces.interfaces002 * nsk.jdi.ClassType.interfaces.interfaces002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java index f1fbcfbd131..cdc54a54a47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod001 * nsk.jdi.ClassType.invokeMethod.invokemethod001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java index 1faa2722e43..2ed58c22cc6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod002 * nsk.jdi.ClassType.invokeMethod.invokemethod002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java index 6d517174467..a5b76f05b54 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod003 * nsk.jdi.ClassType.invokeMethod.invokemethod003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java index 0016c9c870f..0cdc5394d9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod004 * nsk.jdi.ClassType.invokeMethod.invokemethod004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java index 763e75b3a8a..a987d1e41a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod005 * nsk.jdi.ClassType.invokeMethod.invokemethod005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java index e065ec36ca8..21b0fbe9eff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod006 * nsk.jdi.ClassType.invokeMethod.invokemethod006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java index 8628f5f5b89..61a4c3aef60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod007 * nsk.jdi.ClassType.invokeMethod.invokemethod007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java index 2df43027be9..6733dbc954e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod008 * nsk.jdi.ClassType.invokeMethod.invokemethod008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java index d253d25892d..9c069ee8b4c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java @@ -45,7 +45,6 @@ * @modules jdk.jdi/com.sun.tools.jdi:open * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod009 * nsk.jdi.ClassType.invokeMethod.invokemethod009t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java index ddec2742aef..caf8e66ee24 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod010 * nsk.jdi.ClassType.invokeMethod.invokemethod010t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java index f31eba22b76..d7b7748c9e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod011 * nsk.jdi.ClassType.invokeMethod.invokemethod011t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java index 2e1d646a829..ffc71b28b87 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod012 * nsk.jdi.ClassType.invokeMethod.invokemethod012t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java index 0842b206ad8..3f4cd66be61 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod013 * nsk.jdi.ClassType.invokeMethod.invokemethod013t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java index bf89fb63c35..6e68df88e46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod014 * nsk.jdi.ClassType.invokeMethod.invokemethod014t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java index e15d0cf8b15..097a2eaf8a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.invokeMethod.invokemethod015 * nsk.jdi.ClassType.invokeMethod.invokemethod015a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java index 00948ebc9cf..10b6e1ac5f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.isEnum.isenum001 * nsk.jdi.ClassType.isEnum.isenum001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java index 333a7acf131..928db877517 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java @@ -134,7 +134,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance001 * nsk.jdi.ClassType.newInstance.newinstance001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java index 871ee48f0b1..50b74161bca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java @@ -134,7 +134,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance002 * nsk.jdi.ClassType.newInstance.newinstance002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java index b384a01392a..b549d8e2062 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance003 * nsk.jdi.ClassType.newInstance.newinstance003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java index 155fb60b865..035c8258b96 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance004 * nsk.jdi.ClassType.newInstance.newinstance004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java index 2eb275bfed2..f77b05deaef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance005 * nsk.jdi.ClassType.newInstance.newinstance005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java index 16663125ece..d72968fa152 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance006 * nsk.jdi.ClassType.newInstance.newinstance006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java index 3075d7eacba..7cbbd5f70fb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance007 * nsk.jdi.ClassType.newInstance.newinstance007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java index e4f5d6a48ac..129d73c707e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance008 * nsk.jdi.ClassType.newInstance.newinstance008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java index 1822de400b5..a7135487ee9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.newInstance.newinstance009 * nsk.jdi.ClassType.newInstance.newinstance009t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java index c3b3a52186a..be1980f2b36 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java @@ -85,7 +85,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue001 * nsk.jdi.ClassType.setValue.setvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java index 43e213d08ff..8a8bd0429a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java @@ -85,7 +85,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue002 * nsk.jdi.ClassType.setValue.setvalue002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java index b6c0fdb4ed5..19cd4c3250b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java @@ -84,7 +84,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue003 * nsk.jdi.ClassType.setValue.setvalue003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java index 88f6692fb89..f5fc985e1f1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java @@ -85,7 +85,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue004 * nsk.jdi.ClassType.setValue.setvalue004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java index 0ab6555cdc6..0b3dab74145 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java @@ -83,7 +83,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue005 * nsk.jdi.ClassType.setValue.setvalue005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java index e31ed85a84a..bd4648338f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue006 * nsk.jdi.ClassType.setValue.setvalue006t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java index 223210866b7..b86d50b6eb2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue007 * nsk.jdi.ClassType.setValue.setvalue007t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java index ef1c89f1dc4..672e12422dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.setValue.setvalue008 * nsk.jdi.ClassType.setValue.setvalue008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java index b362cbe3e31..83b7a03fe65 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.subclasses.subclasses001 * nsk.jdi.ClassType.subclasses.subclasses001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java index bc7383824c7..0ac4c732823 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.subclasses.subclasses002 * nsk.jdi.ClassType.subclasses.subclasses002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java index 03a2f8db689..41a88f1f221 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.superclass.superclass001 * nsk.jdi.ClassType.superclass.superclass001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java index 85427089149..f43ecb649f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassType.superclass.superclass002 * nsk.jdi.ClassType.superclass.superclass002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java index 801b5b25c37..e520f9158d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadEvent.className.classname001 * nsk.jdi.ClassUnloadEvent.className.classname001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java index d7ca820a1cf..8e3fed130c0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java @@ -83,7 +83,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadEvent.classSignature.signature001 * nsk.jdi.ClassUnloadEvent.classSignature.signature001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java index c0974086adf..3b713122ec7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadRequest._bounds_.filters001 * nsk.jdi.ClassUnloadRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java index 5052ed0f6f5..a1be86a3f82 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter001 * nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java index 5411f62f904..ed3b91b747f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter002 * nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java index cf138c04b07..d53f7a55329 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadRequest.addClassFilter.filter001 * nsk.jdi.ClassUnloadRequest.addClassFilter.filter001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java index 570d11c0c7e..7d0f505659c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ClassUnloadRequest.addClassFilter.filter002 * nsk.jdi.ClassUnloadRequest.addClassFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java index 468a4d3f10e..be507d46513 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector._bounds_.bounds001 * nsk.jdi.Connector._bounds_.bounds001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java index 20cf04d4237..8d99025f078 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.defaultArguments.defaultArguments001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.defaultArguments.defaultArguments001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java index 74b5446acc0..0769572c720 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.defaultArguments.defaultArguments002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.defaultArguments.defaultArguments002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java index 63696019e44..0ec96513485 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.defaultArguments.defaultArguments003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.defaultArguments.defaultArguments003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java index a9ac5306dc8..68ffa1bc68a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.description.description001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.description.description001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java index 5115c40dfe4..f16266cafc0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.name.name001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.name.name001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java index 573afc87cfb..42b9a706fc2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.toString.tostring001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.toString.tostring001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java index 3393737f7cf..539738b9eab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Connector.transport.transport001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Connector.transport.transport001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java index 5308a9564a1..edcdd854465 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @run main/othervm nsk.jdi.ConstantField.values001 */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java index 6d204c5a952..2f4b8589b07 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.DoubleType._itself_.doubletype001 * nsk.jdi.DoubleType._itself_.doubletype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java index 02c0eb19d81..4bbd0070e79 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.DoubleValue.compareTo.compareto001 * nsk.jdi.DoubleValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java index f61f7d89965..d579f06dec7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.DoubleValue.equals.equals001 * nsk.jdi.DoubleValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java index c3c549f1d70..2291ce32be2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.DoubleValue.equals.equals002 * nsk.jdi.DoubleValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java index 231fbfc3227..9a46686af6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.DoubleValue.hashCode.hashcode001 * nsk.jdi.DoubleValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java index 4081400d13f..2f974664f1e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.DoubleValue.value.value001 * nsk.jdi.DoubleValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java index 11ace7b56dd..89c4a4a7bd9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Event._itself_.event001 * nsk.jdi.Event._itself_.event001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java index 22f822989d8..5bb78cf4f0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Event._itself_.event002 * nsk.jdi.Event._itself_.event002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java index a73cc845a84..f262e99b170 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Event.equals.equals001 * nsk.jdi.Event.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java index 26a214d859a..89f7a6ac611 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Event.hashCode.hashcode001 * nsk.jdi.Event.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java index d584f6f72ec..e23fd7b87cd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Event.request.request001 * nsk.jdi.Event.request.request001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java index 88d9134e0c7..fe4896d4533 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventIterator.nextEvent.nextevent001 * nsk.jdi.EventIterator.nextEvent.nextevent001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java index ca9c1a7722b..b78eb82ef6a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.hashCode.hashcode001 * nsk.jdi.EventQueue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java index ed423ccf0c4..be9bc49a4c0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove.remove001 * nsk.jdi.EventQueue.remove.remove001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java index 78d4f7b1454..e29bd438382 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove.remove002 * nsk.jdi.EventQueue.remove.remove002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java index 5ca2acd9784..f2b7aebdf12 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove.remove003 * nsk.jdi.EventQueue.remove.remove003t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java index c19476ab50d..a002e29ff32 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove.remove004 * nsk.jdi.EventQueue.remove.remove004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java index 304443ee49a..051e9ff2fd9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove_l.remove_l001 * nsk.jdi.EventQueue.remove_l.remove_l001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java index 18204682e31..9978d7ff75d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove_l.remove_l002 * nsk.jdi.EventQueue.remove_l.remove_l002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java index 9be5d7ca6ce..657ae36f771 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove_l.remove_l003 * nsk.jdi.EventQueue.remove_l.remove_l003t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java index 3dda6ee8b3d..6bd23e25092 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove_l.remove_l004 * nsk.jdi.EventQueue.remove_l.remove_l004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java index 2b50ecf6af8..5b9e2ac572f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventQueue.remove_l.remove_l005 * nsk.jdi.EventQueue.remove_l.remove_l005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java index 929c94b2846..c77f517b93e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest._bounds_.eventrequest001 * nsk.jdi.EventRequest._bounds_.eventrequest001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java index 25705171bf2..b2ca2be66b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.addCountFilter.addcountfilter001 * nsk.jdi.EventRequest.addCountFilter.addcountfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java index 37e77793b6a..455cbe6a874 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.disable.disable001 * nsk.jdi.EventRequest.disable.disable001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java index eab65bc40d1..cfe971be8d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.disable.disable002 * nsk.jdi.EventRequest.disable.disable002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java index 6039b23acf5..2df5aab68f9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.disable.disable003 * nsk.jdi.EventRequest.disable.disable003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java index 28b756943be..3e2a3919fa7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.enable.enable001 * nsk.jdi.EventRequest.enable.enable001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java index 1b172607dac..b7e8bf514cf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.enable.enable002 * nsk.jdi.EventRequest.enable.enable002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java index 3ab89f7b38a..ada013cdea2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.getProperty.getproperty001 * nsk.jdi.EventRequest.getProperty.getproperty001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java index d745485ff9f..82f3266ac85 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.hashCode.hashcode001 * nsk.jdi.EventRequest.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java index c5e57b9a9dd..03a951238af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.isEnabled.isenabled001 * nsk.jdi.EventRequest.isEnabled.isenabled001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java index bdf1970cd11..bfb42782ccf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.putProperty.putproperty001 * nsk.jdi.EventRequest.putProperty.putproperty001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java index cd28429b8d4..8f8efd78f25 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.setEnabled.setenabled001 * nsk.jdi.EventRequest.setEnabled.setenabled001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java index 7d5d2be4ab8..759e6b46aea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.setEnabled.setenabled002 * nsk.jdi.EventRequest.setEnabled.setenabled002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java index ecf2f56ec48..cea4c97e8d6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.setEnabled.setenabled003 * nsk.jdi.EventRequest.setEnabled.setenabled003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java index 5bc44da0f0c..be59ea9025c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.setSuspendPolicy.setsuspendpolicy001 * nsk.jdi.EventRequest.setSuspendPolicy.setsuspendpolicy001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java index d3b189e744e..5b6a225cf9c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequest.suspendPolicy.suspendpolicy001 * nsk.jdi.EventRequest.suspendPolicy.suspendpolicy001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java index 0fd582a24e6..e5e39f69e10 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager._bounds_.requests001 * nsk.jdi.EventRequestManager._bounds_.requests001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java index bf017fddd11..6eeec823685 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq001 * nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java index ac38ae5af07..87f864bc8f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq002 * nsk.jdi.EventRequestManager.accessWatchpointRequests.accwtchpreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java index 240f59e60b2..0f1decee219 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.breakpointRequests.breakpreq001 * nsk.jdi.EventRequestManager.breakpointRequests.breakpreq001t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java index 8c8b238219b..95829e8d86e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.breakpointRequests.breakpreq002 * nsk.jdi.EventRequestManager.breakpointRequests.breakpreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java index 35cc2ef5ce2..4cb361ae693 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq001 * nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java index ba92c849d4c..3933a000a0a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq002 * nsk.jdi.EventRequestManager.classPrepareRequests.clsprepreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java index ab1910bec9e..09e5e0f4e52 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq001 * nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java index 678fd978c2d..b1eaec91867 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq002 * nsk.jdi.EventRequestManager.classUnloadRequests.clsunlreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java index 4f1c1f0917c..2dec59048b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq002 * nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java index b40fc8a8b3d..10b9a6a3b26 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq003 * nsk.jdi.EventRequestManager.createAccessWatchpointRequest.craccwtchpreq003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java index 47e6cc2f696..70740bc2ee0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java @@ -35,7 +35,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq002 * nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java index c5f1db123f0..2c19a626893 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq003 * nsk.jdi.EventRequestManager.createBreakpointRequest.crbreakpreq003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java index 64e78f14f69..62f1d1704de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createClassPrepareRequest.cpreg001 * nsk.jdi.EventRequestManager.createClassPrepareRequest.cpreg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java index 7f191547278..760da9ed497 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createClassUnloadRequest.cureg001 * nsk.jdi.EventRequestManager.createClassUnloadRequest.cureg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java index 1cab2ba5bac..71c9cc86131 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java @@ -73,7 +73,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createExceptionRequest.crexreq009 * nsk.jdi.EventRequestManager.createExceptionRequest.crexreq009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java index f3db992045a..177447b3b72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java @@ -79,7 +79,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createExceptionRequest.crexreq010 * nsk.jdi.EventRequestManager.createExceptionRequest.crexreq010a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java index 904b229cb94..5f77d3bc378 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createMethodEntryRequest.menreg001 * nsk.jdi.EventRequestManager.createMethodEntryRequest.menreg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java index 593628da2ac..c18f5c30884 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createMethodExitRequest.mexreg001 * nsk.jdi.EventRequestManager.createMethodExitRequest.mexreg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java index 23c91c41492..a87c19d9e3a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq002 * nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java index 36377d73a12..991e97d96cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq003 * nsk.jdi.EventRequestManager.createModificationWatchpointRequest.crmodwtchpreq003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java index 8a737f3cae0..dc35039419e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java @@ -38,7 +38,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq001 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java index 3b52b200119..cda32d4868a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq002 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java index 1529e5b8cef..50f353d809c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq003 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java index c09187b7687..3db0c7ef4c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq004 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java index ae522252d81..b8a4e3164b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq005 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java index a238e9cdf63..891b67509f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq006 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java index 8455ca2c852..811c3e16373 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq007 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java index f509a823b66..008b22b983b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq008 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java index 35049f97640..7513ad88e93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq009 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java index a2cddfd5d2c..46123bb3eb0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createStepRequest.crstepreq010 * nsk.jdi.EventRequestManager.createStepRequest.crstepreq010a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java index b48ea188dc9..07a3d90da2f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createThreadDeathRequest.tdreg001 * nsk.jdi.EventRequestManager.createThreadDeathRequest.tdreg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java index ea419899416..6d657818439 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createThreadStartRequest.tsreg001 * nsk.jdi.EventRequestManager.createThreadStartRequest.tsreg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java index 1361d306f7c..18e71df141b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.createVMDeathRequest.vmdreg001 * nsk.jdi.EventRequestManager.createVMDeathRequest.vmdreg001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java index b6ba0f21783..22cfacbf7de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.deleteAllBreakpoints.delallbreakp002 * nsk.jdi.EventRequestManager.deleteAllBreakpoints.delallbreakp002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java index 49d75465637..de3bc0e9851 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq002 * nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java index 6468af3e6f2..be9ecfeeb5c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq003 * nsk.jdi.EventRequestManager.deleteEventRequest.delevtreq003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java index c77afc1e606..b0578ff4223 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.deleteEventRequests.delevtreqs002 * nsk.jdi.EventRequestManager.deleteEventRequests.delevtreqs002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java index 8879b77d70d..57ef943c1b8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.exceptionRequests.excreq001 * nsk.jdi.EventRequestManager.exceptionRequests.excreq001t * nsk.jdi.EventRequestManager.exceptionRequests.excreq001a diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java index d504c67f653..7d72aedf641 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.exceptionRequests.excreq002 * nsk.jdi.EventRequestManager.exceptionRequests.excreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java index 46a617824f4..15373d64432 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.hashCode.hashcode001 * nsk.jdi.EventRequestManager.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java index fb811c013e1..5a7bbbf04c7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.methodEntryRequests.methentreq001 * nsk.jdi.EventRequestManager.methodEntryRequests.methentreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java index ba80356ead5..cae6369d641 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.methodEntryRequests.methentreq002 * nsk.jdi.EventRequestManager.methodEntryRequests.methentreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java index 99cb11b6587..639203c927f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.methodExitRequests.methexitreq001 * nsk.jdi.EventRequestManager.methodExitRequests.methexitreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java index fde5f6dc7dc..3867972f2e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.methodExitRequests.methexitreq002 * nsk.jdi.EventRequestManager.methodExitRequests.methexitreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java index 75ce1f2bd07..3f41f20340e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq001 * nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java index b0039c4a072..c62c205b457 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq002 * nsk.jdi.EventRequestManager.modificationWatchpointRequests.modwtchpreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java index 10fcf4f51b5..69e334a9168 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.stepRequests.stepreq001 * nsk.jdi.EventRequestManager.stepRequests.stepreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java index 0d4ad10738f..2f5114d40e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.stepRequests.stepreq002 * nsk.jdi.EventRequestManager.stepRequests.stepreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java index e775c5a0caf..943069f9988 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq001 * nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java index 708b07cfe0d..041270551e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq002 * nsk.jdi.EventRequestManager.threadDeathRequests.thrdeathreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java index 41dc6897f5c..650eb527203 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq001 * nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java index 48631305820..2d39b35cffc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq002 * nsk.jdi.EventRequestManager.threadStartRequests.thrstartreq002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java index 74b16c92364..9f7fd4e20cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventRequestManager.vmDeathRequests.vmdeathreq001 * nsk.jdi.EventRequestManager.vmDeathRequests.vmdeathreq001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java index c86c1fc924a..4df8391178a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.eventIterator.eventiterator001 * nsk.jdi.EventSet.eventIterator.eventiterator001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java index f314b65fd2c..10e253bd699 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.eventIterator.eventiterator002 * nsk.jdi.EventSet.eventIterator.eventiterator002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java index 36747b69c1c..5227fbecafc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.eventIterator.eventiterator003 * nsk.jdi.EventSet.eventIterator.eventiterator003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java index ed73879b4ee..9d3d3ec2a87 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.eventIterator.eventiterator004 * nsk.jdi.EventSet.eventIterator.eventiterator004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java index 15c2750af4b..7387211e10b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume001 * nsk.jdi.EventSet.resume.resume001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java index 08e73ba6c9a..34b57442c9e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume002 * nsk.jdi.EventSet.resume.resume002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java index b5b7404cedb..d9d2373f1f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume003 * nsk.jdi.EventSet.resume.resume003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java index f0dba7f7836..cd90cdacf64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume004 * nsk.jdi.EventSet.resume.resume004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java index fb4c682b8a1..1158018d287 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume005 * nsk.jdi.EventSet.resume.resume005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java index c6e5bdbb365..b1586d41dc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume006 * nsk.jdi.EventSet.resume.resume006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java index 793b1a457c0..0b5f56d37ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume007 * nsk.jdi.EventSet.resume.resume007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java index 91cde13bbb2..d090defa6af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume008 * nsk.jdi.EventSet.resume.resume008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java index 3fd35380f9e..301279c74e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume009 * nsk.jdi.EventSet.resume.resume009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java index 0d8894fd02b..3753ad08617 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume010 * nsk.jdi.EventSet.resume.resume010a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java index 7d8c1cbd122..5b9327c74fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume011 * nsk.jdi.EventSet.resume.resume011a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java index cedc665813b..e5cffe27d0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume012 * nsk.jdi.EventSet.resume.resume012a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java index ef01c8c15a8..6c15bda8a2e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.resume.resume013 * nsk.jdi.EventSet.resume.resume013a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java index 5b87848d7d1..a0ee0392371 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy001 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java index bafe08662d3..98bc4658f9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy002 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java index c01a28bdf50..8df2f1d5292 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy003 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java index 286ff0c817b..e8617c4a077 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy004 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java index 8ef7e8ee156..c2e6904cfd5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy005 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java index bfdd2e4ef8a..58559e68727 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy006 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java index 17299d99526..5a2bb9f8dc1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy007 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java index f71380e33f5..ced912d59c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy008 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java index 216d181e0e1..3203a02a320 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy009 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java index 132179cb198..bdfe413cf18 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy010 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy010a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java index b15f5dd942c..f171ea9d72e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy011 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy011a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java index d4638896ad5..aa56c14327c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy012 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy012a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java index 46517636bb9..a1495eb7a3b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy013 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy013a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java index c7984a61b8d..c058b31a9e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy014 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy014a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java index 9f485777109..1da793e065e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy015 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy015a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java index 97a5ddd9063..95a97c0d145 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy016 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy016a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java index 8a211ce5d3a..d790741299a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy017 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy017a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java index 14e47c1a3ba..402ba5d8b57 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.suspendPolicy.suspendpolicy018 * nsk.jdi.EventSet.suspendPolicy.suspendpolicy018a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java index 172c46fc1d2..19a7ec14cdf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.toString.tostring001 * nsk.jdi.EventSet.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java index 4982a4fe940..f854afce553 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.EventSet.virtualMachine.virtualmachine001 * nsk.jdi.EventSet.virtualMachine.virtualmachine001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java index 3590fd21bf5..ea8de04a131 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent001 * nsk.jdi.ExceptionEvent._itself_.exevent001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java index 1276093c2cc..b27c08e0595 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent002 * nsk.jdi.ExceptionEvent._itself_.exevent002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java index af76f1ee1f7..25c9b7d489b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent003 * nsk.jdi.ExceptionEvent._itself_.exevent003t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java index 56bd168d280..61a3bd51248 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent004 * nsk.jdi.ExceptionEvent._itself_.exevent004t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java index 85bcc6d6091..956d20dc2c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent005 * nsk.jdi.ExceptionEvent._itself_.exevent005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java index 40365a0bed6..b362536955c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent006 * nsk.jdi.ExceptionEvent._itself_.exevent006t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java index 64c33265734..d4031331e29 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent007 * nsk.jdi.ExceptionEvent._itself_.exevent007t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java index d47cecc3e18..dffb36f191b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent._itself_.exevent008 * nsk.jdi.ExceptionEvent._itself_.exevent008t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java index 2335be6dd6f..4f5d42b74ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java @@ -71,7 +71,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent.catchLocation.location001 * nsk.jdi.ExceptionEvent.catchLocation.location001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java index 14111b15adf..7a27c224ba5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent.catchLocation.location002 * nsk.jdi.ExceptionEvent.catchLocation.location002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java index 8cf5ac3621b..e99718d6a51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionEvent.exception.exception001 * nsk.jdi.ExceptionEvent.exception.exception001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java index 3e0649c7a08..9c4c93476c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest._bounds_.filters001 * nsk.jdi.ExceptionRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java index 2c3fb042c28..bd0c4e2a026 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter001 * nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java index c7a8b7f9e9f..5fedf0e0c0b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter002 * nsk.jdi.ExceptionRequest.addClassExclusionFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 07a9697475a..5c59fdaf481 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt001 * nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java index a7811270711..dbd9462b89f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt002 * nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 76123cbc4fb..fdd604e1ce6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt003 * nsk.jdi.ExceptionRequest.addClassFilter_rt.filter_rt003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java index 4c89daedbe3..3b2c0cb2e72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s001 * nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java index d0450dbf8d4..735bc03dc15 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s002 * nsk.jdi.ExceptionRequest.addClassFilter_s.filter_s002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java index 90de625a39d..eb048b4a7ec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter001 * nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java index 532b566aa5d..fc0364082c4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter002 * nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java index 3b08aef51d1..f4fd8320273 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter003 * nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java index 56ca45d14f8..1c5ebe8d96a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter004 * nsk.jdi.ExceptionRequest.addInstanceFilter.instancefilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java index 47a1eff09d6..6800b65993c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter001 * nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java index 63f455d63e4..ef8a61a6437 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter002 * nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java index 2409613aeef..2b2410a6bbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter003 * nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java index 282c3f4ec1f..447bf27793c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter004 * nsk.jdi.ExceptionRequest.addThreadFilter.threadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java index 58f006cebe4..61aaf915e38 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.exception.exception001 * nsk.jdi.ExceptionRequest.exception.exception001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java index be9faadbfe6..59c61704a2c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.notifyCaught.notifycaught001 * nsk.jdi.ExceptionRequest.notifyCaught.notifycaught001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java index 1a26cbb5b0e..34b36e22f4f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ExceptionRequest.notifyUncaught.notifyuncaught001 * nsk.jdi.ExceptionRequest.notifyUncaught.notifyuncaught001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java index 2b946ea6750..5ceb1ac11f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.equals.equals001 * nsk.jdi.Field.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java index 67f3051e3b2..c4087b22a09 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.equals.equals002 * nsk.jdi.Field.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java index aa08dbd8616..ccc1a7144d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.equals.equals003 * nsk.jdi.Field.equals.equals003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java index 88a837e492b..4b6372baaa7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.equals.equals005 * nsk.jdi.Field.equals.equals005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java index 3aa7cad3029..6bb72dea7d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.hashCode.hashcode001 * nsk.jdi.Field.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java index c281ea919b5..97c40dbc85e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.isEnumConstant.isenumconstant001 * nsk.jdi.Field.isEnumConstant.isenumconstant001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java index bdbda687c0c..54b994f79c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.isTransient.istrans001 * nsk.jdi.Field.isTransient.istrans001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java index 939938b28dd..21dd580f6a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.isVolatile.isvol001 * nsk.jdi.Field.isVolatile.isvol001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java index e7b90b955e8..d83148ad178 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.type.type001 * nsk.jdi.Field.type.type001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java index 2e77d51123a..8f333dfeed6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.type.type002 * nsk.jdi.Field.type.type002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java index 9ce8002fb33..e339089508e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.type.type003 * nsk.jdi.Field.type.type003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java index 02083132ac4..311f78983ee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.type.type004 * nsk.jdi.Field.type.type004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java index 74433feee60..455c4fb8462 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.typeName.typename001 * nsk.jdi.Field.typeName.typename001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java index c2dd8a5b17b..46a0770315f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Field.typeName.typename002 * nsk.jdi.Field.typeName.typename002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java index fe39c5c4555..9ff2d10a12c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.FloatType._itself_.floattype001 * nsk.jdi.FloatType._itself_.floattype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java index 68975481c20..d1639746adc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.FloatValue.compareTo.compareto001 * nsk.jdi.FloatValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java index e89f3e4eddd..a4e495b11c4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.FloatValue.equals.equals001 * nsk.jdi.FloatValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java index d70a83a82ec..c076a4d50e3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.FloatValue.equals.equals002 * nsk.jdi.FloatValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java index cf130bd54af..de0c844ce16 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.FloatValue.hashCode.hashcode001 * nsk.jdi.FloatValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java index 6205b5e39da..41f83b38c14 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.FloatValue.value.value001 * nsk.jdi.FloatValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java index 0c688cac2b8..41d501e8d27 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/HiddenClass/events/events001.java @@ -31,7 +31,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.HiddenClass.events.* * * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java index 7e53758b366..9d0d726efc2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.intValue.intvalue001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.intValue.intvalue001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java index f546414576b..9ca90a5b724 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.intValue.intvalue002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.intValue.intvalue002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java index ef5b8a1de3a..e4829d67ae1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.isValid.isvalid001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.isValid.isvalid001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java index 13331fa82d3..0e1d21fb55e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.isValid.isvalid002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.isValid.isvalid002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java index 2e1a1fdd946..4aeb6630531 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.isValid.isvalid003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.isValid.isvalid003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java index d500425da46..85f799fe11c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.max.max001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.max.max001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java index 3fc5ffafb1d..0c34c680b7d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.min.min001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.min.min001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java index 8b838932362..bd2c6a4823a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.setValue.setvalue001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.setValue.setvalue001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java index e6c9fb4a3b6..974795a9395 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerArgument.stringValueOf.stringvalueof001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.IntegerArgument.stringValueOf.stringvalueof001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java index 33d94667c8b..8eb47b348ee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerType._itself_.integertype001 * nsk.jdi.IntegerType._itself_.integertype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java index af0c4278bca..9135cd249c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerValue.compareTo.compareto001 * nsk.jdi.IntegerValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java index 22410cfc414..2f471504b6a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerValue.equals.equals001 * nsk.jdi.IntegerValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java index 87763456777..66754e0a22e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerValue.equals.equals002 * nsk.jdi.IntegerValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java index 79a9b9a7194..f5023eb6e46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerValue.hashCode.hashcode001 * nsk.jdi.IntegerValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java index 8b69eb255ec..e79d2c34799 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.IntegerValue.value.value001 * nsk.jdi.IntegerValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java index e9da4aa74d2..79c2af4bd03 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.InterfaceType.implementors.implementors001 * nsk.jdi.InterfaceType.implementors.implementors001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java index 7deecd14086..94c7388b156 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.InterfaceType.subinterfaces.subinterfaces001 * nsk.jdi.InterfaceType.subinterfaces.subinterfaces001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java index 10b3f987ac3..19a46d2802b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.InterfaceType.superinterfaces.superinterfaces001 * nsk.jdi.InterfaceType.superinterfaces.superinterfaces001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java index 51a5990df62..365c799b134 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LaunchingConnector.launch.launch001 * nsk.jdi.LaunchingConnector.launch.launch001o * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java index 4a4afa9c9f5..645b06acbda 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LaunchingConnector.launch.launch002 * nsk.jdi.LaunchingConnector.launch.launch002o * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java index 1f3f3dcd59a..af86d47cac6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LaunchingConnector.launch.launch003 * nsk.jdi.LaunchingConnector.launch.launch003o * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java index 20f185eaf34..3ada6d9ee53 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LaunchingConnector.launch.launch004 * nsk.jdi.LaunchingConnector.launch.launch004o * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java index b1bcb4764b1..9c7bacf1d93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java @@ -37,7 +37,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LaunchingConnector.launchnosuspend.launchnosuspend001 * nsk.jdi.LaunchingConnector.launchnosuspend.launchnosuspend001o * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java index 26f7949f5cd..958492ce5a2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.accept.accept001 * nsk.jdi.ListeningConnector.accept.accept001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java index 3c0fabf4e24..9845628bf9b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.accept.accept002 * nsk.jdi.ListeningConnector.accept.accept002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java index 8a3c75b2116..52a4c7daf1c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java @@ -37,7 +37,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.listennosuspend.listennosuspend001 * nsk.jdi.ListeningConnector.listennosuspend.listennosuspend001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java index 6257609a4d0..1abc8d75958 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.startListening.startlis001 * nsk.jdi.ListeningConnector.startListening.startlis001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java index 767b44bf92f..ce2fe65ed69 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.startListening.startlis002 * nsk.jdi.ListeningConnector.startListening.startlis002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java index 568e3e82633..bfa8c502d73 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.stopListening.stoplis001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ListeningConnector.stopListening.stoplis001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java index eb2dc321764..b2ba8c8aed6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.stopListening.stoplis002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ListeningConnector.stopListening.stoplis002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java index 7a29380ff07..5cc4cfb2a8d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ListeningConnector.supportsMultipleConnections.supportsmultipleconnections001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ListeningConnector.supportsMultipleConnections.supportsmultipleconnections001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java index 69d3cef9ebd..2f249860c3e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.equals.equals001 * nsk.jdi.LocalVariable.equals.equals001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java index 703d8ac6397..1afd1c0532c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.genericSignature.gensignature001 * nsk.jdi.LocalVariable.genericSignature.gensignature001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java index 71a54bafc88..02e6e131579 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.hashCode.hashcode001 * nsk.jdi.LocalVariable.hashCode.hashcode001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java index c75177e470c..2c846337e48 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.isArgument.isargument001 * nsk.jdi.LocalVariable.isArgument.isargument001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java index ab2189a5f3c..df5a574bbe1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.isVisible.isvisible001 * nsk.jdi.LocalVariable.isVisible.isvisible001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java index f7dbe7d9834..580cabf9cef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.name.name001 * nsk.jdi.LocalVariable.name.name001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java index 0a236ed5651..7b695f8e33c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.signature.signature001 * nsk.jdi.LocalVariable.signature.signature001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java index 56c86ce8676..fca42920bec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.toString.tostring001 * nsk.jdi.LocalVariable.toString.tostring001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java index 359372ecc81..10d2e6e2044 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.type.type001 * nsk.jdi.LocalVariable.type.type001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java index a42450a6b79..92f2d074439 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.type.type002 * nsk.jdi.LocalVariable.type.type002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java index 6bbdeec97b4..6c252ae8af7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.typeName.typename001 * nsk.jdi.LocalVariable.typeName.typename001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java index 5442089ec79..867adaeb070 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocalVariable.typeName.typename002 * nsk.jdi.LocalVariable.typeName.typename002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java index 40fe6437b0f..144ae892425 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Locatable.location.location001 * nsk.jdi.Locatable.location.location001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java index cfe0c928c94..cd3edb36ab3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Locatable.location.location002 * nsk.jdi.Locatable.location.location002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java index 3ad08939522..72f0a84e528 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Locatable.location.location003 * nsk.jdi.Locatable.location.location003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java index 1f966343f70..84aa977717d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Locatable.location.location004 * nsk.jdi.Locatable.location.location004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java index adf235f6d14..538b35f816c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Locatable.location.location005 * nsk.jdi.Locatable.location.location005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java index d440ff32f31..bbd85fe5980 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Locatable.location.location006 * nsk.jdi.Locatable.location.location006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java index adef1bd98b4..aefe5a2f18d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LocatableEvent.thread.thread001 * nsk.jdi.LocatableEvent.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java index 83f0a461dc8..290b4c24d41 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.codeIndex.codeindex001 * nsk.jdi.Location.codeIndex.codeindex001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java index 33e2c1005f9..4d50958dbb6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.declaringType.declaringtype001 * nsk.jdi.Location.declaringType.declaringtype001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java index 9e2bffb24be..84e8e14ef8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.equals.equals001 * nsk.jdi.Location.equals.equals001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java index 1560c1c1110..59073badc23 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.hashCode.hashcode001 * nsk.jdi.Location.hashCode.hashcode001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java index e9558102635..061aa3a222d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java @@ -75,7 +75,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.lineNumber.linenumber001 * nsk.jdi.Location.lineNumber.linenumber001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java index bb150d0f547..0be1c2b9f24 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.lineNumber_s.lineNumber_s002.lineNumber_s002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Location.lineNumber_s.lineNumber_s002.lineNumber_s002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java index a7671921a72..4de5cfbab51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.lineNumber_s.linenumber_s001 * nsk.jdi.Location.lineNumber_s.linenumber_s001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java index 44d69a7bef5..a49f807781e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.method.method001 * nsk.jdi.Location.method.method001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java index 6c042b13f5a..c18eaa61634 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.sourceName.sourcename001 * nsk.jdi.Location.sourceName.sourcename001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java index 4c063a7de40..56f91445d43 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.sourceName_s.sourceName_s002.sourceName_s002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Location.sourceName_s.sourceName_s002.sourceName_s002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java index 047a091f253..e531712ec30 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.sourceName_s.sourcename_s001 * nsk.jdi.Location.sourceName_s.sourcename_s001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java index 24caea48a74..19d751b2352 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.sourcePath.sourcepath001 * nsk.jdi.Location.sourcePath.sourcepath001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java index 4a826cfc083..47c82b63d24 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.sourcePath_s.sourcePath_s002.sourcePath_s002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Location.sourcePath_s.sourcePath_s002.sourcePath_s002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java index e5e64859e9c..31f8a82eaae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Location.sourcePath_s.sourcepath_s001 * nsk.jdi.Location.sourcePath_s.sourcepath_s001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java index 24e7653a3a2..e3bddbca93b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LongType._itself_.longtype001 * nsk.jdi.LongType._itself_.longtype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java index 919673a8906..6ba901f5555 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LongValue.compareTo.compareto001 * nsk.jdi.LongValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java index a79d3666841..abcc4a2e79f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LongValue.equals.equals001 * nsk.jdi.LongValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java index 301ffc4fdc4..25676aac587 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LongValue.equals.equals002 * nsk.jdi.LongValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java index 1db82d67f0e..3486c269c59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LongValue.hashCode.hashcode001 * nsk.jdi.LongValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java index d8721aab0a5..7eb0d3edbc0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.LongValue.value.value001 * nsk.jdi.LongValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java index 92a86e9a630..74d9ab3afe3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method._bounds_.bounds001 * nsk.jdi.Method._bounds_.bounds001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java index 2a9cb2abfdb..940684bf7b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java @@ -82,7 +82,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.allLineLocations.alllinelocations001 * nsk.jdi.Method.allLineLocations.alllinelocations001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java index ec92566c07e..185d9a3d7af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java @@ -82,7 +82,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.allLineLocations.alllinelocations002 * nsk.jdi.Method.allLineLocations.alllinelocations002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java index 454dd2d581e..56df88dd8bc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss002.allLineLocations_ss002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss002.allLineLocations_ss002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java index fc2f4e540bd..52a8225dd7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Method.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java index 84f588dbda8..28dcd96ca3c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java @@ -84,7 +84,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.allLineLocations_ss.alllinelocations_ss001 * nsk.jdi.Method.allLineLocations_ss.alllinelocations_ss001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java index 20966f2daad..da26dd049b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.argumentTypeNames.argumenttypenames001 * nsk.jdi.Method.argumentTypeNames.argumenttypenames001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java index e4b0a9fc161..86d73af02f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.argumentTypeNames.argumenttypenames002 * nsk.jdi.Method.argumentTypeNames.argumenttypenames002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java index 90b895f2f11..7060c5e25e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.argumentTypeNames.argumenttypenames003 * nsk.jdi.Method.argumentTypeNames.argumenttypenames003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java index 09ee5295c25..d34e2ff1361 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.argumentTypes.argumenttypes001 * nsk.jdi.Method.argumentTypes.argumenttypes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java index d9d7a4e54f5..f1f919b5e13 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.argumentTypes.argumenttypes002 * nsk.jdi.Method.argumentTypes.argumenttypes002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java index b49b15ee4dd..c947b74838a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java @@ -78,7 +78,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.arguments.arguments001 * nsk.jdi.Method.arguments.arguments001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java index 7ad9e2014b1..a6f94e944f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.arguments.arguments002 * nsk.jdi.Method.arguments.arguments002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java index f6bc95093e7..b81af28120d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.arguments.arguments003 * nsk.jdi.Method.arguments.arguments003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java index 92017b7704a..2f1fe12414d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.bytecodes.bytecodes001 * nsk.jdi.Method.bytecodes.bytecodes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java index fad91b8f4ff..349f94fb3cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.equals.equals001 * nsk.jdi.Method.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java index f9d4e477222..748eeaf052f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.hashCode.hashcode001 * nsk.jdi.Method.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java index 84eaa7f869c..c12f51d6b0a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isAbstract.isabstract001 * nsk.jdi.Method.isAbstract.isabstract001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java index c655217daad..345fc0caacd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isBridge.isbridge001 * nsk.jdi.Method.isBridge.isbridge001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java index 9f010909138..90321642eaf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isConstructor.isconstructor001 * nsk.jdi.Method.isConstructor.isconstructor001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java index 2604ebf0467..c12d36a5cb5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isNative.isnative001 * nsk.jdi.Method.isNative.isnative001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java index 146d766c4b3..5ab780e1f33 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java @@ -71,7 +71,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isObsolete.isobsolete001 * nsk.jdi.Method.isObsolete.isobsolete001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java index 7e9e242e8c1..9bbba8955f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isObsolete.isobsolete002 * nsk.jdi.Method.isObsolete.isobsolete002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java index 492609bc797..d3ecdf2f669 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java @@ -85,7 +85,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isObsolete.isobsolete003 * nsk.jdi.Method.isObsolete.isobsolete003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java index 9f275d1ab48..0ef6d68ff87 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isStaticInitializer.isstinitializer001 * nsk.jdi.Method.isStaticInitializer.isstinitializer001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java index 3e8f9d36eb4..60022552f54 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isSynchronized.issynchronized001 * nsk.jdi.Method.isSynchronized.issynchronized001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java index 77491f47832..4594858edfe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.isVarArgs.isvarargs001 * nsk.jdi.Method.isVarArgs.isvarargs001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java index 369c7017b06..6feb10ba223 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.locationOfCodeIndex.locationofcodeindex001 * nsk.jdi.Method.locationOfCodeIndex.locationofcodeindex001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java index 1f649e3c15b..20375892218 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java @@ -81,7 +81,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.locationsOfLine.locationsofline001 * nsk.jdi.Method.locationsOfLine.locationsofline001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java index 7b322342862..4a5e84fb256 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi002.locationsOfLine_ssi002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi002.locationsOfLine_ssi002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java index eed8d4daeb0..d48f47981dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Method.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java index 124556bee7e..62f036e98c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java @@ -79,7 +79,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.locationsOfLine_ssi.locationsofline_ssi001 * nsk.jdi.Method.locationsOfLine_ssi.locationsofline_ssi001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java index e768300f117..afefcbae510 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.returnType.returntype001 * nsk.jdi.Method.returnType.returntype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java index a1f0548330b..c8dfa50f237 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.returnType.returntype002 * nsk.jdi.Method.returnType.returntype002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java index 1bf496f6848..f42f5b1ea9d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.returnType.returntype003 * nsk.jdi.Method.returnType.returntype003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java index 37661340741..68c98d06674 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.returnTypeNames.returntypenames001 * nsk.jdi.Method.returnTypeNames.returntypenames001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java index b5d06a4d412..6279f286729 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.returnTypeNames.returntypenames002 * nsk.jdi.Method.returnTypeNames.returntypenames002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java index d6292e90679..99628d5e338 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.returnTypeNames.returntypenames003 * nsk.jdi.Method.returnTypeNames.returntypenames003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java index 8e1686881e4..d752d0f6fa2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java @@ -83,7 +83,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.variables.variables001 * nsk.jdi.Method.variables.variables001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java index 34ee0591209..39cd63e46b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.variables.variables002 * nsk.jdi.Method.variables.variables002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java index ecc2d2185b0..c1cfb1caef3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.variablesByName.variablesbyname001 * nsk.jdi.Method.variablesByName.variablesbyname001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java index 5d8d998499f..a0bd75f94d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Method.variablesByName.variablesbyname002 * nsk.jdi.Method.variablesByName.variablesbyname002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java index 7247800ee3a..896e3e2a277 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryEvent.method.method001 * nsk.jdi.MethodEntryEvent.method.method001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java index 6fcead6f690..e425785de86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryEvent.method.method002 * nsk.jdi.MethodEntryEvent.method.method002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java index fbcfb57c21b..6fb01690f97 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest._bounds_.filters001 * nsk.jdi.MethodEntryRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java index 17d13398f21..80704a47847 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter001 * nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java index cc5d535c435..ec2a2b3b018 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter002 * nsk.jdi.MethodEntryRequest.addClassExclusionFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java index f384c53118b..9de2dcefad3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt001 * nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 65759c1d8cc..14ac096b3fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt002 * nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java index dfb4f300e3f..dc71888570b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt003 * nsk.jdi.MethodEntryRequest.addClassFilter_rt.filter_rt003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java index 6b87bfb6a19..6158593d167 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s001 * nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java index d9be1a6e2f6..a0b6f29c9ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s002 * nsk.jdi.MethodEntryRequest.addClassFilter_s.filter_s002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java index 62f41a796cc..0a324bb7da6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter001 * nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java index 87e81c3cedd..d7272d61ba5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter002 * nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java index 116e4fac9a1..4b70bd8cefa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter003 * nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java index c177ac20b85..cc0e5cc09db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter004 * nsk.jdi.MethodEntryRequest.addInstanceFilter.instancefilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java index c8adc9bf511..6988bbd4e18 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter001 * nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java index 37f2a05e3ec..ed3a0c484fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter002 * nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java index 18b275cdfed..6ff739907f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter003 * nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java index 7ffe3d410d2..5b6d4c50da7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter004 * nsk.jdi.MethodEntryRequest.addThreadFilter.threadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java index 67d08ab7c7b..c3aee3e2906 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent._itself_.methodexit001 * nsk.jdi.MethodExitEvent._itself_.methodexit001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java index 0ca6a2d5215..10940a93e8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java @@ -79,7 +79,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent.method.method001 * nsk.jdi.MethodExitEvent.method.method001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java index a424c05e417..bdf23268e07 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent.method.method002 * nsk.jdi.MethodExitEvent.method.method002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java index 9cc8f688eb2..32f9035b124 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent.returnValue.returnValue001.returnValue001 * nsk.jdi.MethodExitEvent.returnValue.returnValue001.returnValue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java index c4c48f27541..68742198fdd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java @@ -34,7 +34,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent.returnValue.returnValue002.returnValue002 * nsk.jdi.MethodExitEvent.returnValue.returnValue002.returnValue002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java index 4ea32650b4d..a37f9dda9f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent.returnValue.returnValue003.returnValue003 * nsk.jdi.MethodExitEvent.returnValue.returnValue003.returnValue003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java index bda5f045d32..e1bc1455f8f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitEvent.returnValue.returnValue004.returnValue004 * nsk.jdi.MethodExitEvent.returnValue.returnValue004.returnValue004a * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java index d2b20b92321..4a8db463085 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest._bounds_.filters001 * nsk.jdi.MethodExitRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java index b4fdf076ebb..2fec065274b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter001 * nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java index f2a8fc161af..01206e61563 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter002 * nsk.jdi.MethodExitRequest.addClassExclusionFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 1c982f9a78f..4781991d333 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt001 * nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java index f306f68a81d..81b1173626a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt002 * nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 15be6901d6e..dbb423bc425 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt003 * nsk.jdi.MethodExitRequest.addClassFilter_rt.filter_rt003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java index 43fc975b5d2..e00e2b3ffba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s001 * nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java index 6081a9081f9..483fbcbcc1e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s002 * nsk.jdi.MethodExitRequest.addClassFilter_s.filter_s002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java index 7fce1e89b96..aa4a832d98c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter001 * nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java index de290d9c81f..911e0fe2b87 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter002 * nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java index 3508c4144db..bcf34ce2347 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter003 * nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java index 31b3a5c5435..d6039bc5056 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter004 * nsk.jdi.MethodExitRequest.addInstanceFilter.instancefilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java index 9bac1b8193c..1661c717c11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter001 * nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java index f081f9aee4a..2c7007c3846 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter002 * nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java index b054bc5b849..1a396f7944d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter003 * nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java index 761b44f8d28..094e2fffc4b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter004 * nsk.jdi.MethodExitRequest.addThreadFilter.threadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java index 2d20b515c2d..9cc5d25898f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Mirror.hashCode.hashcode001 * nsk.jdi.Mirror.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java index ea492190ca0..c22d01bea6f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Mirror.toString.tostring001 * nsk.jdi.Mirror.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java index 5f61e97c8e9..4ef249c6b44 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Mirror.virtualMachine.virtualmachine001 * nsk.jdi.Mirror.virtualMachine.virtualmachine001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java index 4e27dd7c028..a84b7c650cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ModificationWatchpointEvent._itself_.mwevent001 * nsk.jdi.ModificationWatchpointEvent._itself_.mwevent001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java index 389f9c07069..dbcf25905c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe001 * nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java index f014d42c4fc..d96f56ae1ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java @@ -75,7 +75,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe002 * nsk.jdi.ModificationWatchpointEvent.valueToBe.valuetobe002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java index cf11d277c63..131c4d7c615 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java index 4f83a7a988c..254b094ed0d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java index 869ef79e9de..3c85e2fa0a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java index 1b4d3f7df73..6091d77e1f4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java index d31fe007efd..a082f7a3b6c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java index 9b30671d1b4..c8cee915bdc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java index add52592e1c..c8d9511fb7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java index 48e2c7c9aec..b08ccbc1efc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java index 40f79f602a9..d6fd92d201a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java index 5ebb02ba864..652b71bd0a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java index acee5e56f30..33fc47ce8bc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java index 56332be7c90..ab50a55ad56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java index eed3043adf1..43e970993b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java index b9d33103468..7ac9cfa633d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java index d473c5bd759..fc1c9ff43d6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java index 909ac3d3722..bf3cf523269 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java index e4481bc19f6..2971c3b989b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java index e842cfc4ac8..8a19fe1107d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java index dba00008f11..44184a8c0f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java index f4f563d1664..483d8bfd661 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java index 82ad25df977..840dce2cac8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java index f4e14c8d471..f67e525e601 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java index e82c3404459..c82cf748474 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java index adcc36367c1..11db5a5b6aa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java index 887786e8de6..a150c3b8cf6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java index fab801125a3..d29fb86b823 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java index badd630eab2..114c14a15c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java index f5f2727a35e..7c5ada839e4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java index 33de989cf1c..c7824a361d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference._bounds_.bounds001 * nsk.jdi.ObjectReference._bounds_.bounds001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java index da950db3f88..9d8e0391ff2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference._bounds_.bounds002 * nsk.jdi.ObjectReference._bounds_.bounds002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java index 6cc8a38ac3a..eeb7a778f55 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference._bounds_.bounds003 * nsk.jdi.ObjectReference._bounds_.bounds003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java index 76b5636d651..5aa7fbb4a57 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.disableCollection.disablecollection001 * nsk.jdi.ObjectReference.disableCollection.disablecollection001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java index 76d50160651..35d4394877d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java @@ -73,7 +73,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.disableCollection.disablecollection002 * nsk.jdi.ObjectReference.disableCollection.disablecollection002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java index ec8f33ffbde..62c3f67891f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.entryCount.entrycount001 * nsk.jdi.ObjectReference.entryCount.entrycount001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java index 8af1f3823d6..f4b3bdccd88 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.entryCount.entrycount002 * nsk.jdi.ObjectReference.entryCount.entrycount002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java index ddd77b2a1d5..285f40ae4a2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.equals.equals001 * nsk.jdi.ObjectReference.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java index e4872f8f31d..2d63065ecf6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValue.getvalue001 * nsk.jdi.ObjectReference.getValue.getvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java index a67ce38b5a7..e598ee06b49 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValue.getvalue002 * nsk.jdi.ObjectReference.getValue.getvalue002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java index 54218cd2e57..68a3d6b0709 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValue.getvalue003 * nsk.jdi.ObjectReference.getValue.getvalue003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java index c5762cf87b5..f2163501c7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValue.getvalue004 * nsk.jdi.ObjectReference.getValue.getvalue004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java index 157e11b5d07..f81d7d023c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValues.getvalues001 * nsk.jdi.ObjectReference.getValues.getvalues001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java index 0a29af3cbcf..64ea4073829 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java @@ -71,7 +71,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValues.getvalues002 * nsk.jdi.ObjectReference.getValues.getvalues002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java index 30b88917f7d..425a5b7c7c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.getValues.getvalues003 * nsk.jdi.ObjectReference.getValues.getvalues003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java index 35b554bfad8..40a018074a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.hashCode.hashcode001 * nsk.jdi.ObjectReference.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java index 590bff95904..b2c4f38c3e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod001 * nsk.jdi.ObjectReference.invokeMethod.invokemethod001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java index 67c1d8bccc7..90b1b9f5522 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod002 * nsk.jdi.ObjectReference.invokeMethod.invokemethod002t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java index aa4929a277a..b0b8966cddf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod003 * nsk.jdi.ObjectReference.invokeMethod.invokemethod003t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java index 174544fcd97..28ce6378cd9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod004 * nsk.jdi.ObjectReference.invokeMethod.invokemethod004t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java index 1f5ea6f5b0c..80d0aeb90b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod005 * nsk.jdi.ObjectReference.invokeMethod.invokemethod005t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java index 3fa2a5519eb..c597c279167 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006/TestDescription.java @@ -41,7 +41,6 @@ * @modules jdk.jdi/com.sun.tools.jdi:open * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod006 * nsk.jdi.ObjectReference.invokeMethod.invokemethod006t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java index e1b96d9b18f..d6c60724b2f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod007 * nsk.jdi.ObjectReference.invokeMethod.invokemethod007t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java index 3767883a5ee..d732d7d58fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod008 * nsk.jdi.ObjectReference.invokeMethod.invokemethod008t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java index 271ac0c1400..6a4f9c9de86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod009 * nsk.jdi.ObjectReference.invokeMethod.invokemethod009t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java index 6bad2838d67..ca2d43a1eae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod010 * nsk.jdi.ObjectReference.invokeMethod.invokemethod010t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java index 1ddc164cbf7..561ed4d9fe4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod011 * nsk.jdi.ObjectReference.invokeMethod.invokemethod011t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java index ae25a93fa66..1420fda081b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod012 * nsk.jdi.ObjectReference.invokeMethod.invokemethod012t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java index 780316eaaa2..c9f9fb4c7a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod013 * nsk.jdi.ObjectReference.invokeMethod.invokemethod013t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java index 179edd23e71..cb660a1108d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.invokeMethod.invokemethod014 * nsk.jdi.ObjectReference.invokeMethod.invokemethod014t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java index 324c69df88f..42355e76e61 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.isCollected.iscollected001 * nsk.jdi.ObjectReference.isCollected.iscollected001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java index 1ce3ad1ae90..ab9ab2dd09f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.owningThread.owningthread001 * nsk.jdi.ObjectReference.owningThread.owningthread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java index 118ee585dba..4eea3cb35ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.owningThread.owningthread002 * nsk.jdi.ObjectReference.owningThread.owningthread002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java index 5337a88cab2..2e0490006eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype001 * nsk.jdi.ObjectReference.referenceType.referencetype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java index a99bb0e6c34..8373554353e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype002 * nsk.jdi.ObjectReference.referenceType.referencetype002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java index 56ab485830a..24c41ab159d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype003 * nsk.jdi.ObjectReference.referenceType.referencetype003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java index 7f3bcc418d2..6cf450b5281 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype004 * nsk.jdi.ObjectReference.referenceType.referencetype004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java index 5f9dbd373d5..8551c94b72a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype005 * nsk.jdi.ObjectReference.referenceType.referencetype005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java index 95d1241011a..10b9349c8c0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype006 * nsk.jdi.ObjectReference.referenceType.referencetype006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java index 1f81fde500a..c4204f2b4cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referenceType.referencetype007 * nsk.jdi.ObjectReference.referenceType.referencetype007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java index 05210730320..678fb11fd13 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java @@ -55,7 +55,6 @@ * @requires !vm.graal.enabled * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referringObjects.referringObjects001.referringObjects001 * nsk.share.jdi.TestClass1 * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java index e9a23384a62..b92e9aea49e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java @@ -53,7 +53,6 @@ * @requires vm.opt.final.ClassUnloading * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referringObjects.referringObjects002.referringObjects002 * nsk.jdi.ObjectReference.referringObjects.referringObjects002.referringObjects002a * nsk.share.jdi.TestClass1 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java index 840434916e6..a5a015b5d68 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java @@ -55,7 +55,6 @@ * @requires !vm.graal.enabled * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referringObjects.referringObjects003.referringObjects003 * nsk.jdi.ObjectReference.referringObjects.referringObjects003.referringObjects003a * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java index 24b4d6e0d35..911707d4cda 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.referringObjects.referringObjects004.referringObjects004 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ObjectReference.referringObjects.referringObjects004.referringObjects004 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java index 93d77facee2..b55ef19604c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java @@ -84,7 +84,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.setValue.setvalue001 * nsk.jdi.ObjectReference.setValue.setvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java index 3769c021718..c63b85d7466 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.setValue.setvalue002 * nsk.jdi.ObjectReference.setValue.setvalue002t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java index 7347d479bd0..77d8542194c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.setValue.setvalue003 * nsk.jdi.ObjectReference.setValue.setvalue003t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java index be98d4999e2..cf4cc6448a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java @@ -38,7 +38,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.setValue.setvalue004 * nsk.jdi.ObjectReference.setValue.setvalue004t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java index 0f0b8b4c16c..8d46a2f2a9c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.setValue.setvalue005 * nsk.jdi.ObjectReference.setValue.setvalue005t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java index 91d89ed8013..0736b815aae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.uniqueID.uniqueid001 * nsk.jdi.ObjectReference.uniqueID.uniqueid001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java index c7af5d87720..942a9848a74 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java @@ -73,7 +73,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads001 * nsk.jdi.ObjectReference.waitingThreads.waitingthreads001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java index 44b4640640a..e0596320742 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads002 * nsk.jdi.ObjectReference.waitingThreads.waitingthreads002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java index 5b370f257de..d1b63bcab81 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads003 * nsk.jdi.ObjectReference.waitingThreads.waitingthreads003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java index 73d3f0af2fd..36cb71e69f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ObjectReference.waitingThreads.waitingthreads004 * nsk.jdi.ObjectReference.waitingThreads.waitingthreads004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java index 521033c2e63..360fedadef3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PathSearchingVirtualMachine.baseDirectory.directory001 * nsk.jdi.PathSearchingVirtualMachine.baseDirectory.directory001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java index 899557ebe88..b3eafd056bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PathSearchingVirtualMachine.bootClassPath.bootpath001 * nsk.jdi.PathSearchingVirtualMachine.bootClassPath.bootpath001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java index 64c8119953f..05aab5b402c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PathSearchingVirtualMachine.classPath.classpath001 * nsk.jdi.PathSearchingVirtualMachine.classPath.classpath001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java index 3c1999d31e6..e598ec75821 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.AttachConnector.plugAttachConnect001.plugAttachConnect001 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java index 069a12aa7e7..675f3b82847 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.AttachConnector.plugAttachConnect002.plugAttachConnect002 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java index 86e5db26754..f1a6e989c11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.AttachConnector.plugAttachConnect003.plugAttachConnect003 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java index 6a14a703b51..46d6377bd34 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.LaunchConnector.plugLaunchConnect001.plugLaunchConnect001 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java index d1857f44d6c..da59e66fca1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.LaunchConnector.plugLaunchConnect002.plugLaunchConnect002 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java index d709b531b70..4636ae35eb2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.LaunchConnector.plugLaunchConnect003.plugLaunchConnect003 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java index 8042bf4e752..e387db1ae0b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.ListenConnector.plugListenConnect001.plugListenConnect001 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java index 342fc7e3e74..8c7cbccab5a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.ListenConnector.plugListenConnect002.plugListenConnect002 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java index 4977185d81a..adcab7d9311 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.ListenConnector.plugListenConnect003.plugListenConnect003 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java index fc596d20273..43e4199c7ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.MultiConnectors.plugMultiConnect001.plugMultiConnect001 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java index 1991b01d9cb..07491942d46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.MultiConnectors.plugMultiConnect002.plugMultiConnect002 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java index e8cffb3db36..81703a82084 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.MultiConnectors.plugMultiConnect003.plugMultiConnect003 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java index ef25a332f80..902a7ab1bf1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java @@ -89,7 +89,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.MultiConnectors.plugMultiConnect004.plugMultiConnect004 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java index a4c6c480e5f..8d7d695d383 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java @@ -90,7 +90,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.MultiConnectors.plugMultiConnect005.plugMultiConnect005 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java index a203a2e51e7..793c5da39f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java @@ -102,7 +102,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.MultiConnectors.plugMultiConnect006.plugMultiConnect006 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java index e1d197a5841..b6402040b30 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.TransportService.transportService001.transportService001 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java index 2f0d06baa29..9eeed2efc89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.TransportService.transportService002.transportService002 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java index 18efd2f49a5..19f546a6199 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PlugConnectors.TransportService.transportService003.transportService003 * * @comment build connectors.jar to jars diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java index 813907006d6..f787c725efe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveType._itself_.primitivetype001 * nsk.jdi.PrimitiveType._itself_.primitivetype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java index a126046dac8..5118890fc9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.booleanValue.booleanvalue001 * nsk.jdi.PrimitiveValue.booleanValue.booleanvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java index 5bab73bcaf7..0bef35a6667 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.byteValue.bytevalue001 * nsk.jdi.PrimitiveValue.byteValue.bytevalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java index ad5c01a3acf..cf021d4ae91 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.charValue.charvalue001 * nsk.jdi.PrimitiveValue.charValue.charvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java index 40f6c794c4c..3014b9a715e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.doubleValue.doublevalue001 * nsk.jdi.PrimitiveValue.doubleValue.doublevalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java index d6d89194195..6d5817ff558 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.doubleValue.doublevalue002 * nsk.jdi.PrimitiveValue.doubleValue.doublevalue002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java index 096e6703b96..d17b2ff0a3c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.floatValue.floatvalue001 * nsk.jdi.PrimitiveValue.floatValue.floatvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java index 1b615978966..e52a7e7ec94 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.intValue.intvalue001 * nsk.jdi.PrimitiveValue.intValue.intvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java index 55cfeaab5b2..632d805da2a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.longValue.longvalue001 * nsk.jdi.PrimitiveValue.longValue.longvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java index 5e704d5c639..086ee775f45 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.PrimitiveValue.shortValue.shortvalue001 * nsk.jdi.PrimitiveValue.shortValue.shortvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java index 1f838b5a864..bb31cd554ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType._bounds_.bounds001 * nsk.jdi.ReferenceType._bounds_.bounds001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java index 8710dda7622..560e5ca207b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType._bounds_.bounds002 * nsk.jdi.ReferenceType._bounds_.bounds002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java index 502dcfd2184..5443c3caf56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allFields.allfields001 * nsk.jdi.ReferenceType.allFields.allfields001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java index 5131effb152..5d1df7f4e44 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allFields.allfields002 * nsk.jdi.ReferenceType.allFields.allfields002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java index 90a04a201fc..2129c34a802 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allFields.allfields003 * nsk.jdi.ReferenceType.allFields.allfields003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java index f924e11aab5..183902f17e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allFields.allfields004 * nsk.jdi.ReferenceType.allFields.allfields004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java index 5bef18199d9..5bb39520565 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allFields.allfields005 * nsk.jdi.ReferenceType.allFields.allfields005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java index 903476d2ec6..5b5fc31c179 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allFields.allfields006 * nsk.jdi.ReferenceType.allFields.allfields006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java index 729b38148f7..9fd44d2a0dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allLineLocations.alllinelocations001 * nsk.jdi.ReferenceType.allLineLocations.alllinelocations001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java index 7e243a5ec5a..8edbc5e47be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allLineLocations.alllinelocations002 * nsk.jdi.ReferenceType.allLineLocations.alllinelocations002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java index 8ffa48c2cee..17591879b62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss003.allLineLocations_ss003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java index 1df8bd172fc..e59a5d5fe67 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss004.allLineLocations_ss004 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.allLineLocations_ss.allLineLocations_ss004.allLineLocations_ss004 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java index bfc3acbb311..251e8ba4685 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java @@ -86,7 +86,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss001 * nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java index 6b3367503c5..0a7024840cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss002 * nsk.jdi.ReferenceType.allLineLocations_ss.alllinelocations_ss002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java index 75ee3609d46..109167a0152 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allMethods.allmethods001 * nsk.jdi.ReferenceType.allMethods.allmethods001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java index 33e41215d2b..e83da13c2a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allMethods.allmethods002 * nsk.jdi.ReferenceType.allMethods.allmethods002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java index 72d1eda4c95..f5bc07f2243 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allMethods.allmethods003 * nsk.jdi.ReferenceType.allMethods.allmethods003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java index 08b899b7ed3..df9ab2462d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allMethods.allmethods004 * nsk.jdi.ReferenceType.allMethods.allmethods004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java index cb713a56e93..56efb2ca125 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allMethods.allmethods005 * nsk.jdi.ReferenceType.allMethods.allmethods005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java index 59c881b5bba..1fab784fb8f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.allMethods.allmethods006 * nsk.jdi.ReferenceType.allMethods.allmethods006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java index e3082692338..f354bac7816 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java @@ -36,7 +36,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.availableStrata.availableStrata002.availableStrata002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.availableStrata.availableStrata002.availableStrata002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java index 46071c73951..dc647a97599 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.availableStrata.availablestrata001 * nsk.jdi.ReferenceType.availableStrata.availablestrata001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java index 6383b112fdc..09f29b1e1f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.classLoader.classloader001 * nsk.jdi.ReferenceType.classLoader.classloader001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java index 2eb623dea91..a4ba109b317 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.classObject.classobj001 * nsk.jdi.ReferenceType.classObject.classobj001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java index 452d515cd45..423e9a8619d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.classObject.classobj002 * nsk.jdi.ReferenceType.classObject.classobj002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java index 38a811f7472..100578a4d99 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.classObject.classobj003 * nsk.jdi.ReferenceType.classObject.classobj003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java index a113464e364..fe2afac0129 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.defaultStratum.defaultStratum002.defaultStratum002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.defaultStratum.defaultStratum002.defaultStratum002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java index 9b2d3a8172d..bd48bed9dd3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.defaultStratum.defaultStratum003.defaultStratum003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.defaultStratum.defaultStratum003.defaultStratum003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java index 9c49323d794..93c7180f43a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.defaultStratum.defaultStratum004.defaultStratum004 * nsk.jdi.ReferenceType.defaultStratum.defaultStratum004.defaultStratum004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java index fbfdf9f77e4..004e6e75345 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.defaultStratum.defaultstratum001 * nsk.jdi.ReferenceType.defaultStratum.defaultstratum001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java index 6a224401634..38d2e304a62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.equals.equals001 * nsk.jdi.ReferenceType.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java index f12ae326a01..7db8068fe86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.equals.equals002 * nsk.jdi.ReferenceType.equals.equals002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java index 8a59348a7a6..50fba1910d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.failedToInitialize.failedToInitialize001 * nsk.jdi.ReferenceType.failedToInitialize.failedToInitialize001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java index 8733d5d745f..1efa219a5f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.failedToInitialize.failedtoinit002 * nsk.jdi.ReferenceType.failedToInitialize.failedtoinit002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java index 4e96ca54cb9..94ac65a3101 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fieldByName.fieldbyname001 * nsk.jdi.ReferenceType.fieldByName.fieldbyname001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java index 9f2809dfbbc..d384abd467d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fieldByName.fieldbyname002 * nsk.jdi.ReferenceType.fieldByName.fieldbyname002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java index 89b1897ec1c..5be043795b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fieldByName.fieldbyname003 * nsk.jdi.ReferenceType.fieldByName.fieldbyname003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java index c4d99fe44df..9d6ac4b6e05 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fields.fields001 * nsk.jdi.ReferenceType.fields.fields001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java index 645963209e0..b8f99cde6eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fields.fields002 * nsk.jdi.ReferenceType.fields.fields002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java index 94403888b70..3aa9cb3bae9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fields.fields003 * nsk.jdi.ReferenceType.fields.fields003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java index e8e2a672c23..932376bceb7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fields.fields004 * nsk.jdi.ReferenceType.fields.fields004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java index 056d4085259..0ad34a01c47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fields.fields005 * nsk.jdi.ReferenceType.fields.fields005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java index 99d4c68c9a8..9b00c9b24ed 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.fields.fields006 * nsk.jdi.ReferenceType.fields.fields006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java index e336e3540d5..92b1f19b543 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.genericSignature.genericSignature001 * nsk.jdi.ReferenceType.genericSignature.genericSignature001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java index ef37114b303..012b1836c59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.genericSignature.genericSignature002 * nsk.jdi.ReferenceType.genericSignature.genericSignature002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java index 0c503afd2d8..f72735ca89f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValue.getvalue001 * nsk.jdi.ReferenceType.getValue.getvalue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java index 5510da282e0..89f00dced83 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValue.getvalue002 * nsk.jdi.ReferenceType.getValue.getvalue002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java index d2a22dfc0d7..17e6776c3bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValue.getvalue003 * nsk.jdi.ReferenceType.getValue.getvalue003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java index 4d1d2f017fa..8edb49a69a1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValue.getvalue004 * nsk.jdi.ReferenceType.getValue.getvalue004t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java index 4442c8753eb..65edc4b7667 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValue.getvalue005 * nsk.jdi.ReferenceType.getValue.getvalue005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java index 50487616499..4cea22b58cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValues.getvalues001 * nsk.jdi.ReferenceType.getValues.getvalues001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java index a50dcc4adc9..8d1822116cd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValues.getvalues002 * nsk.jdi.ReferenceType.getValues.getvalues002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java index d21d135747a..89268de966c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.getValues.getvalues003 * nsk.jdi.ReferenceType.getValues.getvalues003t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java index 319e9c1d340..dc49f7b114f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.hashCode.hashcode001 * nsk.jdi.ReferenceType.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java index 773248bc99e..39d9372f159 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.hashCode.hashcode002 * nsk.jdi.ReferenceType.hashCode.hashcode002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java index 25a9f7b6c7f..e04ee2bb906 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java @@ -55,7 +55,6 @@ * @requires !vm.graal.enabled * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.instances.instances001.instances001 * nsk.share.jdi.TestClass1 * nsk.share.jdi.TestClass2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java index 0add545640c..16cbc9580a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java @@ -37,7 +37,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.instances.instances002.instances002 * nsk.jdi.ReferenceType.instances.instances002.instances002a * nsk.share.jdi.TestClass1 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java index 86f062819b4..6faf64b17ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java @@ -44,7 +44,6 @@ * @requires vm.gc != "Z" * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.instances.instances003.instances003 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ReferenceType.instances.instances003.instances003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java index a642a73d031..ea731be7aeb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.instances.instances003.instances003 * nsk.share.jdi.TestClass1 * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java index 254d7da40c6..be5dd8507d6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.instances.instances005.instances005 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ReferenceType.instances.instances005.instances005 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java index e13b3eb03ae..c778e3c44a2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isAbstract.isAbstract001 * nsk.jdi.ReferenceType.isAbstract.isAbstract001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java index 1e8c367c499..8509546105c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isAbstract.isabstract002 * nsk.jdi.ReferenceType.isAbstract.isabstract002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java index 91a409c3b74..5ce25e6efee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isAbstract.isabstract003 * nsk.jdi.ReferenceType.isAbstract.isabstract003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java index 5c67dac8a05..d4f435387aa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isFinal.isfinal001 * nsk.jdi.ReferenceType.isFinal.isfinal001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java index 31c664cfc46..41deb88c8bc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isFinal.isfinal002 * nsk.jdi.ReferenceType.isFinal.isfinal002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java index 8883ec0f669..2652ac847d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isInitialized.isinit001 * nsk.jdi.ReferenceType.isInitialized.isinit001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java index 67bf1361996..463bf754891 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isInitialized.isinit002 * nsk.jdi.ReferenceType.isInitialized.isinit002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java index 17cb719451e..215ffb6b56e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isInitialized.isinit003 * nsk.jdi.ReferenceType.isInitialized.isinit003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java index 9531602aef3..9ffe6687321 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isPrepared.isprepared001 * nsk.jdi.ReferenceType.isPrepared.isprepared001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java index 1bbfdaca90d..dcf0c3481c7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isPrepared.isprepared002 * nsk.jdi.ReferenceType.isPrepared.isprepared002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java index aaa68a69c12..4df25d92c6b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isStatic.isstatic001 * nsk.jdi.ReferenceType.isStatic.isstatic001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java index 8743a535b71..00dca767977 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isStatic.isstatic002 * nsk.jdi.ReferenceType.isStatic.isstatic002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java index 8b89469aad9..0c75595477f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isVerified.isVerified001 * nsk.jdi.ReferenceType.isVerified.isVerified001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java index 1a080095516..e7f2a797d19 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isVerified.isverified002 * nsk.jdi.ReferenceType.isVerified.isverified002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java index 24cf76e1a3b..bd03a5e9f0d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.isVerified.isverified003 * nsk.jdi.ReferenceType.isVerified.isverified003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java index 40ec864d198..0cd520f3fa2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i001 * nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java index a40441dfa76..94b79e3dd8f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i002 * nsk.jdi.ReferenceType.locationsOfLine_i.locationsofline_i002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java index b195b190066..7fe631a0167 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi003.locationsOfLine_ssi003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java index b684cdac6f6..8aaf3d30c3b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi004.locationsOfLine_ssi004 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsOfLine_ssi004.locationsOfLine_ssi004 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java index e3a62d9f6dd..0e2df8f6439 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java @@ -81,7 +81,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi001 * nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java index 36910437b6d..672af5183c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi002 * nsk.jdi.ReferenceType.locationsOfLine_ssi.locationsofline_ssi002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java index c9772fbbb0f..021857b46fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methods.methods001 * nsk.jdi.ReferenceType.methods.methods001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java index cb1c5027693..f08bd7e0021 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methods.methods002 * nsk.jdi.ReferenceType.methods.methods002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java index c116365710b..55d95a7f394 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methods.methods003 * nsk.jdi.ReferenceType.methods.methods003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java index 604af2f7ce3..b8b726c51ed 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methods.methods004 * nsk.jdi.ReferenceType.methods.methods004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java index 1be16b12d33..e011ffbcbea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java @@ -40,7 +40,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methods.methods005 * nsk.jdi.ReferenceType.methods.methods005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java index 7a8b5932e64..a89f0f7c205 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methods.methods006 * nsk.jdi.ReferenceType.methods.methods006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java index 76860a8d3da..15bcb13b083 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_s.methbyname_s001 * nsk.jdi.ReferenceType.methodsByName_s.methbyname_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java index 6abe10bc7ac..a2d094455ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_s.methbyname_s002 * nsk.jdi.ReferenceType.methodsByName_s.methbyname_s002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java index 48e1e95a298..6781a30aa19 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_s.methbyname_s003 * nsk.jdi.ReferenceType.methodsByName_s.methbyname_s003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java index 6cb60aa15dc..96d661cb9ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_s.methbyname_s004 * nsk.jdi.ReferenceType.methodsByName_s.methbyname_s004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java index d0d2131647d..070a5eaa724 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss001 * nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java index 304d73e4797..679c846d4df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss002 * nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java index 83d2ac55077..88cc50defa7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss003 * nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java index 600154862b7..b638bcbc521 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.name.name001 * nsk.jdi.ReferenceType.name.name001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java index 8fcb1d9fab8..656eb99f00a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.name.name002 * nsk.jdi.ReferenceType.name.name002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java index 0dbd66697cc..a046eed0e9c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.nestedTypes.nestedtypes001 * nsk.jdi.ReferenceType.nestedTypes.nestedtypes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java index ba442df440e..af7962ea5df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.nestedTypes.nestedtypes002 * nsk.jdi.ReferenceType.nestedTypes.nestedtypes002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java index 8466eab558b..0134134294c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java @@ -38,7 +38,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx001 * nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx001t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java index 5aa7a1ddef6..15132559f55 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx002 * nsk.jdi.ReferenceType.sourceDebugExtension.srcdebugx002t * @compile srcdebugx002x.jcod diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java index 65463387a15..17023ce6432 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceName.sourcename001 * nsk.jdi.ReferenceType.sourceName.sourcename001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java index e9fab4d3755..dd0fc1cf1a6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceName.sourcename002 * nsk.jdi.ReferenceType.sourceName.sourcename002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java index a243d9ef162..66396fff8e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceName.sourcename003 * nsk.jdi.ReferenceType.sourceName.sourcename003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java index e8deac8c49f..433a5f4ec8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceName.sourcename004 * nsk.jdi.ReferenceType.sourceName.sourcename004t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java index 21b0ec128de..690bb2da649 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java @@ -36,7 +36,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceNames.sourceNames003.sourceNames003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.sourceNames.sourceNames003.sourceNames003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java index 45b53cbf670..c630b6386bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java @@ -76,7 +76,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceNames.sourcenames001 * nsk.jdi.ReferenceType.sourceNames.sourcenames001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java index 29c3ae3cf76..7bb9a62201d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourceNames.sourcenames002 * nsk.jdi.ReferenceType.sourceNames.sourcenames002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java index 049d8e77a9c..8ca686f5209 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java @@ -36,7 +36,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourcePaths.sourcePaths003.sourcePaths003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ReferenceType.sourcePaths.sourcePaths003.sourcePaths003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java index 4d9514eae1b..d90333a8375 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourcePaths.sourcepaths001 * nsk.jdi.ReferenceType.sourcePaths.sourcepaths001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java index 52ae467d626..5b3c0bc0726 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.sourcePaths.sourcepaths002 * nsk.jdi.ReferenceType.sourcePaths.sourcepaths002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java index 8c80682a2a1..1d6da49d1f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleFields.visibfield001 * nsk.jdi.ReferenceType.visibleFields.visibfield001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java index 14e44821539..19801dea482 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleFields.visibfield002 * nsk.jdi.ReferenceType.visibleFields.visibfield002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java index 14d52e284d3..2788eaab8ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleFields.visibfield003 * nsk.jdi.ReferenceType.visibleFields.visibfield003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java index af1420fb44f..aef0eb809ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleFields.visibfield004 * nsk.jdi.ReferenceType.visibleFields.visibfield004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java index 1bdf937856a..8872cceb88c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleFields.visibfield005 * nsk.jdi.ReferenceType.visibleFields.visibfield005t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java index 66fd45ba19c..c0bbe79f1e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleFields.visibfield006 * nsk.jdi.ReferenceType.visibleFields.visibfield006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java index 8cc73d470a4..a32c8ae0b62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod001 * nsk.jdi.ReferenceType.visibleMethods.visibmethod001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java index 348df411f67..5a527089d84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod002 * nsk.jdi.ReferenceType.visibleMethods.visibmethod002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java index 5a830784654..7126579e879 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod003 * nsk.jdi.ReferenceType.visibleMethods.visibmethod003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java index ebba6e0bf39..5b53bf92df5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod004 * nsk.jdi.ReferenceType.visibleMethods.visibmethod004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java index 9c3114798b9..f4db58c0fe6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod005 * nsk.jdi.ReferenceType.visibleMethods.visibmethod005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java index 00359047bc7..e5334090a32 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod006 * nsk.jdi.ReferenceType.visibleMethods.visibmethod006t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java index ce74e8db0eb..11f4f0a02b1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ReferenceType.visibleMethods.visibmethod007 * nsk.jdi.ReferenceType.visibleMethods.visibmethod007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java index 2559e112438..1016dd60393 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Scenarios.invokeMethod.popframes001 * nsk.jdi.Scenarios.invokeMethod.popframes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java index a5ca6696161..8c3b6d857c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Scenarios.invokeMethod.redefineclasses001 * nsk.jdi.Scenarios.invokeMethod.redefineclasses001a * nsk.jdi.Scenarios.invokeMethod.redefineclasses001b diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java index 0d7acf7eee8..42d52b66174 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.SelectedArgument.choices.choices001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.SelectedArgument.choices.choices001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java index 8b90e0bacd4..75015bd1da5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.SelectedArgument.isValid.isvalid001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.SelectedArgument.isValid.isvalid001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java index 15d3ae9b636..bbf04347aea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.SelectedArgument.isValid.isvalid002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.SelectedArgument.isValid.isvalid002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java index 7db5f7169dd..61c65b738a6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ShortType._itself_.shorttype001 * nsk.jdi.ShortType._itself_.shorttype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java index 921d39928fc..ef300b6eac8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ShortValue.compareTo.compareto001 * nsk.jdi.ShortValue.compareTo.compareto001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java index b6b50a25403..6f86edd6d59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ShortValue.equals.equals001 * nsk.jdi.ShortValue.equals.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java index 7d64104bf54..f6422aff63e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ShortValue.equals.equals002 * nsk.jdi.ShortValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java index 092a529bc5e..d42e0122a94 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ShortValue.hashCode.hashcode001 * nsk.jdi.ShortValue.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java index f6a4b0e89aa..9503b3b3d7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ShortValue.value.value001 * nsk.jdi.ShortValue.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java index d36011227e3..64fdf669b59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame._bounds_.bounds001 * nsk.jdi.StackFrame._bounds_.bounds001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java index 3d0f0cd5768..a9ed83d5e3c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame._bounds_.bounds002 * nsk.jdi.StackFrame._bounds_.bounds002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java index dafba15cb59..360dfe9164e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getArgumentValues.getArgumentValues001.getArgumentValues001 * nsk.jdi.StackFrame.getArgumentValues.getArgumentValues001.getArgumentValues001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java index 3cae2654b01..f80b7e49806 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java @@ -34,7 +34,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getArgumentValues.getArgumentValues002.getArgumentValues002 * nsk.jdi.StackFrame.getArgumentValues.getArgumentValues002.getArgumentValues002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java index 0250b95d1ef..2a8f8b5b9f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java @@ -33,7 +33,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getArgumentValues.getArgumentValues003.getArgumentValues003 * nsk.jdi.StackFrame.getArgumentValues.getArgumentValues003.getArgumentValues003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java index 227ae2d6af4..16b2a20cb33 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getValue.getvalue001 * nsk.jdi.StackFrame.getValue.getvalue001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java index 1bef8e6eea8..bd3120d2f12 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getValue.getvalue002 * nsk.jdi.StackFrame.getValue.getvalue002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java index 274fd5e43d6..b8763320f59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getValue.getvalue003 * nsk.jdi.StackFrame.getValue.getvalue003t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java index d46d9ad117d..30639afae96 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getValues.getvalues001 * nsk.jdi.StackFrame.getValues.getvalues001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java index c756c8529c6..0ef274a9b67 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getValues.getvalues002 * nsk.jdi.StackFrame.getValues.getvalues002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java index 9d820020158..cefc8e2d1b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.getValues.getvalues003 * nsk.jdi.StackFrame.getValues.getvalues003t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java index 3689514d84a..81d6e2a163f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.hashCode.hashcode001 * nsk.jdi.StackFrame.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java index 63da70e4387..d51000146f1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.location.location001 * nsk.jdi.StackFrame.location.location001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java index d664ea18c00..31dc08c0314 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java @@ -88,7 +88,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.setValue.setvalue001.setvalue001 * nsk.jdi.StackFrame.setValue.setvalue001.setvalue001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java index 797c45f1291..cd095d19483 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java @@ -88,7 +88,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.setValue.setvalue002.setvalue002 * nsk.jdi.StackFrame.setValue.setvalue002.setvalue002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java index cd1a7fc14be..5d71bf5d38e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java @@ -88,7 +88,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.setValue.setvalue003.setvalue003 * nsk.jdi.StackFrame.setValue.setvalue003.setvalue003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java index c26308d7e20..ddc4dc63ce5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java @@ -90,7 +90,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.setValue.setvalue004.setvalue004 * nsk.jdi.StackFrame.setValue.setvalue004.setvalue004a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java index c01dad66d6a..84d867907d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.setValue.setvalue005.setvalue005 * nsk.jdi.StackFrame.setValue.setvalue005.setvalue005t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java index 0f75a08c129..6aa195e1abe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.setValue.setvalue006.setvalue006 * nsk.jdi.StackFrame.setValue.setvalue006.setvalue006t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java index 16b38e6f7dd..c2b90a0b5bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.thisObject.thisobject001 * nsk.jdi.StackFrame.thisObject.thisobject001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java index e3363086932..600c5320f48 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.thisObject.thisobject002 * nsk.jdi.StackFrame.thisObject.thisobject002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java index 50acc4329d0..4a605ed3f53 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.thread.thread001 * nsk.jdi.StackFrame.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java index 7f01c79ca2e..a61955ab579 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.toString.tostring001 * nsk.jdi.StackFrame.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java index 0729b439891..6fa53156f85 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java @@ -75,7 +75,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname001 * nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java index 4d6b1006c9f..0b42066e33f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname002 * nsk.jdi.StackFrame.visibleVariableByName.visiblevarbyname002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java index 3336d0b4c23..24cafa8a0bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java @@ -89,7 +89,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.visibleVariables.visiblevariables001 * nsk.jdi.StackFrame.visibleVariables.visiblevariables001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java index 0caaab23d25..cde1e0447b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java @@ -83,7 +83,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StackFrame.visibleVariables.visiblevariables002 * nsk.jdi.StackFrame.visibleVariables.visiblevariables002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java index 65ee4f146dc..abc66c3efda 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepEvent._itself_.stepEvent003.stepEvent003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.StepEvent._itself_.stepEvent003.stepEvent003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java index 331d0fbb36b..94a7eb2b703 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepEvent._itself_.stepEvent004.stepEvent004 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.StepEvent._itself_.stepEvent004.stepEvent004 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java index d513a60e9c3..7d8d4268954 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java @@ -82,7 +82,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepEvent._itself_.stepevent001 * nsk.jdi.StepEvent._itself_.stepevent001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java index d1e88daa105..57b38b36ab8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java @@ -75,7 +75,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepEvent._itself_.stepevent002 * nsk.jdi.StepEvent._itself_.stepevent002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java index 5421c1ee410..059ac70e607 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest._bounds_.filters001 * nsk.jdi.StepRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java index d0b6c42fd6a..6d16b578021 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassExclusionFilter.filter001 * nsk.jdi.StepRequest.addClassExclusionFilter.filter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java index 316c8e6d470..9692963c271 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassExclusionFilter.filter002 * nsk.jdi.StepRequest.addClassExclusionFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 266dbda3905..d2fe7867854 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassFilter_rt.filter_rt001 * nsk.jdi.StepRequest.addClassFilter_rt.filter_rt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 51d13582dd8..c40504abf99 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassFilter_rt.filter_rt002 * nsk.jdi.StepRequest.addClassFilter_rt.filter_rt002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 270cc11ff5b..2dbeda16d93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassFilter_rt.filter_rt003 * nsk.jdi.StepRequest.addClassFilter_rt.filter_rt003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java index 4d8f3393ca6..cd47825c071 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassFilter_s.filter_s001 * nsk.jdi.StepRequest.addClassFilter_s.filter_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java index cfc2c1e536b..1e88f7f1278 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addClassFilter_s.filter_s002 * nsk.jdi.StepRequest.addClassFilter_s.filter_s002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java index b344f1a4cd8..7fa48faa29f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -79,7 +79,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter001 * nsk.jdi.StepRequest.addInstanceFilter.instancefilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java index 1dd74774f6d..e57bcec0019 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter002 * nsk.jdi.StepRequest.addInstanceFilter.instancefilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java index 9b1f07d0887..d3b8a647ea7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter003 * nsk.jdi.StepRequest.addInstanceFilter.instancefilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java index 6009d693563..16f1fc4217d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.addInstanceFilter.instancefilter004 * nsk.jdi.StepRequest.addInstanceFilter.instancefilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java index ea834f2436b..534b2315064 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.depth.depth001 * nsk.jdi.StepRequest.depth.depth001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java index b797f895a48..7b5b1a12675 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.depth.depth002 * nsk.jdi.StepRequest.depth.depth002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java index 8c6b0f6ad4e..57a4194c184 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.depth.depth003 * nsk.jdi.StepRequest.depth.depth003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java index 5e22a8f192f..6929572089e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.size.size001 * nsk.jdi.StepRequest.size.size001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java index e7d6e2d19cf..491ad286994 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.size.size002 * nsk.jdi.StepRequest.size.size002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java index 1f128a2bec5..56e941e29cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StepRequest.thread.thread001 * nsk.jdi.StepRequest.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java index d94cdd5eaa9..b8374665377 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StringArgument.isValid.isvalid001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.StringArgument.isValid.isvalid001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java index 47fbc0809d2..f6ec8d518a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StringArgument.isValid.isvalid002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.StringArgument.isValid.isvalid002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java index 291d133a546..99010b00242 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StringArgument.isValid.isvalid003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.StringArgument.isValid.isvalid003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java index 2ef3883b279..f7ef7ee208a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.StringReference.value.value001 * nsk.jdi.StringReference.value.value001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java index 58e8ee3a8f9..81e54c588ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java @@ -80,7 +80,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadDeathEvent.thread.thread001 * nsk.jdi.ThreadDeathEvent.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java index 79b3c8b6a6a..40fa327dee7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter001 * nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java index cec53f09576..6116f754bd8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter002 * nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java index 47315f8662f..a9afa155568 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter003 * nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java index 8710d3725e6..233708f9b39 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter004 * nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java index 43f0dcaa911..155b47f0930 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter005 * nsk.jdi.ThreadDeathRequest.addThreadFilter.addthreadfilter005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java index acac4797b40..fe8f715b375 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.name.name001 * nsk.jdi.ThreadGroupReference.name.name001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java index 1fa4b96286a..b91ec86a89e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.parent.parent001 * nsk.jdi.ThreadGroupReference.parent.parent001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java index 98f50e9dc9a..30831c43c8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.resume.resume001 * nsk.jdi.ThreadGroupReference.resume.resume001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java index dcf042b460e..fc61aeac914 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.suspend.suspend001 * nsk.jdi.ThreadGroupReference.suspend.suspend001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java index f52d42b1311..23877755991 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.threadGroups.threadgroups001 * nsk.jdi.ThreadGroupReference.threadGroups.threadgroups001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java index 6b55f8bc21f..a0e11dfc14e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.threads.threads001 * nsk.jdi.ThreadGroupReference.threads.threads001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java index da96b484749..4be3f995651 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadGroupReference.toString.tostring001 * nsk.jdi.ThreadGroupReference.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java index d5ac645474f..1bf96b98edc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference._bounds_.bounds001 * nsk.jdi.ThreadReference._bounds_.bounds001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java index d69fd057714..a25f75ab020 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java @@ -74,7 +74,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.currentContendedMonitor.currentcm001 * nsk.jdi.ThreadReference.currentContendedMonitor.currentcm001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java index 6687d72299b..2b3f49bc5fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java index 7a19c6f966b..b46e59e565f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn002.forceEarlyReturn002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java index 8ccbabec479..2a74bc4852d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn003.forceEarlyReturn003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn003.forceEarlyReturn003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java index d2e690375de..21505dc7727 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java @@ -37,7 +37,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn004.forceEarlyReturn004 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn004.forceEarlyReturn004a * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java index 7b2bfdf84c3..fef2751c13c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn005.forceEarlyReturn005 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn005.forceEarlyReturn005a * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java index b38b6ffb3a7..cfaac8a8ed6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java index 6097dd4adfa..c4c7faac150 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java index abd6cac0d8c..c572780b5aa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn008.forceEarlyReturn008 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn008.forceEarlyReturn008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java index 6b36a9381d5..6beb71587e3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java index e7f5025b498..526c78d550c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java index a120c3030ea..a2d197c2798 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java index 623cc0a8e0f..47f49ead185 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn009.forceEarlyReturn009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java index 4786f6db748..abd2afcc0e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn013.forceEarlyReturn013 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn013.forceEarlyReturn013a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java index a7c15616d16..29f1aa22df0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn014.forceEarlyReturn014 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn014.forceEarlyReturn014a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java index 9ce0239e917..c0c62c4ccc7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java @@ -37,7 +37,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn015.forceEarlyReturn015 * nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn015.forceEarlyReturn015a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java index 135938a78ca..7d4b7a6ce01 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.frame.frame001 * nsk.jdi.ThreadReference.frame.frame001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java index bdd0744fa39..eba60e0a064 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.frameCount.framecount001 * nsk.jdi.ThreadReference.frameCount.framecount001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java index 97f6e8b6688..024844bb74c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.frames.frames001 * nsk.jdi.ThreadReference.frames.frames001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java index 6c6f607268e..52103443519 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java @@ -85,7 +85,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.frames_ii.frames_ii001 * nsk.jdi.ThreadReference.frames_ii.frames_ii001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java index 75a5d4a6604..34e7e9d0678 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.frames_ii.frames_ii002 * nsk.jdi.ThreadReference.frames_ii.frames_ii002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java index 53ccb6b9175..15e13388e64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.interrupt.interrupt001 * nsk.jdi.ThreadReference.interrupt.interrupt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java index e5128862dcf..9fdef02fe84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.isAtBreakpoint.isatbreakpoint001 * nsk.jdi.ThreadReference.isAtBreakpoint.isatbreakpoint001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java index 7eb5f003b5b..8c999d08694 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.isSuspended.issuspended001 * nsk.jdi.ThreadReference.isSuspended.issuspended001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java index 8210863d355..20ce55e424c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.isSuspended.issuspended002 * nsk.jdi.ThreadReference.isSuspended.issuspended002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java index 73886d1cb0b..8e5f801a263 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.isSuspended.issuspended003 * nsk.jdi.ThreadReference.isSuspended.issuspended003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java index 20b3ebc7f60..76de5d765a5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.isSuspended.issuspended004 * nsk.jdi.ThreadReference.isSuspended.issuspended004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java index 035434148db..cb181725e64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.name.name001 * nsk.jdi.ThreadReference.name.name001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java index 05a30e39277..902ce1b5e84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors001 * nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java index 420b3cbd8ec..3ab655607fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors002 * nsk.jdi.ThreadReference.ownedMonitors.ownedmonitors002t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java index 14b5e5d844a..3b1feadb00f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames001.ownedMonitorsAndFrames001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames001.ownedMonitorsAndFrames001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java index 771186bfcf3..4a79cf2f595 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames002.ownedMonitorsAndFrames002 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames002.ownedMonitorsAndFrames002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java index 34a0d815676..78303a8775a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames003.ownedMonitorsAndFrames003 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames003.ownedMonitorsAndFrames003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java index 8d08d81cd9b..1bc276e6b5e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames004.ownedMonitorsAndFrames004 * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames004.ownedMonitorsAndFrames004a * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java index 3dffabd4c21..e9cd6c71ab0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames005.ownedMonitorsAndFrames005 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames005.ownedMonitorsAndFrames005 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java index 764e2f3c284..1ba448d9db0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames006.ownedMonitorsAndFrames006 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames006.ownedMonitorsAndFrames006 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java index 3978374132a..c459f0493b6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames007.ownedMonitorsAndFrames007 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames007.ownedMonitorsAndFrames007 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java index cb983232797..603eb1a8c8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames007.ownedMonitorsAndFrames007 * @run main/othervm/native PropertyResolvingWrapper * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames007.ownedMonitorsAndFrames007 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java index f96b2fb57f9..8e5a7522d10 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames009.ownedMonitorsAndFrames009 * nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames009.ownedMonitorsAndFrames009a * @run main/othervm/native PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java index 5f566a2f708..c7c1f8b788f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java @@ -107,7 +107,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes001 * nsk.jdi.ThreadReference.popFrames.popframes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java index 2cba987ab17..a99e45a3d7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java @@ -103,7 +103,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes002 * nsk.jdi.ThreadReference.popFrames.popframes002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java index dca528d538f..cbfd4ef8cba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java @@ -103,7 +103,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes003 * nsk.jdi.ThreadReference.popFrames.popframes003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java index 56800751c9f..f5ade83d8f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java @@ -102,7 +102,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes004 * nsk.jdi.ThreadReference.popFrames.popframes004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java index 50f03ca86ec..d5be5cbb7dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java @@ -103,7 +103,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes005 * nsk.jdi.ThreadReference.popFrames.popframes005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java index f181e7e6903..144f94aa1c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes006 * nsk.jdi.ThreadReference.popFrames.popframes006t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java index 8bc0a33aad4..19fda8badbb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.popFrames.popframes007 * nsk.jdi.ThreadReference.popFrames.popframes007t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java index 0c94c289c14..898136b292b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.resume.resume001 * nsk.jdi.ThreadReference.resume.resume001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java index 56438cc0801..ea33fe04dbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.status.status003.status003 * nsk.jdi.ThreadReference.status.status003.status003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java index 7ec88df60e3..54e9859d012 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.status.status004.status004 * nsk.jdi.ThreadReference.status.status004.status004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java index b445b72988a..9d12873ab01 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.status.status005.status005 * nsk.jdi.ThreadReference.status.status005.status005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java index 95b60ed1a98..82ca7745a8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.status.status006.status006 * nsk.jdi.ThreadReference.status.status006.status006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java index 82c4564784c..f2ac5fc119c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.status.status007.status007 * nsk.jdi.ThreadReference.status.status007.status007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java index bb5ba64623e..75b95f56979 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.status.status008.status008 * nsk.jdi.ThreadReference.status.status008.status008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java index 29fc9574022..1dedcae5c80 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.stop.stop001 * nsk.jdi.ThreadReference.stop.stop001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java index 35032e636f7..bf67d80dfd3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.stop.stop002 * nsk.jdi.ThreadReference.stop.stop002t * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java index 41cb02c2ff6..eeab0ee6170 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.suspend.suspend001 * nsk.jdi.ThreadReference.suspend.suspend001a * @run main/othervm/timeout=420 PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java index 11501b939c1..d442ac820cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.suspendCount.suspendcount001 * nsk.jdi.ThreadReference.suspendCount.suspendcount001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java index 12a7d2291e1..32f20a92de8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadReference.threadGroup.threadgroup001 * nsk.jdi.ThreadReference.threadGroup.threadgroup001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java index d93c62d33bc..0d60e8a05c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java @@ -83,7 +83,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadStartEvent.thread.thread001 * nsk.jdi.ThreadStartEvent.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java index e49cb619f1f..839cd2bd8be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter001 * nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java index 1dc5560a460..8e26561a390 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter002 * nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java index 95b7952b7db..ba759e35b32 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter003 * nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java index f290090c88d..b1d55ed64c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter004 * nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java index d44191cd679..70cc6164329 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter005 * nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java index 721f671c406..38714ea6225 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Transport.name.name001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.Transport.name.name001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java index c8de097eba5..40057db7ead 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.hashCode.hashcode001 * nsk.jdi.Type.hashCode.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java index 9c47a8c3adb..728b0d85ffa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.name.name001 * nsk.jdi.Type.name.name001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java index a2b13036ae2..51160163080 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.name.name002 * nsk.jdi.Type.name.name002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java index 8aa12a27a1f..cb5b090de6c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.name.name003 * nsk.jdi.Type.name.name003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java index 75199690039..ffad95e3472 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.signature.signature001 * nsk.jdi.Type.signature.signature001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java index 2bce3a311ed..f725f100356 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.signature.signature002 * nsk.jdi.Type.signature.signature002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java index 3ff3e27b52e..28cae841d03 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Type.signature.signature003 * nsk.jdi.Type.signature.signature003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java index 437379c6e8a..7f6a36a6a8d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype001 * nsk.jdi.TypeComponent.declaringType.decltype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java index f40535fd5f7..c1d4669770f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype002 * nsk.jdi.TypeComponent.declaringType.decltype002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java index ade78a9dd5e..93f2971dc63 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype003 * nsk.jdi.TypeComponent.declaringType.decltype003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java index 84e31330466..29163cdb0fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype004 * nsk.jdi.TypeComponent.declaringType.decltype004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java index c6de3c388ff..0f5f9ec6d9e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype005 * nsk.jdi.TypeComponent.declaringType.decltype005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java index 44de7b470c6..09371673e51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype006 * nsk.jdi.TypeComponent.declaringType.decltype006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java index e0f64c55159..241561d73c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype007 * nsk.jdi.TypeComponent.declaringType.decltype007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java index 546c018fe63..c59bdcc26be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype008 * nsk.jdi.TypeComponent.declaringType.decltype008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java index 1e287051af1..80d6eb0ca78 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.declaringType.decltype009 * nsk.jdi.TypeComponent.declaringType.decltype009a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java index db4afdc1d3f..373e8516610 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.genericSignature.genericSignature001 * nsk.jdi.TypeComponent.genericSignature.genericSignature001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java index 6922d34f273..ec18337a2ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.genericSignature.genericSignature002 * nsk.jdi.TypeComponent.genericSignature.genericSignature002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java index fe0df028b7f..67c36f244e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isFinal.isfinal001 * nsk.jdi.TypeComponent.isFinal.isfinal001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java index dd23afba875..6750ae16e13 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isFinal.isfinal002 * nsk.jdi.TypeComponent.isFinal.isfinal002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java index 03b2905b223..e0246a3d195 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isFinal.isfinal003 * nsk.jdi.TypeComponent.isFinal.isfinal003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java index acac69188fe..576ec508c4b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isFinal.isfinal004 * nsk.jdi.TypeComponent.isFinal.isfinal004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java index 42c5b24ba7d..15dd7f0b990 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate001 * nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java index cbcb4d4dc58..60ca0231cf8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate002 * nsk.jdi.TypeComponent.isPackagePrivate.ispackageprivate002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java index 48276967462..5bdc294c4fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isPrivate.isprivate001 * nsk.jdi.TypeComponent.isPrivate.isprivate001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java index c1b21a21716..cb557c2a81f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isPrivate.isprivate002 * nsk.jdi.TypeComponent.isPrivate.isprivate002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java index 0b48cc8cbda..0c81bbf267e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isProtected.isprotected001 * nsk.jdi.TypeComponent.isProtected.isprotected001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java index 5a80970f3d1..8026d36847b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isProtected.isprotected002 * nsk.jdi.TypeComponent.isProtected.isprotected002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java index 70564fde7f6..361affb44b7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isPublic.ispublic001 * nsk.jdi.TypeComponent.isPublic.ispublic001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java index 7541bca6452..cfd2757e83d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isPublic.ispublic002 * nsk.jdi.TypeComponent.isPublic.ispublic002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java index 09399fb230d..70ea0f4690b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isStatic.isstatic001 * nsk.jdi.TypeComponent.isStatic.isstatic001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java index 34b7f91750c..8d70a387218 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isStatic.isstatic002 * nsk.jdi.TypeComponent.isStatic.isstatic002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java index 344dca68fa7..1b8b0d2f0b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isStatic.isstatic003 * nsk.jdi.TypeComponent.isStatic.isstatic003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java index f8c697f7cf4..4ed8b4dbfe4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isStatic.isstatic004 * nsk.jdi.TypeComponent.isStatic.isstatic004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java index 865780a8070..bb9f060370a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isSynthetic.issynthetic001 * nsk.jdi.TypeComponent.isSynthetic.issynthetic001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java index c03394d8160..7197f4d36a1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.isSynthetic.issynthetic002 * nsk.jdi.TypeComponent.isSynthetic.issynthetic002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java index 986d0e2ca01..93a66a6b32e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.name.name001 * nsk.jdi.TypeComponent.name.name001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java index 1c92e4b20dd..d4df30afd0b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.name.name002 * nsk.jdi.TypeComponent.name.name002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java index e6f494aaff4..16e0fc6d4a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.name.name003 * nsk.jdi.TypeComponent.name.name003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java index 48e44b632f8..6953d523f8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.signature.sign001 * nsk.jdi.TypeComponent.signature.sign001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java index 91247df05cf..adac615876c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.signature.sign002 * nsk.jdi.TypeComponent.signature.sign002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java index ec6713e3825..d6597070440 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.TypeComponent.signature.sign003 * nsk.jdi.TypeComponent.signature.sign003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java index 9b7496b84de..fe9707f432b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java @@ -36,7 +36,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMCannotBeModifiedEx._itself_.canntbemod001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VMCannotBeModifiedEx._itself_.canntbemod001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java index bbe3e6d20ce..6a13069a38d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMDeathEvent._itself_.vmdeath001 * nsk.jdi.VMDeathEvent._itself_.vmdeath001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java index 2462ccca691..d266aba037c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java @@ -78,7 +78,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMDeathEvent._itself_.vmdeath002 * nsk.jdi.VMDeathEvent._itself_.vmdeath002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java index 44b81d9d111..452b60dbb96 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMDeathEvent._itself_.vmdeath003 * nsk.jdi.VMDeathEvent._itself_.vmdeath003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java index 987eab83954..395fbf9ca87 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMDisconnectEvent._itself_.disconnect001 * nsk.jdi.VMDisconnectEvent._itself_.disconnect001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java index 1b1afceeb0d..efefc807b90 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMDisconnectEvent._itself_.disconnect002 * nsk.jdi.VMDisconnectEvent._itself_.disconnect002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java index 17cc6b003ed..dbd939a4f2a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMDisconnectEvent._itself_.disconnect003 * nsk.jdi.VMDisconnectEvent._itself_.disconnect003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java index 95447567f43..92c79d79ddd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java @@ -37,7 +37,6 @@ * @requires !vm.graal.enabled * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMOutOfMemoryException.VMOutOfMemoryException001.VMOutOfMemoryException001 * nsk.jdi.VMOutOfMemoryException.VMOutOfMemoryException001.VMOutOfMemoryException001t * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java index 28b0b7ca13b..a6fc6970126 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VMStartEvent.thread.thread001 * nsk.jdi.VMStartEvent.thread.thread001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java index d9d34770505..2af62bd98db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Value._itself_.value001 * nsk.jdi.Value._itself_.value001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java index 7d7a6fcce81..76b8664cf6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Value.type.type001 * nsk.jdi.Value.type.type001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java index d3c6ce7e77c..99f7ef894c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Value.type.type002.type002 * nsk.jdi.Value.type.type002.type002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java index 968020de7e0..cd538cb8daa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.Value.type.type003 * nsk.jdi.Value.type.type003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java index dc7818f8e92..aadff2b96e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.allClasses.allclasses001 * nsk.jdi.VirtualMachine.allClasses.allclasses001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java index 0cc55159937..99665023bc8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.allClasses.allclasses002 * nsk.jdi.VirtualMachine.allClasses.allclasses002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java index 56dec01b96a..1031be53722 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.allThreads.allthreads001 * nsk.jdi.VirtualMachine.allThreads.allthreads001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java index 8666ae15efc..c4f4da0f134 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canAddMethod.canaddmethod001 * nsk.jdi.VirtualMachine.canAddMethod.canaddmethod001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java index 00823f94175..b89692f06ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canBeModified.canbemodified001 * nsk.jdi.VirtualMachine.canBeModified.canbemodified001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java index bdd416dd5d6..97623ff558c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canGetBytecodes.cangetbytecodes001 * nsk.jdi.VirtualMachine.canGetBytecodes.cangetbytecodes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java index 624faa42c6c..090660a7ebc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canGetCurrentContendedMonitor.cangccm001 * nsk.jdi.VirtualMachine.canGetCurrentContendedMonitor.cangccm001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java index e1c0dfed153..303cc06af00 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canGetMonitorInfo.cangetmonitorinfo001 * nsk.jdi.VirtualMachine.canGetMonitorInfo.cangetmonitorinfo001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java index 09fda1a4bca..b99469c3b8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canGetOwnedMonitorInfo.cangetinfo001 * nsk.jdi.VirtualMachine.canGetOwnedMonitorInfo.cangetinfo001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java index 11e8351e0dc..3ee7ed37ab5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canGetSourceDebugExtension.cangetsde001 * nsk.jdi.VirtualMachine.canGetSourceDebugExtension.cangetsde001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java index df17f9271d9..ae5fceb0c47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canGetSyntheticAttribute.cangetattr001 * nsk.jdi.VirtualMachine.canGetSyntheticAttribute.cangetattr001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java index 63e3ad1ea33..e0f3f564230 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canPopFrames.canpopframes001 * nsk.jdi.VirtualMachine.canPopFrames.canpopframes001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java index 73c0f5bad52..81e725f8ad3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canRedefineClasses.canredefineclasses001 * nsk.jdi.VirtualMachine.canRedefineClasses.canredefineclasses001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java index c9dc8a4cebd..f771278f292 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canRequestVMDeathEvent.canreqvmdev001 * nsk.jdi.VirtualMachine.canRequestVMDeathEvent.canreqvmdev001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java index c2104e509b1..7ee8030ab9d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canUnrestrictedlyRedefineClasses.curc001 * nsk.jdi.VirtualMachine.canUnrestrictedlyRedefineClasses.curc001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java index dae09c7bdc9..df3b0800c7b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canUseInstanceFilters.canusefilters001 * nsk.jdi.VirtualMachine.canUseInstanceFilters.canusefilters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java index 5f6ed571e86..a08b01fda68 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canWatchFieldAccess.canwatchaccess001 * nsk.jdi.VirtualMachine.canWatchFieldAccess.canwatchaccess001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java index 4d97049322e..bd6dca70e6b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.canWatchFieldModification.canwatchmod001 * nsk.jdi.VirtualMachine.canWatchFieldModification.canwatchmod001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java index 9fa4e1a9f85..287fc90f3ce 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.classesByName.classesbyname001 * nsk.jdi.VirtualMachine.classesByName.classesbyname001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java index 85272a99426..0060d38fe38 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.description.description001 * nsk.jdi.VirtualMachine.description.description001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java index 60ef68f2f67..a7eef44220a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.dispose.dispose001 * nsk.jdi.VirtualMachine.dispose.dispose001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java index 4e45c88c89b..6c7df2657dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.dispose.dispose002 * nsk.jdi.VirtualMachine.dispose.dispose002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java index 5fab7b7a082..7d8d86d75f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.dispose.dispose003 * nsk.jdi.VirtualMachine.dispose.dispose003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java index 2586fd29661..540c5b20430 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.dispose.dispose004 * nsk.jdi.VirtualMachine.dispose.dispose004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java index 6dc631a4a94..d74ae97eafa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java @@ -73,7 +73,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.dispose.dispose005 * nsk.jdi.VirtualMachine.dispose.dispose005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java index d5080060f01..ac44865edcd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.eventQueue.eventqueue001 * nsk.jdi.VirtualMachine.eventQueue.eventqueue001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java index e8a92778991..1d957261f6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.eventRequestManager.eventrmanager001 * nsk.jdi.VirtualMachine.eventRequestManager.eventrmanager001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java index fdaa4aa4eb5..09b2a99420e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.exit.exit001 * nsk.jdi.VirtualMachine.exit.exit001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java index f60fe44cc00..55b4a61264e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.exit.exit002 * nsk.jdi.VirtualMachine.exit.exit002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java index eedee8160f2..4d13e6bd0d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.getDefaultStratum.getdefaultstratum001 * nsk.jdi.VirtualMachine.getDefaultStratum.getdefaultstratum001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java index 656ec0fa9c6..90f1951d4c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java @@ -43,7 +43,6 @@ * @requires !vm.graal.enabled * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts001.instancecounts001 * nsk.share.jdi.TestClass1 * nsk.share.jdi.TestClass2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java index 65801037f73..6e0ae427a0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts001.instancecounts001 * nsk.share.jdi.TestClass1 * nsk.share.jdi.TestClass2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java index 4cfb6707f59..dd36736da95 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java @@ -45,7 +45,6 @@ * @requires vm.opt.final.ClassUnloading * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts003.instancecounts003 * nsk.share.jdi.TestClass1 * nsk.share.jdi.TestInterfaceImplementer1 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java index 9513018931b..77540cc4776 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java @@ -39,7 +39,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts004.instancecounts004 * nsk.jdi.VirtualMachine.instanceCounts.instancecounts004.instancecounts004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java index 2326f5724e2..e08e5509f38 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_bool.mirrorof_bool001 * nsk.jdi.VirtualMachine.mirrorOf_bool.mirrorof_bool001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java index 62c7b3781b4..f2bcb7774f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_byte.mirrorof_byte001 * nsk.jdi.VirtualMachine.mirrorOf_byte.mirrorof_byte001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java index 9f5a82eda98..a29a2b61fd1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_char.mirrorof_char001 * nsk.jdi.VirtualMachine.mirrorOf_char.mirrorof_char001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java index c4fe41c4e84..a22ac4715fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_double.mirrorof_double001 * nsk.jdi.VirtualMachine.mirrorOf_double.mirrorof_double001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java index 3f9eea6055c..9e71904cdc2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_float.mirrorof_float001 * nsk.jdi.VirtualMachine.mirrorOf_float.mirrorof_float001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java index 1368b7b20a1..7cfa1e069eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_int.mirrorof_int001 * nsk.jdi.VirtualMachine.mirrorOf_int.mirrorof_int001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java index 14843c23520..2e6208be2e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_long.mirrorof_long001 * nsk.jdi.VirtualMachine.mirrorOf_long.mirrorof_long001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java index 786e62c12b9..64e247ce8b6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java @@ -64,7 +64,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_short.mirrorof_short001 * nsk.jdi.VirtualMachine.mirrorOf_short.mirrorof_short001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java index ecc5322a573..f6577a766e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.mirrorOf_string.mirrorof_string001 * nsk.jdi.VirtualMachine.mirrorOf_string.mirrorof_string001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java index 79fa778406f..a74c1b842b1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.name.name001 * nsk.jdi.VirtualMachine.name.name001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java index 629c9e31f3a..c84b4a59e9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.process.process001 * nsk.jdi.VirtualMachine.process.process001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java index 186d491bd9a..461d94e9897 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java @@ -116,7 +116,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses001 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses001a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java index 443241b3c58..9b7f5542a15 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses002 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses002a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java index d7adf74d742..26eb9dc3405 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses003 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses003a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java index 950aa1c547d..87cdb277590 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses004 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses004a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java index 3ae0fe7ea93..786f068df36 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses005 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses005a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java index 35aacba6cce..2c5897c9059 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses006 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses006a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java index d53762c0598..cffd3bde610 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses007 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses007a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java index 087af8ea2b0..355b6af8f72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses008 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses008a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java index 5a545224f11..5c6d58da981 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses009 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses009a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java index 5a5297e67a7..7fd497ccdad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses010 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses010a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java index fb3bd40fdfe..6b3b59a100d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses011 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses011a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java index 7a075502631..75afa8e590b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java @@ -53,7 +53,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses012 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses012a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java index 29dc5cba634..11942c5a904 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java @@ -54,7 +54,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses013 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses013a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java index 5e151ea7fac..c8ad602c0e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses014 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses014a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java index d6d2b048b9f..d12f64dd57d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses015 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses015a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java index 6453a11f90c..b813f3e21b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java @@ -63,7 +63,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses016 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses016a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java index fc6c32771dc..9332841cab8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses020 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses020a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java index eafda280644..e59181cf4f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java @@ -52,7 +52,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses021 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses021a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java index 4d9d4decae1..ac2a8c78efe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses022 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses022a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java index 663092519fa..e8004129fcf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses023 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses023a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java index 67afbe6c624..10c4cb8f07a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java @@ -55,7 +55,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses024 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses024a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java index a5aed63222f..1c4bf610c53 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses025 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses025a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java index 5e764cf35c9..ea96f686871 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses026 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses026a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java index 6efdef033ab..80ac46ed320 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses027 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses027a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java index e7cc7f7a67b..c968529fd2e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java @@ -48,7 +48,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses028 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses028a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java index df21af79743..f53d1dab9fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java @@ -44,7 +44,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses029 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses029a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java index 8ffcc43a185..73ddeed3df8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java @@ -64,7 +64,6 @@ * newclass02 nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030b.class * @clean nsk.jdi.VirtualMachine.redefineClasses.redefineclasses030b * - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses030 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses030a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java index 1dacd22efca..9198e3f9d63 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java @@ -43,7 +43,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses031 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses031a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java index db8b11e6178..ad3c3f6c852 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses032 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses032a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java index 4c9f21e17fa..1d6b9e676e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java @@ -51,7 +51,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses034 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses034a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java index d6f04cef61a..14bca5fb586 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses035 * nsk.jdi.VirtualMachine.redefineClasses.redefineclasses035a * diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java index 8bb58e72b9a..2cab730199c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.resume.resume001 * nsk.jdi.VirtualMachine.resume.resume001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java index ae3f0c2f1fa..c20b5e1e066 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum002.setDefaultStratum002 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum002.setDefaultStratum002 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java index 27c15b952ff..04d7bac77b6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum003.setDefaultStratum003 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachine.setDefaultStratum.setDefaultStratum003.setDefaultStratum003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java index 2baa33d31d9..c10d7c00b7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.setDefaultStratum.setdefaultstratum001 * nsk.jdi.VirtualMachine.setDefaultStratum.setdefaultstratum001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java index 6676e8e00d9..4372c40d3fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.suspend.suspend001 * nsk.jdi.VirtualMachine.suspend.suspend001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java index 6a029487fa4..50e09d73ace 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.topLevelThreadGroups.toplevelgroups001 * nsk.jdi.VirtualMachine.topLevelThreadGroups.toplevelgroups001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java index a2d41371010..722fca97f4a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java @@ -59,7 +59,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachine.version.version001 * nsk.jdi.VirtualMachine.version.version001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java index 5c6e5195d25..ea3a4bb18b8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java @@ -45,7 +45,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.allConnectors.allconnectors001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.allConnectors.allconnectors001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java index 7e8d5078a9a..212b176a9f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.attachingConnectors.attaching001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.attachingConnectors.attaching001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java index 203a40f8573..6d71b262a3a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm001 * nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java index 5858253ddf4..1e3c70afcf9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm002 * nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java index 0c4ad742862..3be6571eb1f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm003 * nsk.jdi.VirtualMachineManager.connectedVirtualMachines.convm003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java index 8dbbe63ac29..b3e35b07e57 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java @@ -41,7 +41,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java index 406822f74a4..1dee5891de4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java @@ -42,7 +42,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM002 * nsk.jdi.VirtualMachineManager.createVirtualMachine.CreateVM002_TargetVM * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java index 5d36a5f4737..2faac1d44b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM003 * nsk.jdi.VirtualMachineManager.createVirtualMachine.CreateVM003_TargetVM * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java index 49d4cb9d911..54ea54f31ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM004 * nsk.jdi.VirtualMachineManager.createVirtualMachine.CreateVM004_TargetVM * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java index cf69a7b9fb7..cb4dcbe3444 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.createVirtualMachine.createVM005 * nsk.jdi.VirtualMachineManager.createVirtualMachine.CreateVM005_TargetVM * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java index 1a609febaf3..77f164ba728 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.defaultConnector.default001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.defaultConnector.default001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java index 44f355063bd..961c4374fad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.launchingConnectors.launching001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.launchingConnectors.launching001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java index 3a1dd4aa8e0..58d370d8f09 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.listeningConnectors.listening001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.listeningConnectors.listening001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java index 2b2d1e86e49..4bd3b20c26d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.majorInterfaceVersion.major001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.majorInterfaceVersion.major001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java index 614e1615682..b90f440e468 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java @@ -47,7 +47,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VirtualMachineManager.minorInterfaceVersion.minor001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.VirtualMachineManager.minorInterfaceVersion.minor001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java index a580f0c4cde..c2ba694bb84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VoidType._itself_.voidtype001 * nsk.jdi.VoidType._itself_.voidtype001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java index df13a6dea95..2fd89cbac93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java @@ -49,7 +49,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VoidType.toString.tostring001 * nsk.jdi.VoidType.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java index 281bdfa30c0..a57963ef78c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VoidValue.equals.equals001.equals001 * nsk.jdi.VoidValue.equals.equals001.equals001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java index 8fdca046c06..71c0667b5f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VoidValue.equals.equals002 * nsk.jdi.VoidValue.equals.equals002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java index 4d6b5f4cf25..e80d5525591 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VoidValue.hashCode.hashcode001.hashcode001 * nsk.jdi.VoidValue.hashCode.hashcode001.hashcode001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java index dd5ef890b61..58c02e4f5aa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java @@ -50,7 +50,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.VoidValue.toString.tostring001 * nsk.jdi.VoidValue.toString.tostring001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java index 8484ca54077..888aa893424 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java @@ -57,7 +57,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointEvent._itself_.wevent001 * nsk.jdi.WatchpointEvent._itself_.wevent001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java index f4c1884f8d4..177ff5ad508 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointEvent.field.field001 * nsk.jdi.WatchpointEvent.field.field001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java index b2793827bd9..61dafb3c8ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java @@ -60,7 +60,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointEvent.object.object001 * nsk.jdi.WatchpointEvent.object.object001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java index db9d7a238f3..d1bad2770d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java @@ -72,7 +72,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointEvent.valueCurrent.valuecur001 * nsk.jdi.WatchpointEvent.valueCurrent.valuecur001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java index 748151cb36a..5e85367300f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java @@ -46,7 +46,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest._bounds_.filters001 * nsk.jdi.WatchpointRequest._bounds_.filters001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java index bcf8273551c..f13f2f083ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter001 * nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java index 0d041f634bb..2eccc8e0d7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter002 * nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java index 41e38d1d1ba..79f2c138213 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter003 * nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java index b2b07fdcc5f..8be5b7ecf03 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter004 * nsk.jdi.WatchpointRequest.addClassExclusionFilter.filter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 6305c3d00fe..043e7bb330e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt001 * nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 87c46475024..a9049f66788 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt002 * nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 2ead856ca94..5d051e8c5d9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt003 * nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java index 43cbcce270f..71a6f58a762 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java @@ -65,7 +65,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt004 * nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java index 5fbe9179ecc..44ba2502340 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt005 * nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java index 431a8c2dbbc..959d8051de6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt006 * nsk.jdi.WatchpointRequest.addClassFilter_rt.filter_rt006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java index 17091207082..b556a0be504 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s001 * nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java index 6f7e4c05c71..5ad005626c4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s002 * nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java index ffb8c33bfae..8e13182f233 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s003 * nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java index e335b95b790..9f49e1b5cc3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java @@ -66,7 +66,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s004 * nsk.jdi.WatchpointRequest.addClassFilter_s.filter_s004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java index ac8c6c8775b..d79e4ca54e4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter001 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java index 649ed43d4e5..0dbf8f0aa82 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -69,7 +69,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter002 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java index 3b74ca779d5..34795d4cbb1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter003 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java index 7ead0841ac6..76257d26434 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -68,7 +68,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter004 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java index fa068169ce6..7451ea50061 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter005 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java index 1e7db87c516..9682b3dbc23 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java @@ -67,7 +67,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter006 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java index 2bedd09b2a6..72accc01f07 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter007 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java index 963fbc05489..d5736d82ee7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java @@ -77,7 +77,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter008 * nsk.jdi.WatchpointRequest.addInstanceFilter.instancefilter008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java index 631b3ff4ab2..70972b75335 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter001 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java index d3fafec1fe8..86bf9e889d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java @@ -62,7 +62,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter002 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java index e11281f777a..ff7d6043f30 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter003 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter003a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java index 4544e3119ed..96327a25e17 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter004 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter004a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java index b72c8d0c3cf..59fff44d750 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter005 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter005a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java index 632412c7706..4f7a4122077 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java @@ -61,7 +61,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter006 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter006a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java index 24c3e74bb56..40416c22480 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter007 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter007a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java index aa236d990df..bd836d28d0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java @@ -70,7 +70,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter008 * nsk.jdi.WatchpointRequest.addThreadFilter.addthreadfilter008a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java index 89593b3641f..6402a599dfe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.field.field001 * nsk.jdi.WatchpointRequest.field.field001a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java index e7053acf918..e5c8613c8af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java @@ -58,7 +58,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.WatchpointRequest.field.field002 * nsk.jdi.WatchpointRequest.field.field002a * @run main/othervm PropertyResolvingWrapper diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java index ed1ff950781..77f9ae6e973 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java @@ -37,7 +37,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.jdi.stress.ClassPrepareEvents.ClassPrepareEvents001.ClassPrepareEvents001 * @run main/othervm PropertyResolvingWrapper * nsk.jdi.stress.ClassPrepareEvents.ClassPrepareEvents001.ClassPrepareEvents001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java index 59d117049a3..ac0f05478ec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java index 0581f8dced6..5f95c050034 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java @@ -56,7 +56,6 @@ * * @library /vmTestbase * /test/lib - * @run driver jdk.test.lib.FileInstaller . . * @build nsk.share.jdi.EventTestTemplates * nsk.share.jdi.JDIEventsDebuggee * nsk.share.jdi.MonitorEventsDebuggee diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java index 7f081c52fce..d113f62376b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java @@ -42,7 +42,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from forceEarlyReturn001.tests * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java index 87612557076..f12844f931e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java @@ -44,7 +44,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from forceEarlyReturn002.tests * @build nsk.jdi.ThreadReference.forceEarlyReturn.forceEarlyReturn001.forceEarlyReturn001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java index 8514a16bf50..cf10ad7282b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java @@ -42,7 +42,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from heapwalking001.tests * @build nsk.jdi.ObjectReference.referringObjects.referringObjects003.referringObjects003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java index 3b32e597b61..984cb2b8742 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java @@ -44,7 +44,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from heapwalking002.tests * @build nsk.jdi.ObjectReference.referringObjects.referringObjects003.referringObjects003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java index b47bd71aeb9..39772d8ffb3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java @@ -43,7 +43,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from mixed001.tests * @build nsk.jdi.ObjectReference.referringObjects.referringObjects003.referringObjects003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java index 87859a1d7e2..9e09b35821f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java @@ -45,7 +45,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from mixed002.tests * @build nsk.jdi.ObjectReference.referringObjects.referringObjects003.referringObjects003 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java index 95c2ca7b44c..2cbfcd89fd0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java @@ -43,7 +43,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from monitorEvents001.tests * @build nsk.share.jdi.EventTestTemplates diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java index 2b2a2bc403f..f050185de3d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java @@ -45,7 +45,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from monitorEvents002.tests * @build nsk.share.jdi.EventTestTemplates diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java index dc25f24ec3d..49750461b4e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java @@ -42,7 +42,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from ownedMonitorsAndFrames001.tests * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames001.ownedMonitorsAndFrames001 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java index fdb61c7195a..7cc55f30483 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java @@ -44,7 +44,6 @@ * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * - * @run driver jdk.test.lib.FileInstaller . . * * @comment build classes required for tests from ownedMonitorsAndFrames002.tests * @build nsk.jdi.ThreadReference.ownedMonitorsAndFrames.ownedMonitorsAndFrames001.ownedMonitorsAndFrames001 From 3a0741afa1062982f660916d41a36ed43b48b236 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Tue, 4 Aug 2020 20:31:57 -0700 Subject: [PATCH 080/100] 8250920: Increase @jls usage in core reflection Reviewed-by: mchung --- .../classes/java/lang/reflect/AnnotatedArrayType.java | 3 ++- .../java/lang/reflect/AnnotatedParameterizedType.java | 3 ++- .../share/classes/java/lang/reflect/AnnotatedType.java | 8 ++++++++ .../java/lang/reflect/AnnotatedTypeVariable.java | 3 ++- .../java/lang/reflect/AnnotatedWildcardType.java | 3 ++- .../classes/java/lang/reflect/GenericArrayType.java | 4 +++- .../classes/java/lang/reflect/ParameterizedType.java | 5 +++-- .../share/classes/java/lang/reflect/Type.java | 10 +++++++++- .../share/classes/java/lang/reflect/TypeVariable.java | 3 ++- .../share/classes/java/lang/reflect/WildcardType.java | 3 ++- 10 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java index d9b8223c758..fa9ccc03686 100644 --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedArrayType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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,6 +31,7 @@ package java.lang.reflect; * array type, whose component type may itself represent the annotated use of a * type. * + * @jls 10.1 Array Types * @since 1.8 */ public interface AnnotatedArrayType extends AnnotatedType { diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java index b42530ef82e..fc32e910116 100644 --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -30,6 +30,7 @@ package java.lang.reflect; * of a parameterized type, whose type arguments may themselves represent * annotated uses of types. * + * @jls 4.5 Parameterized Types * @since 1.8 */ public interface AnnotatedParameterizedType extends AnnotatedType { diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java index a22e5c26336..662cdd42e36 100644 --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedType.java @@ -37,6 +37,14 @@ import java.lang.annotation.Annotation; * type annotations (JLS {@jls 9.7.4}) as the entity being * potentially annotated is a type. * + * @jls 4.1 The Kinds of Types and Values + * @jls 4.2 Primitive Types and Values + * @jls 4.3 Reference Types and Values + * @jls 4.4 Type Variables + * @jls 4.5 Parameterized Types + * @jls 4.8 Raw Types + * @jls 4.9 Intersection Types + * @jls 10.1 Array Types * @since 1.8 */ public interface AnnotatedType extends AnnotatedElement { diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java index cab83f361c3..4d94bd38aec 100644 --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedTypeVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -30,6 +30,7 @@ package java.lang.reflect; * type variable, whose declaration may have bounds which themselves represent * annotated uses of types. * + * @jls 4.4 Type Variables * @since 1.8 */ public interface AnnotatedTypeVariable extends AnnotatedType { diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java index d46d269d343..8a211eab6bf 100644 --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedWildcardType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 @@ -30,6 +30,7 @@ package java.lang.reflect; * wildcard type argument, whose upper or lower bounds may themselves represent * annotated uses of types. * + * @jls 4.5.1 Type Arguments of Parameterized Types * @since 1.8 */ public interface AnnotatedWildcardType extends AnnotatedType { diff --git a/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java b/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java index c45399e7a24..ad4e047f748 100644 --- a/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java +++ b/src/java.base/share/classes/java/lang/reflect/GenericArrayType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -28,6 +28,8 @@ package java.lang.reflect; /** * {@code GenericArrayType} represents an array type whose component * type is either a parameterized type or a type variable. + * + * @jls 10.1 Array Types * @since 1.5 */ public interface GenericArrayType extends Type { diff --git a/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java b/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java index a1b139894ed..62d6b7bf9e5 100644 --- a/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java +++ b/src/java.base/share/classes/java/lang/reflect/ParameterizedType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -28,7 +28,7 @@ package java.lang.reflect; /** * ParameterizedType represents a parameterized type such as - * Collection<String>. + * {@code Collection}. * *

      A parameterized type is created the first time it is needed by a * reflective method, as specified in this package. When a @@ -42,6 +42,7 @@ package java.lang.reflect; * an equals() method that equates any two instances that share the * same generic type declaration and have equal type parameters. * + * @jls 4.5 Parameterized Types * @since 1.5 */ public interface ParameterizedType extends Type { diff --git a/src/java.base/share/classes/java/lang/reflect/Type.java b/src/java.base/share/classes/java/lang/reflect/Type.java index eee74435880..1754784d97e 100644 --- a/src/java.base/share/classes/java/lang/reflect/Type.java +++ b/src/java.base/share/classes/java/lang/reflect/Type.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -30,6 +30,14 @@ package java.lang.reflect; * programming language. These include raw types, parameterized types, * array types, type variables and primitive types. * + * @jls 4.1 The Kinds of Types and Values + * @jls 4.2 Primitive Types and Values + * @jls 4.3 Reference Types and Values + * @jls 4.4 Type Variables + * @jls 4.5 Parameterized Types + * @jls 4.8 Raw Types + * @jls 4.9 Intersection Types + * @jls 10.1 Array Types * @since 1.5 */ public interface Type { diff --git a/src/java.base/share/classes/java/lang/reflect/TypeVariable.java b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java index 6e4b105c3ba..0064aed2a22 100644 --- a/src/java.base/share/classes/java/lang/reflect/TypeVariable.java +++ b/src/java.base/share/classes/java/lang/reflect/TypeVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -46,6 +46,7 @@ package java.lang.reflect; * @param the type of generic declaration that declared the * underlying type variable. * + * @jls 4.4 Type Variables * @since 1.5 */ public interface TypeVariable extends Type, AnnotatedElement { diff --git a/src/java.base/share/classes/java/lang/reflect/WildcardType.java b/src/java.base/share/classes/java/lang/reflect/WildcardType.java index 7b8f3962514..0ef18413ea4 100644 --- a/src/java.base/share/classes/java/lang/reflect/WildcardType.java +++ b/src/java.base/share/classes/java/lang/reflect/WildcardType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 @@ -29,6 +29,7 @@ package java.lang.reflect; * WildcardType represents a wildcard type expression, such as * {@code ?}, {@code ? extends Number}, or {@code ? super Integer}. * + * @jls 4.5.1 Type Arguments of Parameterized Types * @since 1.5 */ public interface WildcardType extends Type { From 106635788737fb3c15ab069b2b00b4504a700698 Mon Sep 17 00:00:00 2001 From: Boris Ulasevich Date: Wed, 5 Aug 2020 06:31:32 -0400 Subject: [PATCH 081/100] 8248445: Use of AbsI/AbsL nodes should be limited to supported platforms Reviewed-by: kvn, vlivanov --- src/hotspot/share/opto/cfgnode.cpp | 25 ++++------ test/hotspot/jtreg/compiler/c2/TestAbs.java | 51 +++++++++++++++++++++ 2 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestAbs.java diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp index ee3cd30eea5..e90c24df308 100644 --- a/src/hotspot/share/opto/cfgnode.cpp +++ b/src/hotspot/share/opto/cfgnode.cpp @@ -1605,40 +1605,33 @@ static Node* is_absolute( PhaseGVN *phase, PhiNode *phi_root, int true_path) { // Check other phi input for subtract node Node *sub = phi_root->in(3 - phi_x_idx); + bool is_sub = sub->Opcode() == Op_SubF || sub->Opcode() == Op_SubD || + sub->Opcode() == Op_SubI || sub->Opcode() == Op_SubL; + // Allow only Sub(0,X) and fail out for all others; Neg is not OK - if( tzero == TypeF::ZERO ) { - if( sub->Opcode() != Op_SubF || - sub->in(2) != x || - phase->type(sub->in(1)) != tzero ) return NULL; + if (!is_sub || phase->type(sub->in(1)) != tzero || sub->in(2) != x) return NULL; + + if (tzero == TypeF::ZERO) { x = new AbsFNode(x); if (flip) { x = new SubFNode(sub->in(1), phase->transform(x)); } } else if (tzero == TypeD::ZERO) { - if( sub->Opcode() != Op_SubD || - sub->in(2) != x || - phase->type(sub->in(1)) != tzero ) return NULL; x = new AbsDNode(x); if (flip) { x = new SubDNode(sub->in(1), phase->transform(x)); } - } else if (tzero == TypeInt::ZERO) { - if (sub->Opcode() != Op_SubI || - sub->in(2) != x || - phase->type(sub->in(1)) != tzero) return NULL; + } else if (tzero == TypeInt::ZERO && Matcher::match_rule_supported(Op_AbsI)) { x = new AbsINode(x); if (flip) { x = new SubINode(sub->in(1), phase->transform(x)); } - } else { - if (sub->Opcode() != Op_SubL || - sub->in(2) != x || - phase->type(sub->in(1)) != tzero) return NULL; + } else if (tzero == TypeLong::ZERO && Matcher::match_rule_supported(Op_AbsL)) { x = new AbsLNode(x); if (flip) { x = new SubLNode(sub->in(1), phase->transform(x)); } - } + } else return NULL; return x; } diff --git a/test/hotspot/jtreg/compiler/c2/TestAbs.java b/test/hotspot/jtreg/compiler/c2/TestAbs.java new file mode 100644 index 00000000000..6dfbbbfd5b6 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestAbs.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2020, BELLSOFT. 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package compiler.c2; + +/* + * @test + * @bug 8248445 + * @summary Use of AbsI / AbsL nodes should be limited to supported platforms + * @requires vm.debug == true + * + * @run main/othervm -XX:-TieredCompilation -Xbatch -XX:CompileOnly=java.lang.Math::abs compiler.c2.TestAbs + */ +public class TestAbs { + + public static void test() { + // java.lang.Math.abs() collapses into AbsI/AbsL nodes on platforms that support the correspondent nodes + // Using unsupported nodes triggers a console warning on a release build and gives an error on a debug build + Math.abs(1); + Math.abs(-1); + Math.abs(1L); + Math.abs(-1L); + } + + public static void main(String args[]) { + for (int i = 0; i < 20_000; i++) { + test(); + } + } +} + From c200b4f1cb0740edd6f29c98dda71e4e7ac401df Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Wed, 5 Aug 2020 13:27:43 +0000 Subject: [PATCH 082/100] 8139875: [TESTBUG] Improve nsk/stress/stack/* tests Use -Xss200k to limit the stack size, avoid running with -Xcomp, and, in one test, reduce iterations. Reviewed-by: dholmes, lfoltan --- .../vmTestbase/nsk/stress/stack/stack008.java | 10 ++++------ .../vmTestbase/nsk/stress/stack/stack016.java | 10 +++++----- .../vmTestbase/nsk/stress/stack/stack017.java | 12 ++++++------ .../vmTestbase/nsk/stress/stack/stack018.java | 10 +++++----- .../vmTestbase/nsk/stress/stack/stack019.java | 17 +++++++++-------- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java index d98224778b5..1b726676f71 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack008.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2020, 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,8 +26,7 @@ * @key stress * * @summary converted from VM testbase nsk/stress/stack/stack008. - * VM testbase keywords: [stress, stack, nonconcurrent, exclude] - * VM testbase comments: 8139875 + * VM testbase keywords: [stress, stack, nonconcurrent] * VM testbase readme: * DESCRIPTION * This test provokes multiple stack overflows in the same thread @@ -46,9 +45,8 @@ * See the bug: * 4366625 (P4/S4) multiple stack overflow causes HS crash * - * @ignore 8139875 - * @requires vm.opt.DeoptimizeALot != true - * @run main/othervm/timeout=900 nsk.stress.stack.stack008 + * @requires (vm.opt.DeoptimizeALot != true & vm.compMode != "Xcomp") + * @run main/othervm/timeout=900 -Xss200K nsk.stress.stack.stack008 */ package nsk.stress.stack; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java index 559fc9143fb..86dbe224399 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack016.java @@ -26,8 +26,7 @@ * @key stress * * @summary converted from VM testbase nsk/stress/stack/stack016. - * VM testbase keywords: [stress, diehard, stack, nonconcurrent, exclude] - * VM testbase comments: 8139875 + * VM testbase keywords: [stress, diehard, stack, nonconcurrent] * VM testbase readme: * DESCRIPTION * The test provokes second stack overflow from within the @@ -49,9 +48,10 @@ * See the bug: * 4366625 (P4/S4) multiple stack overflow causes HS crash * - * @ignore 8139875 - * @requires vm.opt.DeoptimizeALot != true - * @run main/othervm/timeout=900 nsk.stress.stack.stack016 -eager + * @requires (vm.opt.DeoptimizeALot != true & vm.compMode != "Xcomp") + * @library /vmTestbase + * @build nsk.share.Terminator + * @run main/othervm/timeout=900 -Xss200K nsk.stress.stack.stack016 -eager */ package nsk.stress.stack; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java index c814244d06a..2ff8408ca05 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack017.java @@ -26,8 +26,7 @@ * @key stress * * @summary converted from VM testbase nsk/stress/stack/stack017. - * VM testbase keywords: [stress, diehard, stack, nonconcurrent, exclude] - * VM testbase comments: 8139875 + * VM testbase keywords: [stress, diehard, stack, nonconcurrent] * VM testbase readme: * DESCRIPTION * The test invokes infinitely recursive method from within stack @@ -42,9 +41,10 @@ * See the bug: * 4366625 (P4/S4) multiple stack overflow causes HS crash * - * @ignore 8139875 - * @requires vm.opt.DeoptimizeALot != true - * @run main/othervm/timeout=900 nsk.stress.stack.stack017 -eager + * @requires (vm.opt.DeoptimizeALot != true & vm.compMode != "Xcomp") + * @library /vmTestbase + * @build nsk.share.Terminator + * @run main/othervm/timeout=900 -Xss200K nsk.stress.stack.stack017 -eager */ package nsk.stress.stack; @@ -154,7 +154,7 @@ public class stack017 extends Thread { throw error; // - // Stack problem caugth: provoke it again, + // Stack problem caught: provoke it again, // if current stack is enough deep: // if (depth < depthToTry - PROBES) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java index 917d77fdcc4..72d7d27d286 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack018.java @@ -26,8 +26,7 @@ * @key stress * * @summary converted from VM testbase nsk/stress/stack/stack018. - * VM testbase keywords: [stress, diehard, stack, nonconcurrent, exclude] - * VM testbase comments: 8139875 + * VM testbase keywords: [stress, diehard, stack, nonconcurrent] * VM testbase readme: * DESCRIPTION * This test provokes multiple stack overflows by invocations via @@ -47,9 +46,10 @@ * See the bug: * 4366625 (P4/S4) multiple stack overflow causes HS crash * - * @ignore 8139875 - * @requires vm.opt.DeoptimizeALot != true - * @run main/othervm/timeout=900 nsk.stress.stack.stack018 -eager + * @requires (vm.opt.DeoptimizeALot != true & vm.compMode != "Xcomp") + * @library /vmTestbase + * @build nsk.share.Terminator + * @run main/othervm/timeout=900 -Xss200K nsk.stress.stack.stack018 -eager */ package nsk.stress.stack; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java index 608dec82b98..dc5bec58c2d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/stack019.java @@ -26,8 +26,7 @@ * @key stress * * @summary converted from VM testbase nsk/stress/stack/stack019. - * VM testbase keywords: [stress, diehard, stack, nonconcurrent, exclude] - * VM testbase comments: 8139875 + * VM testbase keywords: [stress, diehard, stack, nonconcurrent] * VM testbase readme: * DESCRIPTION * The test invokes infinitely recursive method from within stack @@ -40,9 +39,11 @@ * See the bug: * 4366625 (P4/S4) multiple stack overflow causes HS crash * - * @ignore 8139875 - * @requires vm.opt.DeoptimizeALot != true - * @run main/othervm/timeout=900 nsk.stress.stack.stack019 -eager + * @requires (vm.opt.DeoptimizeALot != true & vm.compMode != "Xcomp") + * @requires os.family != "windows" + * @library /vmTestbase + * @build nsk.share.Terminator + * @run main/othervm/timeout=900 -Xss200K nsk.stress.stack.stack019 -eager */ package nsk.stress.stack; @@ -53,8 +54,8 @@ import nsk.share.Terminator; import java.io.PrintStream; public class stack019 { - private final static int CYCLES = 100; - private final static int PROBES = 100; + private final static int CYCLES = 50; + private final static int PROBES = 50; public static void main(String[] args) { int exitCode = run(args, System.out); @@ -123,7 +124,7 @@ public class stack019 { throw error; // - // Stack problem caugth: provoke it again, + // Stack problem caught: provoke it again, // if current stack is enough deep: // if (depth < depthToTry - PROBES) From 97bbbbba51b458371894e7c4f2e422b1adb67088 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Wed, 5 Aug 2020 10:25:49 -0400 Subject: [PATCH 083/100] 8235573: Move JFR ObjectSample oop into OopStorage Reviewed-by: mgronlun, dholmes, kbarrett --- src/hotspot/share/gc/shared/oopStorageSet.hpp | 2 +- .../share/gc/shared/weakProcessorPhases.cpp | 10 +-- .../share/gc/shared/weakProcessorPhases.hpp | 7 +- .../gc/shenandoah/shenandoahPhaseTimings.hpp | 2 - .../gc/shenandoah/shenandoahRootProcessor.cpp | 8 -- .../gc/shenandoah/shenandoahRootProcessor.hpp | 9 -- src/hotspot/share/gc/z/zRootsIterator.cpp | 15 +--- src/hotspot/share/gc/z/zRootsIterator.hpp | 2 - src/hotspot/share/jfr/jfr.cpp | 6 -- src/hotspot/share/jfr/jfr.hpp | 3 - .../share/jfr/leakprofiler/leakProfiler.cpp | 8 -- .../share/jfr/leakprofiler/leakProfiler.hpp | 5 -- .../leakprofiler/sampling/objectSample.cpp | 32 +++++-- .../leakprofiler/sampling/objectSample.hpp | 22 ++--- .../leakprofiler/sampling/objectSampler.cpp | 86 +++++++++++-------- .../leakprofiler/sampling/objectSampler.hpp | 19 ++-- .../share/jfr/recorder/jfrRecorder.cpp | 9 ++ .../share/jfr/recorder/jfrRecorder.hpp | 1 + src/hotspot/share/oops/weakHandle.hpp | 5 +- 19 files changed, 116 insertions(+), 135 deletions(-) diff --git a/src/hotspot/share/gc/shared/oopStorageSet.hpp b/src/hotspot/share/gc/shared/oopStorageSet.hpp index b4952b8358e..ff8a43bd65a 100644 --- a/src/hotspot/share/gc/shared/oopStorageSet.hpp +++ b/src/hotspot/share/gc/shared/oopStorageSet.hpp @@ -38,7 +38,7 @@ class OopStorageSet : public AllStatic { public: // Must be updated when new OopStorages are introduced static const uint strong_count = 2; - static const uint weak_count = 4; + static const uint weak_count = 4 JFR_ONLY(+ 1); static const uint all_count = strong_count + weak_count; private: diff --git a/src/hotspot/share/gc/shared/weakProcessorPhases.cpp b/src/hotspot/share/gc/shared/weakProcessorPhases.cpp index 2c2fc41662b..86d82290324 100644 --- a/src/hotspot/share/gc/shared/weakProcessorPhases.cpp +++ b/src/hotspot/share/gc/shared/weakProcessorPhases.cpp @@ -27,19 +27,15 @@ #include "utilities/debug.hpp" #include "utilities/macros.hpp" -#if INCLUDE_JFR -#include "jfr/jfr.hpp" -#endif // INCLUDE_JFR - #if INCLUDE_JVMTI #include "prims/jvmtiExport.hpp" #endif // INCLUDE_JVMTI -// serial_phase_count is 0 if JFR and JVMTI are both not built, +// serial_phase_count is 0 if JVMTI is not built, // requiring some code to be careful to avoid tautological checks // that some compilers warn about. -#define HAVE_SERIAL_PHASES (INCLUDE_JVMTI || INCLUDE_JFR) +#define HAVE_SERIAL_PHASES INCLUDE_JVMTI WeakProcessorPhases::Phase WeakProcessorPhases::serial_phase(uint value) { #if HAVE_SERIAL_PHASES @@ -109,7 +105,6 @@ void WeakProcessorPhases::Iterator::verify_dereferenceable() const { const char* WeakProcessorPhases::description(Phase phase) { switch (phase) { JVMTI_ONLY(case jvmti: return "JVMTI weak processing";) - JFR_ONLY(case jfr: return "JFR weak processing";) default: ShouldNotReachHere(); return "Invalid serial weak processing phase"; @@ -119,7 +114,6 @@ const char* WeakProcessorPhases::description(Phase phase) { WeakProcessorPhases::Processor WeakProcessorPhases::processor(Phase phase) { switch (phase) { JVMTI_ONLY(case jvmti: return &JvmtiExport::weak_oops_do;) - JFR_ONLY(case jfr: return &Jfr::weak_oops_do;) default: ShouldNotReachHere(); return NULL; diff --git a/src/hotspot/share/gc/shared/weakProcessorPhases.hpp b/src/hotspot/share/gc/shared/weakProcessorPhases.hpp index 3103373001c..8730a8a590f 100644 --- a/src/hotspot/share/gc/shared/weakProcessorPhases.hpp +++ b/src/hotspot/share/gc/shared/weakProcessorPhases.hpp @@ -41,15 +41,14 @@ public: typedef void (*Processor)(BoolObjectClosure*, OopClosure*); enum Phase { - // Serial phases. - JVMTI_ONLY(jvmti JFR_ONLY(COMMA)) - JFR_ONLY(jfr) + // Serial phase. + JVMTI_ONLY(jvmti) // Additional implicit phase values follow for oopstorages. }; static const uint serial_phase_start = 0; - static const uint serial_phase_count = 0 JVMTI_ONLY(+ 1) JFR_ONLY(+ 1); + static const uint serial_phase_count = 0 JVMTI_ONLY(+ 1); static const uint oopstorage_phase_start = serial_phase_count; static const uint oopstorage_phase_count = OopStorageSet::weak_count; static const uint phase_count = serial_phase_count + oopstorage_phase_count; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp index 1e07ed35d12..c354f510c93 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp @@ -25,7 +25,6 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP -#include "jfr/jfrEvents.hpp" #include "gc/shenandoah/shenandoahNumberSeq.hpp" #include "gc/shared/workerDataArray.hpp" #include "memory/allocation.hpp" @@ -43,7 +42,6 @@ class outputStream; f(CNT_PREFIX ## ObjectSynchronizerRoots, DESC_PREFIX "Synchronizer Roots") \ f(CNT_PREFIX ## CLDGRoots, DESC_PREFIX "CLDG Roots") \ f(CNT_PREFIX ## JVMTIWeakRoots, DESC_PREFIX "JVMTI Weak Roots") \ - f(CNT_PREFIX ## JFRWeakRoots, DESC_PREFIX "JFR Weak Roots") \ f(CNT_PREFIX ## StringDedupTableRoots, DESC_PREFIX "Dedup Table Roots") \ f(CNT_PREFIX ## StringDedupQueueRoots, DESC_PREFIX "Dedup Queue Roots") \ f(CNT_PREFIX ## FinishQueues, DESC_PREFIX "Finish Queues") \ diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp index 1e71a4863bf..4f8cebab6f9 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp @@ -35,7 +35,6 @@ #include "gc/shenandoah/shenandoahPhaseTimings.hpp" #include "gc/shenandoah/shenandoahStringDedup.hpp" #include "gc/shenandoah/shenandoahVMOperations.hpp" -#include "jfr/jfr.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" @@ -81,15 +80,8 @@ ShenandoahJVMTIWeakRoot::ShenandoahJVMTIWeakRoot(ShenandoahPhaseTimings::Phase p } #endif // INCLUDE_JVMTI -#if INCLUDE_JFR -ShenandoahJFRWeakRoot::ShenandoahJFRWeakRoot(ShenandoahPhaseTimings::Phase phase) : - ShenandoahWeakSerialRoot(&Jfr::weak_oops_do, phase, ShenandoahPhaseTimings::JFRWeakRoots) { -} -#endif // INCLUDE_JFR - void ShenandoahSerialWeakRoots::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* keep_alive, uint worker_id) { JVMTI_ONLY(_jvmti_weak_roots.weak_oops_do(is_alive, keep_alive, worker_id);) - JFR_ONLY(_jfr_weak_roots.weak_oops_do(is_alive, keep_alive, worker_id);) } void ShenandoahSerialWeakRoots::weak_oops_do(OopClosure* cl, uint worker_id) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp index bf20e8f9e9d..efafc134ce3 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp @@ -79,21 +79,12 @@ public: }; #endif // INCLUDE_JVMTI -#if INCLUDE_JFR -class ShenandoahJFRWeakRoot : public ShenandoahWeakSerialRoot { -public: - ShenandoahJFRWeakRoot(ShenandoahPhaseTimings::Phase phase); -}; -#endif // INCLUDE_JFR - class ShenandoahSerialWeakRoots { private: JVMTI_ONLY(ShenandoahJVMTIWeakRoot _jvmti_weak_roots;) - JFR_ONLY(ShenandoahJFRWeakRoot _jfr_weak_roots;) public: ShenandoahSerialWeakRoots(ShenandoahPhaseTimings::Phase phase) JVMTI_ONLY(: _jvmti_weak_roots(phase)) - JFR_ONLY(NOT_JVMTI(:) JVMTI_ONLY(COMMA) _jfr_weak_roots(phase)) {}; void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* keep_alive, uint worker_id); diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp index a62392dba50..53b76f1f62c 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.cpp +++ b/src/hotspot/share/gc/z/zRootsIterator.cpp @@ -50,9 +50,6 @@ #include "runtime/thread.hpp" #include "runtime/vmThread.hpp" #include "utilities/debug.hpp" -#if INCLUDE_JFR -#include "jfr/jfr.hpp" -#endif static const ZStatSubPhase ZSubPhasePauseRootsSetup("Pause Roots Setup"); static const ZStatSubPhase ZSubPhasePauseRoots("Pause Roots"); @@ -74,7 +71,6 @@ static const ZStatSubPhase ZSubPhasePauseWeakRootsSetup("Pause Weak Roots Setup" static const ZStatSubPhase ZSubPhasePauseWeakRoots("Pause Weak Roots"); static const ZStatSubPhase ZSubPhasePauseWeakRootsTeardown("Pause Weak Roots Teardown"); static const ZStatSubPhase ZSubPhasePauseWeakRootsJVMTIWeakExport("Pause Weak Roots JVMTIWeakExport"); -static const ZStatSubPhase ZSubPhasePauseWeakRootsJFRWeak("Pause Weak Roots JFRWeak"); static const ZStatSubPhase ZSubPhaseConcurrentWeakRoots("Concurrent Weak Roots"); static const ZStatSubPhase ZSubPhaseConcurrentWeakRootsOopStorageSet("Concurrent Weak Roots OopStorageSet"); @@ -295,8 +291,7 @@ void ZConcurrentRootsIterator::oops_do(ZRootsIteratorClosure* cl) { } ZWeakRootsIterator::ZWeakRootsIterator() : - _jvmti_weak_export(this), - _jfr_weak(this) { + _jvmti_weak_export(this) { assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint"); ZStatTimer timer(ZSubPhasePauseWeakRootsSetup); } @@ -310,17 +305,9 @@ void ZWeakRootsIterator::do_jvmti_weak_export(BoolObjectClosure* is_alive, ZRoot JvmtiExport::weak_oops_do(is_alive, cl); } -void ZWeakRootsIterator::do_jfr_weak(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl) { -#if INCLUDE_JFR - ZStatTimer timer(ZSubPhasePauseWeakRootsJFRWeak); - Jfr::weak_oops_do(is_alive, cl); -#endif -} - void ZWeakRootsIterator::weak_oops_do(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl) { ZStatTimer timer(ZSubPhasePauseWeakRoots); _jvmti_weak_export.weak_oops_do(is_alive, cl); - _jfr_weak.weak_oops_do(is_alive, cl); } void ZWeakRootsIterator::oops_do(ZRootsIteratorClosure* cl) { diff --git a/src/hotspot/share/gc/z/zRootsIterator.hpp b/src/hotspot/share/gc/z/zRootsIterator.hpp index 82ca26bfdde..0f2496e0be7 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.hpp +++ b/src/hotspot/share/gc/z/zRootsIterator.hpp @@ -170,10 +170,8 @@ public: class ZWeakRootsIterator { private: void do_jvmti_weak_export(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl); - void do_jfr_weak(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl); ZSerialWeakOopsDo _jvmti_weak_export; - ZSerialWeakOopsDo _jfr_weak; public: ZWeakRootsIterator(); diff --git a/src/hotspot/share/jfr/jfr.cpp b/src/hotspot/share/jfr/jfr.cpp index c7388267996..7fb4eb29c85 100644 --- a/src/hotspot/share/jfr/jfr.cpp +++ b/src/hotspot/share/jfr/jfr.cpp @@ -102,12 +102,6 @@ void Jfr::on_vm_error_report(outputStream* st) { } } -void Jfr::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { - if (LeakProfiler::is_running()) { - LeakProfiler::weak_oops_do(is_alive, f); - } -} - bool Jfr::on_flight_recorder_option(const JavaVMOption** option, char* delimiter) { return JfrOptionSet::parse_flight_recorder_option(option, delimiter); } diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp index 0e9e9035de7..a249089d570 100644 --- a/src/hotspot/share/jfr/jfr.hpp +++ b/src/hotspot/share/jfr/jfr.hpp @@ -28,9 +28,7 @@ #include "jni.h" #include "memory/allocation.hpp" -class BoolObjectClosure; class JavaThread; -class OopClosure; class Thread; extern "C" void JNICALL jfr_register_natives(JNIEnv*, jclass); @@ -53,7 +51,6 @@ class Jfr : AllStatic { static bool on_flight_recorder_option(const JavaVMOption** option, char* delimiter); static bool on_start_flight_recording_option(const JavaVMOption** option, char* delimiter); static void on_vm_error_report(outputStream* st); - static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f); static void exclude_thread(Thread* thread); static bool is_excluded(Thread* thread); static void include_thread(Thread* thread); diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp index e6f064ee0e0..cf611d299dc 100644 --- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp +++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp @@ -89,14 +89,6 @@ void LeakProfiler::emit_events(int64_t cutoff_ticks, bool emit_all, bool skip_bf ObjectSampler::release(); } -void LeakProfiler::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { - assert(SafepointSynchronize::is_at_safepoint(), - "Leak Profiler::oops_do(...) may only be called during safepoint"); - if (is_running()) { - ObjectSampler::weak_oops_do(is_alive, f); - } -} - void LeakProfiler::sample(HeapWord* object, size_t size, JavaThread* thread) { assert(is_running(), "invariant"); assert(thread != NULL, "invariant"); diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp index 36e07bbd3a3..c541ff1086d 100644 --- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp +++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp @@ -27,8 +27,6 @@ #include "memory/allocation.hpp" -class BoolObjectClosure; -class OopClosure; class JavaThread; class LeakProfiler : public AllStatic { @@ -39,9 +37,6 @@ class LeakProfiler : public AllStatic { static void emit_events(int64_t cutoff_ticks, bool emit_all, bool skip_bfs); static void sample(HeapWord* object, size_t size, JavaThread* thread); - - // Called by GC - static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f); }; #endif // SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.cpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.cpp index c56043c2445..725eb0b672e 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.cpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.cpp @@ -23,16 +23,36 @@ */ #include "precompiled.hpp" #include "jfr/leakprofiler/sampling/objectSample.hpp" -#include "oops/access.inline.hpp" +#include "jfr/leakprofiler/sampling/objectSampler.hpp" +#include "oops/weakHandle.inline.hpp" +#include "runtime/handles.inline.hpp" -const oop ObjectSample::object() const { - return NativeAccess::oop_load(&_object); +void ObjectSample::reset() { + release(); + set_stack_trace_id(0); + set_stack_trace_hash(0); + release_references(); } -const oop ObjectSample::object_raw() const { - return RawAccess<>::oop_load(&_object); +const oop ObjectSample::object() const { + return _object.resolve(); +} + +bool ObjectSample::is_dead() const { + return _object.peek() == NULL; +} + +const oop* ObjectSample::object_addr() const { + return _object.ptr_raw(); } void ObjectSample::set_object(oop object) { - NativeAccess::oop_store(&_object, object); + assert(_object.is_empty(), "should be empty"); + Handle h(Thread::current(), object); + _object = WeakHandle(ObjectSampler::oop_storage(), h); +} + +void ObjectSample::release() { + _object.release(ObjectSampler::oop_storage()); + _object = WeakHandle(); } diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp index 4f77d400f27..9401c77113a 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp @@ -31,6 +31,7 @@ #include "jfr/utilities/jfrTypes.hpp" #include "memory/allocation.hpp" #include "oops/oop.hpp" +#include "oops/weakHandle.hpp" #include "utilities/ticks.hpp" /* @@ -48,7 +49,7 @@ class ObjectSample : public JfrCHeapObj { JfrBlobHandle _stacktrace; JfrBlobHandle _thread; JfrBlobHandle _type_set; - oop _object; + WeakHandle _object; Ticks _allocation_time; traceid _stack_trace_id; traceid _thread_id; @@ -64,12 +65,7 @@ class ObjectSample : public JfrCHeapObj { _type_set.~JfrBlobHandle(); } - void reset() { - _object = NULL; - set_stack_trace_id(0); - set_stack_trace_hash(0); - release_references(); - } + void reset(); public: ObjectSample() : _next(NULL), @@ -77,7 +73,6 @@ class ObjectSample : public JfrCHeapObj { _stacktrace(), _thread(), _type_set(), - _object(NULL), _allocation_time(), _stack_trace_id(0), _thread_id(0), @@ -103,17 +98,14 @@ class ObjectSample : public JfrCHeapObj { _previous = prev; } - bool is_dead() const { - return object() == NULL; - } + bool is_dead() const; const oop object() const; - const oop object_raw() const; void set_object(oop object); - const oop* object_addr() const { - return &_object; - } + const oop* object_addr() const; + + void release(); int index() const { return _index; diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp index 3782371ce09..9c956edf73d 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp @@ -23,6 +23,8 @@ */ #include "precompiled.hpp" +#include "gc/shared/oopStorage.hpp" +#include "gc/shared/oopStorageSet.hpp" #include "jfr/jfrEvents.hpp" #include "jfr/leakprofiler/sampling/objectSample.hpp" #include "jfr/leakprofiler/sampling/objectSampler.hpp" @@ -41,6 +43,40 @@ #include "runtime/safepoint.hpp" #include "runtime/thread.hpp" +// Timestamp of when the gc last processed the set of sampled objects. +static JfrTicks _last_sweep; + +// Condition variable to communicate that some sampled objects have been cleared by the gc +// and can therefore be removed from the sample priority queue. +static bool volatile _dead_samples = false; + +// The OopStorage instance is used to hold weak references to sampled objects. +// It is constructed and registered during VM initialization. This is a singleton +// that persist independent of the state of the ObjectSampler. +static OopStorage* _oop_storage = NULL; + +OopStorage* ObjectSampler::oop_storage() { return _oop_storage; } + +// Callback invoked by the GC after an iteration over the oop storage +// that may have cleared dead referents. num_dead is the number of entries +// already NULL or cleared by the iteration. +void ObjectSampler::oop_storage_gc_notification(size_t num_dead) { + if (num_dead != 0) { + // The ObjectSampler instance may have already been cleaned or a new + // instance was created concurrently. This allows for a small race where cleaning + // could be done again. + Atomic::store(&_dead_samples, true); + _last_sweep = JfrTicks::now(); + } +} + +bool ObjectSampler::create_oop_storage() { + _oop_storage = OopStorageSet::create_weak("Weak JFR Old Object Samples"); + assert(_oop_storage != NULL, "invariant"); + _oop_storage->register_num_dead_callback(&oop_storage_gc_notification); + return true; +} + static ObjectSampler* _instance = NULL; static ObjectSampler& instance() { @@ -49,13 +85,14 @@ static ObjectSampler& instance() { } ObjectSampler::ObjectSampler(size_t size) : - _priority_queue(new SamplePriorityQueue(size)), - _list(new SampleList(size)), - _last_sweep(JfrTicks::now()), - _total_allocated(0), - _threshold(0), - _size(size), - _dead_samples(false) {} + _priority_queue(new SamplePriorityQueue(size)), + _list(new SampleList(size)), + _total_allocated(0), + _threshold(0), + _size(size) { + _last_sweep = JfrTicks::now(); + Atomic::store(&_dead_samples, false); +} ObjectSampler::~ObjectSampler() { delete _priority_queue; @@ -66,6 +103,7 @@ ObjectSampler::~ObjectSampler() { bool ObjectSampler::create(size_t size) { assert(SafepointSynchronize::is_at_safepoint(), "invariant"); + assert(_oop_storage != NULL, "should be already created"); assert(_instance == NULL, "invariant"); _instance = new ObjectSampler(size); return _instance != NULL; @@ -92,13 +130,11 @@ void ObjectSampler::destroy() { static volatile int _lock = 0; ObjectSampler* ObjectSampler::acquire() { - assert(is_created(), "invariant"); while (Atomic::cmpxchg(&_lock, 0, 1) == 1) {} return _instance; } void ObjectSampler::release() { - assert(is_created(), "invariant"); OrderAccess::fence(); _lock = 0; } @@ -150,9 +186,11 @@ void ObjectSampler::add(HeapWord* obj, size_t allocated, traceid thread_id, Java assert(thread != NULL, "invariant"); assert(thread->jfr_thread_local()->has_thread_blob(), "invariant"); - if (_dead_samples) { + if (Atomic::load(&_dead_samples)) { + // There's a small race where a GC scan might reset this to true, potentially + // causing a back-to-back scavenge. + Atomic::store(&_dead_samples, false); scavenge(); - assert(!_dead_samples, "invariant"); } _total_allocated += allocated; @@ -199,12 +237,13 @@ void ObjectSampler::scavenge() { } current = next; } - _dead_samples = false; } void ObjectSampler::remove_dead(ObjectSample* sample) { assert(sample != NULL, "invariant"); assert(sample->is_dead(), "invariant"); + sample->release(); + ObjectSample* const previous = sample->prev(); // push span onto previous if (previous != NULL) { @@ -216,27 +255,6 @@ void ObjectSampler::remove_dead(ObjectSample* sample) { _list->release(sample); } -void ObjectSampler::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { - assert(is_created(), "invariant"); - assert(SafepointSynchronize::is_at_safepoint(), "invariant"); - ObjectSampler& sampler = instance(); - ObjectSample* current = sampler._list->last(); - while (current != NULL) { - if (current->_object != NULL) { - if (is_alive->do_object_b(current->object_raw())) { - // The weakly referenced object is alive, update pointer - f->do_oop(const_cast(current->object_addr())); - } else { - // clear existing field to assist GC barriers - current->_object = NULL; - sampler._dead_samples = true; - } - } - current = current->next(); - } - sampler._last_sweep = JfrTicks::now(); -} - ObjectSample* ObjectSampler::last() const { return _list->last(); } @@ -267,6 +285,6 @@ ObjectSample* ObjectSampler::item_at(int index) { ); } -const JfrTicks& ObjectSampler::last_sweep() const { +const JfrTicks& ObjectSampler::last_sweep() { return _last_sweep; } diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp index 4e75210488f..962735a309c 100644 --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp @@ -30,9 +30,8 @@ typedef u8 traceid; -class BoolObjectClosure; class JavaThread; -class OopClosure; +class OopStorage; class ObjectSample; class SampleList; class SamplePriorityQueue; @@ -41,17 +40,17 @@ class SamplePriorityQueue; // making sure the samples are evenly distributed as // new entries are added and removed. class ObjectSampler : public CHeapObj { + friend class JfrRecorder; friend class LeakProfiler; + friend class ObjectSample; friend class StartOperation; friend class StopOperation; private: SamplePriorityQueue* _priority_queue; SampleList* _list; - JfrTicks _last_sweep; size_t _total_allocated; size_t _threshold; size_t _size; - bool _dead_samples; // Lifecycle explicit ObjectSampler(size_t size); @@ -66,24 +65,26 @@ class ObjectSampler : public CHeapObj { void scavenge(); void remove_dead(ObjectSample* sample); - // Called by GC - static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f); - const ObjectSample* item_at(int index) const; ObjectSample* item_at(int index); int item_count() const; + // OopStorage + static bool create_oop_storage(); + static OopStorage* oop_storage(); + // Invoked by the GC post oop storage processing. + static void oop_storage_gc_notification(size_t num_dead); + public: static ObjectSampler* sampler(); // For operations that require exclusive access (non-safepoint) static ObjectSampler* acquire(); static void release(); - + static const JfrTicks& last_sweep(); const ObjectSample* first() const; ObjectSample* last() const; const ObjectSample* last_resolved() const; void set_last_resolved(const ObjectSample* sample); - const JfrTicks& last_sweep() const; }; #endif // SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp index 1abbc20d58a..254b5b5c27e 100644 --- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp +++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp @@ -27,6 +27,7 @@ #include "jfr/dcmd/jfrDcmds.hpp" #include "jfr/instrumentation/jfrJvmtiAgent.hpp" #include "jfr/jni/jfrJavaSupport.hpp" +#include "jfr/leakprofiler/sampling/objectSampler.hpp" #include "jfr/periodic/jfrOSInterface.hpp" #include "jfr/periodic/sampling/jfrThreadSampler.hpp" #include "jfr/recorder/jfrRecorder.hpp" @@ -73,12 +74,20 @@ bool JfrRecorder::is_enabled() { return _enabled; } +bool JfrRecorder::create_oop_storages() { + // currently only a single weak oop storage for Leak Profiler + return ObjectSampler::create_oop_storage(); +} + bool JfrRecorder::on_create_vm_1() { if (!is_disabled()) { if (FlightRecorder || StartFlightRecording != NULL) { enable(); } } + if (!create_oop_storages()) { + return false; + } // fast time initialization return JfrTime::initialize(); } diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp index 3b00303ea25..1fbda6544ef 100644 --- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp +++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp @@ -45,6 +45,7 @@ class JfrRecorder : public JfrCHeapObj { static bool create_chunk_repository(); static bool create_java_event_writer(); static bool create_jvmti_agent(); + static bool create_oop_storages(); static bool create_os_interface(); static bool create_post_box(); static bool create_recorder_thread(); diff --git a/src/hotspot/share/oops/weakHandle.hpp b/src/hotspot/share/oops/weakHandle.hpp index 59525adb665..435bc1e85cd 100644 --- a/src/hotspot/share/oops/weakHandle.hpp +++ b/src/hotspot/share/oops/weakHandle.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 @@ -58,6 +58,9 @@ class WeakHandle { void print() const; void print_on(outputStream* st) const; + + bool is_empty() const { return _obj == NULL; } + oop* ptr_raw() const { return _obj; } }; #endif // SHARE_OOPS_WEAKHANDLE_HPP From 96f56eb4fc7a4c30a7bf31687d32619a9a27134e Mon Sep 17 00:00:00 2001 From: Galder Zamarreno Date: Wed, 5 Aug 2020 11:59:10 +0200 Subject: [PATCH 084/100] 8248158: Configure fails with autoconf not found even though it's installed Reviewed-by: erikj, ihse, stooke --- make/autoconf/basic_tools.m4 | 1 - make/autoconf/configure | 12 ++++++------ make/autoconf/util.m4 | 2 +- make/autoconf/util_windows.m4 | 12 ++++++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4 index 01289305baf..9f0eea42d84 100644 --- a/make/autoconf/basic_tools.m4 +++ b/make/autoconf/basic_tools.m4 @@ -72,7 +72,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS], UTIL_REQUIRE_PROGS(UNAME, uname) UTIL_REQUIRE_PROGS(UNIQ, uniq) UTIL_REQUIRE_PROGS(WC, wc) - UTIL_REQUIRE_PROGS(WHICH, which) UTIL_REQUIRE_PROGS(XARGS, xargs) # Then required tools that require some special treatment. diff --git a/make/autoconf/configure b/make/autoconf/configure index 953ebb6f1f3..f635c19b644 100644 --- a/make/autoconf/configure +++ b/make/autoconf/configure @@ -78,11 +78,11 @@ generated_script="$build_support_dir/generated-configure.sh" ### autoconf_missing_help() { - APT_GET="`which apt-get 2> /dev/null | grep -v '^no apt-get in'`" - YUM="`which yum 2> /dev/null | grep -v '^no yum in'`" - BREW="`which brew 2> /dev/null | grep -v '^no brew in'`" - ZYPPER="`which zypper 2> /dev/null | grep -v '^no zypper in'`" - CYGWIN="`which cygpath 2> /dev/null | grep -v '^no cygpath in'`" + APT_GET="`type -p apt-get 2> /dev/null`" + YUM="`type -p yum 2> /dev/null`" + BREW="`type -p brew 2> /dev/null`" + ZYPPER="`type -p zypper 2> /dev/null`" + CYGWIN="`type -p cygpath 2> /dev/null`" if test "x$ZYPPER" != x; then PKGHANDLER_COMMAND="sudo zypper install autoconf" @@ -111,7 +111,7 @@ generate_configure_script() { exit 1 fi else - AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" + AUTOCONF="`type -p autoconf 2> /dev/null`" if test "x$AUTOCONF" = x; then echo echo "Autoconf is not found on the PATH, and AUTOCONF is not set." diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4 index 3ab9bf5f5f3..0addb9c3a16 100644 --- a/make/autoconf/util.m4 +++ b/make/autoconf/util.m4 @@ -601,7 +601,7 @@ AC_DEFUN([UTIL_REQUIRE_BUILTIN_PROGS], UTIL_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)]) if test "x[$]$1" = x; then AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in]) - if command -v $2 > /dev/null 2>&1; then + if type -p $2 > /dev/null 2>&1; then AC_MSG_NOTICE([Found $2 as shell built-in. Using it]) $1="$2" else diff --git a/make/autoconf/util_windows.m4 b/make/autoconf/util_windows.m4 index 27854978cc1..868c436bcb3 100644 --- a/make/autoconf/util_windows.m4 +++ b/make/autoconf/util_windows.m4 @@ -242,7 +242,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE_CYGWIN], new_path=`$CYGPATH -u "$path"` # Now try to locate executable using which - new_path=`$WHICH "$new_path" 2> /dev/null` + new_path=`type -p "$new_path" 2> /dev/null` # bat and cmd files are not always considered executable in cygwin causing which # to not find them if test "x$new_path" = x \ @@ -258,7 +258,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE_CYGWIN], path="$complete" arguments="EOL" new_path=`$CYGPATH -u "$path"` - new_path=`$WHICH "$new_path" 2> /dev/null` + new_path=`type -p "$new_path" 2> /dev/null` # bat and cmd files are not always considered executable in cygwin causing which # to not find them if test "x$new_path" = x \ @@ -324,7 +324,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE_MSYS], UTIL_REWRITE_AS_UNIX_PATH(new_path) # Now try to locate executable using which - new_path=`$WHICH "$new_path" 2> /dev/null` + new_path=`type -p "$new_path" 2> /dev/null` if test "x$new_path" = x; then # Oops. Which didn't find the executable. @@ -336,7 +336,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE_MSYS], new_path="$path" UTIL_REWRITE_AS_UNIX_PATH(new_path) - new_path=`$WHICH "$new_path" 2> /dev/null` + new_path=`type -p "$new_path" 2> /dev/null` # bat and cmd files are not always considered executable in MSYS causing which # to not find them if test "x$new_path" = x \ @@ -392,7 +392,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE_WSL], # Now try to locate executable using which new_path_bak="$new_path" - new_path=`$WHICH "$new_path" 2> /dev/null` + new_path=`type -p "$new_path" 2> /dev/null` # bat and cmd files are not considered executable in WSL if test "x$new_path" = x \ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ @@ -409,7 +409,7 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE_WSL], new_path="$path" UTIL_REWRITE_AS_UNIX_PATH([new_path]) new_path_bak="$new_path" - new_path=`$WHICH "$new_path" 2> /dev/null` + new_path=`type -p "$new_path" 2> /dev/null` # bat and cmd files are not considered executable in WSL if test "x$new_path" = x \ && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ From 0019679c69448ce880cf0f7546dc4aa347c15af7 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Wed, 5 Aug 2020 08:57:21 -0700 Subject: [PATCH 085/100] 8251190: nsk jdi tests failing "TestBug: Exception during config file parsing: java.io.FileNotFoundException" Reviewed-by: dholmes, sspitsyn --- .../_itself_/awevent001/TestDescription.java | 2 +- .../Accessible/isPackagePrivate/accipp001/TestDescription.java | 2 +- .../Accessible/isPackagePrivate/accipp002/TestDescription.java | 2 +- .../jdi/Accessible/isPrivate/isPrivate001/TestDescription.java | 2 +- .../jdi/Accessible/isPrivate/isprivate002/TestDescription.java | 2 +- .../Accessible/isProtected/isProtected001/TestDescription.java | 2 +- .../Accessible/isProtected/isprotected002/TestDescription.java | 2 +- .../jdi/Accessible/isPublic/isPublic001/TestDescription.java | 2 +- .../jdi/Accessible/isPublic/ispublic002/TestDescription.java | 2 +- .../jdi/Accessible/isPublic/ispublic003/TestDescription.java | 2 +- .../jdi/Accessible/modifiers/modifiers001/TestDescription.java | 2 +- .../jdi/Accessible/modifiers/modifiers002/TestDescription.java | 2 +- .../Argument/description/description001/TestDescription.java | 2 +- .../nsk/jdi/Argument/isValid/isvalid001/TestDescription.java | 2 +- .../nsk/jdi/Argument/isValid/isvalid002/TestDescription.java | 2 +- .../nsk/jdi/Argument/isValid/isvalid003/TestDescription.java | 2 +- .../nsk/jdi/Argument/isValid/isvalid004/TestDescription.java | 2 +- .../nsk/jdi/Argument/isValid/isvalid005/TestDescription.java | 2 +- .../nsk/jdi/Argument/label/label001/TestDescription.java | 2 +- .../Argument/mustSpecify/mustspecify001/TestDescription.java | 2 +- .../nsk/jdi/Argument/name/name001/TestDescription.java | 2 +- .../nsk/jdi/Argument/setValue/setvalue001/TestDescription.java | 2 +- .../nsk/jdi/Argument/setValue/setvalue002/TestDescription.java | 2 +- .../nsk/jdi/Argument/value/value001/TestDescription.java | 2 +- .../nsk/jdi/Argument/value/value002/TestDescription.java | 2 +- .../nsk/jdi/Argument/value/value003/TestDescription.java | 2 +- .../ArrayReference/getValue/getvalue001/TestDescription.java | 2 +- .../ArrayReference/getValue/getvalue002/TestDescription.java | 2 +- .../ArrayReference/getValue/getvalue003/TestDescription.java | 2 +- .../ArrayReference/getValues/getvalues001/TestDescription.java | 2 +- .../ArrayReference/getValues/getvalues002/TestDescription.java | 2 +- .../ArrayReference/getValues/getvalues003/TestDescription.java | 2 +- .../getValues_ii/getvaluesii001/TestDescription.java | 2 +- .../getValues_ii/getvaluesii002/TestDescription.java | 2 +- .../getValues_ii/getvaluesii003/TestDescription.java | 2 +- .../getValues_ii/getvaluesii004/TestDescription.java | 2 +- .../getValues_ii/getvaluesii005/TestDescription.java | 2 +- .../jdi/ArrayReference/length/length001/TestDescription.java | 2 +- .../ArrayReference/setValue/setvalue001/TestDescription.java | 2 +- .../ArrayReference/setValue/setvalue002/TestDescription.java | 2 +- .../ArrayReference/setValue/setvalue003/TestDescription.java | 2 +- .../setValues_ilii/setvaluesilii001/TestDescription.java | 2 +- .../setValues_ilii/setvaluesilii002/TestDescription.java | 2 +- .../setValues_ilii/setvaluesilii003/TestDescription.java | 2 +- .../setValues_ilii/setvaluesilii004/TestDescription.java | 2 +- .../setValues_ilii/setvaluesilii005/TestDescription.java | 2 +- .../setValues_l/setvaluesl001/TestDescription.java | 2 +- .../setValues_l/setvaluesl002/TestDescription.java | 2 +- .../setValues_l/setvaluesl003/TestDescription.java | 2 +- .../componentsignature001/TestDescription.java | 2 +- .../componentsignature002/TestDescription.java | 2 +- .../componentType/componenttype001/TestDescription.java | 2 +- .../componentTypeName/componenttypename001/TestDescription.java | 2 +- .../componentTypeName/componenttypename002/TestDescription.java | 2 +- .../ArrayType/newInstance/newinstance001/TestDescription.java | 2 +- .../ArrayType/newInstance/newinstance002/TestDescription.java | 2 +- .../ArrayType/newInstance/newinstance003/TestDescription.java | 2 +- .../ArrayType/newInstance/newinstance004/TestDescription.java | 2 +- .../AttachingConnector/attach/attach001/TestDescription.java | 2 +- .../AttachingConnector/attach/attach002/TestDescription.java | 2 +- .../AttachingConnector/attach/attach003/TestDescription.java | 2 +- .../AttachingConnector/attach/attach004/TestDescription.java | 2 +- .../AttachingConnector/attach/attach005/TestDescription.java | 2 +- .../attachnosuspend/attachnosuspend001/TestDescription.java | 2 +- .../attachnosuspend/attachnosuspend002/TestDescription.java | 2 +- .../attachnosuspend/attachnosuspend003/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java | 2 +- .../nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java | 2 +- .../booleanValue/booleanvalue001/TestDescription.java | 2 +- .../booleanValue/booleanvalue002/TestDescription.java | 2 +- .../jdi/BooleanArgument/isValid/isvalid001/TestDescription.java | 2 +- .../jdi/BooleanArgument/isValid/isvalid002/TestDescription.java | 2 +- .../BooleanArgument/setValue/setvalue001/TestDescription.java | 2 +- .../BooleanArgument/setValue/setvalue002/TestDescription.java | 2 +- .../stringValueOf/stringvalueof001/TestDescription.java | 2 +- .../stringValueOf/stringvalueof002/TestDescription.java | 2 +- .../BooleanType/_itself_/booleantype001/TestDescription.java | 2 +- .../nsk/jdi/BooleanValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/BooleanValue/equals/equals002/TestDescription.java | 2 +- .../jdi/BooleanValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/BooleanValue/value/value001/TestDescription.java | 2 +- .../BreakpointEvent/_itself_/breakpoint001/TestDescription.java | 2 +- .../BreakpointEvent/_itself_/breakpoint002/TestDescription.java | 2 +- .../BreakpointRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter003/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter004/TestDescription.java | 2 +- .../addThreadFilter/threadfilter001/TestDescription.java | 2 +- .../addThreadFilter/threadfilter002/TestDescription.java | 2 +- .../addThreadFilter/threadfilter003/TestDescription.java | 2 +- .../addThreadFilter/threadfilter004/TestDescription.java | 2 +- .../BreakpointRequest/location/location001/TestDescription.java | 2 +- .../nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java | 2 +- .../jdi/ByteValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/ByteValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/ByteValue/equals/equals002/TestDescription.java | 2 +- .../nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/ByteValue/value/value001/TestDescription.java | 2 +- .../nsk/jdi/CharType/_itself_/chartype001/TestDescription.java | 2 +- .../jdi/CharValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/CharValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/CharValue/equals/equals002/TestDescription.java | 2 +- .../nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/CharValue/value/value001/TestDescription.java | 2 +- .../definedClasses/definedclasses001/TestDescription.java | 2 +- .../definedClasses/definedclasses002/TestDescription.java | 2 +- .../definedClasses/definedclasses003/TestDescription.java | 2 +- .../definedClasses/definedclasses004/TestDescription.java | 2 +- .../definedClasses/definedclasses005/TestDescription.java | 2 +- .../visibleClasses/visibleclasses001/TestDescription.java | 2 +- .../visibleClasses/visibleclasses002/TestDescription.java | 2 +- .../reflectedType/reflectype001/TestDescription.java | 2 +- .../toString/tostring001/TestDescription.java | 2 +- .../referenceType/refType001/TestDescription.java | 2 +- .../jdi/ClassPrepareEvent/thread/thread001/TestDescription.java | 2 +- .../_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter002/TestDescription.java | 2 +- .../addClassExclusionFilter/filter003/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt001/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt003/TestDescription.java | 2 +- .../addClassFilter_s/filter_s001/TestDescription.java | 2 +- .../addClassFilter_s/filter_s002/TestDescription.java | 2 +- .../addSourceNameFilter001/addSourceNameFilter001.java | 2 +- .../addSourceNameFilter002/addSourceNameFilter002.java | 2 +- .../allInterfaces/allinterfaces001/TestDescription.java | 2 +- .../allInterfaces/allinterfaces002/TestDescription.java | 2 +- .../concreteMethodByName/method001/TestDescription.java | 2 +- .../concreteMethodByName/method002/TestDescription.java | 2 +- .../jdi/ClassType/interfaces/interfaces001/TestDescription.java | 2 +- .../jdi/ClassType/interfaces/interfaces002/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod001/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod002/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod003/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod004/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod005/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod006/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod007/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod008/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod010/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod011/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod012/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod013/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod014/TestDescription.java | 2 +- .../ClassType/invokeMethod/invokemethod015/TestDescription.java | 2 +- .../nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance001/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance002/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance003/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance004/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance005/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance006/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance007/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance008/TestDescription.java | 2 +- .../ClassType/newInstance/newinstance009/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java | 2 +- .../nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java | 2 +- .../jdi/ClassType/subclasses/subclasses001/TestDescription.java | 2 +- .../jdi/ClassType/subclasses/subclasses002/TestDescription.java | 2 +- .../jdi/ClassType/superclass/superclass001/TestDescription.java | 2 +- .../jdi/ClassType/superclass/superclass002/TestDescription.java | 2 +- .../ClassUnloadRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/exclfilter002/TestDescription.java | 2 +- .../addClassFilter/filter002/TestDescription.java | 2 +- .../nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java | 2 +- .../defaultArguments/defaultArguments001/TestDescription.java | 2 +- .../defaultArguments/defaultArguments002/TestDescription.java | 2 +- .../defaultArguments/defaultArguments003/TestDescription.java | 2 +- .../Connector/description/description001/TestDescription.java | 2 +- .../nsk/jdi/Connector/name/name001/TestDescription.java | 2 +- .../nsk/jdi/Connector/toString/tostring001/TestDescription.java | 2 +- .../jdi/Connector/transport/transport001/TestDescription.java | 2 +- .../nsk/jdi/ConstantField/values001/TestDescription.java | 2 +- .../jdi/DoubleType/_itself_/doubletype001/TestDescription.java | 2 +- .../jdi/DoubleValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/DoubleValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/DoubleValue/equals/equals002/TestDescription.java | 2 +- .../jdi/DoubleValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/DoubleValue/value/value001/TestDescription.java | 2 +- .../nsk/jdi/Event/_itself_/event001/TestDescription.java | 2 +- .../nsk/jdi/Event/_itself_/event002/TestDescription.java | 2 +- .../nsk/jdi/Event/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/Event/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/Event/request/request001/TestDescription.java | 2 +- .../EventIterator/nextEvent/nextevent001/TestDescription.java | 2 +- .../jdi/EventQueue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/EventQueue/remove/remove001/TestDescription.java | 2 +- .../nsk/jdi/EventQueue/remove/remove002/TestDescription.java | 2 +- .../nsk/jdi/EventQueue/remove/remove003/TestDescription.java | 2 +- .../nsk/jdi/EventQueue/remove/remove004/TestDescription.java | 2 +- .../jdi/EventQueue/remove_l/remove_l001/TestDescription.java | 2 +- .../jdi/EventQueue/remove_l/remove_l002/TestDescription.java | 2 +- .../jdi/EventQueue/remove_l/remove_l003/TestDescription.java | 2 +- .../jdi/EventQueue/remove_l/remove_l004/TestDescription.java | 2 +- .../jdi/EventQueue/remove_l/remove_l005/TestDescription.java | 2 +- .../EventRequest/_bounds_/eventrequest001/TestDescription.java | 2 +- .../addCountFilter/addcountfilter001/TestDescription.java | 2 +- .../jdi/EventRequest/disable/disable001/TestDescription.java | 2 +- .../jdi/EventRequest/disable/disable002/TestDescription.java | 2 +- .../jdi/EventRequest/disable/disable003/TestDescription.java | 2 +- .../nsk/jdi/EventRequest/enable/enable001/TestDescription.java | 2 +- .../nsk/jdi/EventRequest/enable/enable002/TestDescription.java | 2 +- .../getProperty/getproperty001/TestDescription.java | 2 +- .../jdi/EventRequest/hashCode/hashcode001/TestDescription.java | 2 +- .../EventRequest/isEnabled/isenabled001/TestDescription.java | 2 +- .../putProperty/putproperty001/TestDescription.java | 2 +- .../EventRequest/setEnabled/setenabled001/TestDescription.java | 2 +- .../EventRequest/setEnabled/setenabled002/TestDescription.java | 2 +- .../EventRequest/setEnabled/setenabled003/TestDescription.java | 2 +- .../setSuspendPolicy/setsuspendpolicy001/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy001/TestDescription.java | 2 +- .../_bounds_/requests001/TestDescription.java | 2 +- .../accwtchpreq001/TestDescription.java | 2 +- .../accwtchpreq002/TestDescription.java | 2 +- .../breakpointRequests/breakpreq001/TestDescription.java | 2 +- .../breakpointRequests/breakpreq002/TestDescription.java | 2 +- .../classPrepareRequests/clsprepreq001/TestDescription.java | 2 +- .../classPrepareRequests/clsprepreq002/TestDescription.java | 2 +- .../classUnloadRequests/clsunlreq001/TestDescription.java | 2 +- .../classUnloadRequests/clsunlreq002/TestDescription.java | 2 +- .../craccwtchpreq002/TestDescription.java | 2 +- .../craccwtchpreq003/TestDescription.java | 2 +- .../createBreakpointRequest/crbreakpreq002/TestDescription.java | 2 +- .../createBreakpointRequest/crbreakpreq003/TestDescription.java | 2 +- .../createClassPrepareRequest/cpreg001/TestDescription.java | 2 +- .../createClassUnloadRequest/cureg001/TestDescription.java | 2 +- .../createExceptionRequest/crexreq009/TestDescription.java | 2 +- .../createExceptionRequest/crexreq010/TestDescription.java | 2 +- .../createMethodEntryRequest/menreg001/TestDescription.java | 2 +- .../createMethodExitRequest/mexreg001/TestDescription.java | 2 +- .../crmodwtchpreq002/TestDescription.java | 2 +- .../crmodwtchpreq003/TestDescription.java | 2 +- .../createStepRequest/crstepreq001/TestDescription.java | 2 +- .../createStepRequest/crstepreq002/TestDescription.java | 2 +- .../createStepRequest/crstepreq003/TestDescription.java | 2 +- .../createStepRequest/crstepreq004/TestDescription.java | 2 +- .../createStepRequest/crstepreq005/TestDescription.java | 2 +- .../createStepRequest/crstepreq006/TestDescription.java | 2 +- .../createStepRequest/crstepreq007/TestDescription.java | 2 +- .../createStepRequest/crstepreq008/TestDescription.java | 2 +- .../createStepRequest/crstepreq009/TestDescription.java | 2 +- .../createStepRequest/crstepreq010/TestDescription.java | 2 +- .../createThreadDeathRequest/tdreg001/TestDescription.java | 2 +- .../createThreadStartRequest/tsreg001/TestDescription.java | 2 +- .../createVMDeathRequest/vmdreg001/TestDescription.java | 2 +- .../deleteAllBreakpoints/delallbreakp002/TestDescription.java | 2 +- .../deleteEventRequest/delevtreq002/TestDescription.java | 2 +- .../deleteEventRequest/delevtreq003/TestDescription.java | 2 +- .../deleteEventRequests/delevtreqs002/TestDescription.java | 2 +- .../exceptionRequests/excreq001/TestDescription.java | 2 +- .../exceptionRequests/excreq002/TestDescription.java | 2 +- .../hashCode/hashcode001/TestDescription.java | 2 +- .../methodEntryRequests/methentreq001/TestDescription.java | 2 +- .../methodEntryRequests/methentreq002/TestDescription.java | 2 +- .../methodExitRequests/methexitreq001/TestDescription.java | 2 +- .../methodExitRequests/methexitreq002/TestDescription.java | 2 +- .../modwtchpreq001/TestDescription.java | 2 +- .../modwtchpreq002/TestDescription.java | 2 +- .../stepRequests/stepreq001/TestDescription.java | 2 +- .../stepRequests/stepreq002/TestDescription.java | 2 +- .../threadDeathRequests/thrdeathreq001/TestDescription.java | 2 +- .../threadDeathRequests/thrdeathreq002/TestDescription.java | 2 +- .../threadStartRequests/thrstartreq001/TestDescription.java | 2 +- .../threadStartRequests/thrstartreq002/TestDescription.java | 2 +- .../vmDeathRequests/vmdeathreq001/TestDescription.java | 2 +- .../eventIterator/eventiterator001/TestDescription.java | 2 +- .../eventIterator/eventiterator002/TestDescription.java | 2 +- .../eventIterator/eventiterator003/TestDescription.java | 2 +- .../eventIterator/eventiterator004/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume001/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume002/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume003/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume004/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume005/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume006/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume007/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume008/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume009/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume010/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume011/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume012/TestDescription.java | 2 +- .../nsk/jdi/EventSet/resume/resume013/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy001/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy002/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy003/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy004/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy005/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy006/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy007/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy008/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy009/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy010/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy011/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy012/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy013/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy014/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy015/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy016/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy017/TestDescription.java | 2 +- .../suspendPolicy/suspendpolicy018/TestDescription.java | 2 +- .../nsk/jdi/EventSet/toString/tostring001/TestDescription.java | 2 +- .../virtualMachine/virtualmachine001/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java | 2 +- .../jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java | 2 +- .../catchLocation/location001/TestDescription.java | 2 +- .../catchLocation/location002/TestDescription.java | 2 +- .../ExceptionEvent/exception/exception001/TestDescription.java | 2 +- .../ExceptionRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt001/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt003/TestDescription.java | 2 +- .../addClassFilter_s/filter_s001/TestDescription.java | 2 +- .../addClassFilter_s/filter_s002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter003/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter004/TestDescription.java | 2 +- .../addThreadFilter/threadfilter001/TestDescription.java | 2 +- .../addThreadFilter/threadfilter002/TestDescription.java | 2 +- .../addThreadFilter/threadfilter003/TestDescription.java | 2 +- .../addThreadFilter/threadfilter004/TestDescription.java | 2 +- .../exception/exception001/TestDescription.java | 2 +- .../notifyCaught/notifycaught001/TestDescription.java | 2 +- .../notifyUncaught/notifyuncaught001/TestDescription.java | 2 +- .../nsk/jdi/Field/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/Field/equals/equals002/TestDescription.java | 2 +- .../nsk/jdi/Field/equals/equals003/TestDescription.java | 2 +- .../nsk/jdi/Field/equals/equals005/TestDescription.java | 2 +- .../nsk/jdi/Field/hashCode/hashcode001/TestDescription.java | 2 +- .../Field/isEnumConstant/isenumconstant001/TestDescription.java | 2 +- .../nsk/jdi/Field/isTransient/istrans001/TestDescription.java | 2 +- .../nsk/jdi/Field/isVolatile/isvol001/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java | 2 +- .../nsk/jdi/Field/typeName/typename001/TestDescription.java | 2 +- .../nsk/jdi/Field/typeName/typename002/TestDescription.java | 2 +- .../jdi/FloatType/_itself_/floattype001/TestDescription.java | 2 +- .../jdi/FloatValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/FloatValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/FloatValue/equals/equals002/TestDescription.java | 2 +- .../jdi/FloatValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/FloatValue/value/value001/TestDescription.java | 2 +- .../IntegerArgument/intValue/intvalue001/TestDescription.java | 2 +- .../IntegerArgument/intValue/intvalue002/TestDescription.java | 2 +- .../jdi/IntegerArgument/isValid/isvalid001/TestDescription.java | 2 +- .../jdi/IntegerArgument/isValid/isvalid002/TestDescription.java | 2 +- .../jdi/IntegerArgument/isValid/isvalid003/TestDescription.java | 2 +- .../nsk/jdi/IntegerArgument/max/max001/TestDescription.java | 2 +- .../nsk/jdi/IntegerArgument/min/min001/TestDescription.java | 2 +- .../IntegerArgument/setValue/setvalue001/TestDescription.java | 2 +- .../stringValueOf/stringvalueof001/TestDescription.java | 2 +- .../IntegerType/_itself_/integertype001/TestDescription.java | 2 +- .../IntegerValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/IntegerValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/IntegerValue/equals/equals002/TestDescription.java | 2 +- .../jdi/IntegerValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/IntegerValue/value/value001/TestDescription.java | 2 +- .../implementors/implementors001/TestDescription.java | 2 +- .../subinterfaces/subinterfaces001/TestDescription.java | 2 +- .../superinterfaces/superinterfaces001/TestDescription.java | 2 +- .../LaunchingConnector/launch/launch001/TestDescription.java | 2 +- .../LaunchingConnector/launch/launch002/TestDescription.java | 2 +- .../LaunchingConnector/launch/launch003/TestDescription.java | 2 +- .../LaunchingConnector/launch/launch004/TestDescription.java | 2 +- .../launchnosuspend/launchnosuspend001/TestDescription.java | 2 +- .../ListeningConnector/accept/accept001/TestDescription.java | 2 +- .../ListeningConnector/accept/accept002/TestDescription.java | 2 +- .../listennosuspend/listennosuspend001/TestDescription.java | 2 +- .../startListening/startlis001/TestDescription.java | 2 +- .../startListening/startlis002/TestDescription.java | 2 +- .../stopListening/stoplis001/TestDescription.java | 2 +- .../stopListening/stoplis002/TestDescription.java | 2 +- .../supportsmultipleconnections001/TestDescription.java | 2 +- .../nsk/jdi/LocalVariable/equals/equals001/TestDescription.java | 2 +- .../genericSignature/gensignature001/TestDescription.java | 2 +- .../jdi/LocalVariable/hashCode/hashcode001/TestDescription.java | 2 +- .../LocalVariable/isArgument/isargument001/TestDescription.java | 2 +- .../LocalVariable/isVisible/isvisible001/TestDescription.java | 2 +- .../nsk/jdi/LocalVariable/name/name001/TestDescription.java | 2 +- .../LocalVariable/signature/signature001/TestDescription.java | 2 +- .../jdi/LocalVariable/toString/tostring001/TestDescription.java | 2 +- .../nsk/jdi/LocalVariable/type/type001/TestDescription.java | 2 +- .../nsk/jdi/LocalVariable/type/type002/TestDescription.java | 2 +- .../jdi/LocalVariable/typeName/typename001/TestDescription.java | 2 +- .../jdi/LocalVariable/typeName/typename002/TestDescription.java | 2 +- .../nsk/jdi/Locatable/location/location001/TestDescription.java | 2 +- .../nsk/jdi/Locatable/location/location002/TestDescription.java | 2 +- .../nsk/jdi/Locatable/location/location003/TestDescription.java | 2 +- .../nsk/jdi/Locatable/location/location004/TestDescription.java | 2 +- .../nsk/jdi/Locatable/location/location005/TestDescription.java | 2 +- .../nsk/jdi/Locatable/location/location006/TestDescription.java | 2 +- .../jdi/LocatableEvent/thread/thread001/TestDescription.java | 2 +- .../jdi/Location/codeIndex/codeindex001/TestDescription.java | 2 +- .../declaringType/declaringtype001/TestDescription.java | 2 +- .../nsk/jdi/Location/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/Location/hashCode/hashcode001/TestDescription.java | 2 +- .../jdi/Location/lineNumber/linenumber001/TestDescription.java | 2 +- .../Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java | 2 +- .../Location/lineNumber_s/linenumber_s001/TestDescription.java | 2 +- .../nsk/jdi/Location/method/method001/TestDescription.java | 2 +- .../jdi/Location/sourceName/sourcename001/TestDescription.java | 2 +- .../Location/sourceName_s/sourceName_s002/sourceName_s002.java | 2 +- .../Location/sourceName_s/sourcename_s001/TestDescription.java | 2 +- .../jdi/Location/sourcePath/sourcepath001/TestDescription.java | 2 +- .../Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java | 2 +- .../Location/sourcePath_s/sourcepath_s001/TestDescription.java | 2 +- .../nsk/jdi/LongType/_itself_/longtype001/TestDescription.java | 2 +- .../jdi/LongValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/LongValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/LongValue/equals/equals002/TestDescription.java | 2 +- .../nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/LongValue/value/value001/TestDescription.java | 2 +- .../nsk/jdi/Method/_bounds_/bounds001/TestDescription.java | 2 +- .../allLineLocations/alllinelocations001/TestDescription.java | 2 +- .../allLineLocations/alllinelocations002/TestDescription.java | 2 +- .../allLineLocations_ss002/allLineLocations_ss002.java | 2 +- .../allLineLocations_ss003/allLineLocations_ss003.java | 2 +- .../alllinelocations_ss001/TestDescription.java | 2 +- .../argumentTypeNames/argumenttypenames001/TestDescription.java | 2 +- .../argumentTypeNames/argumenttypenames002/TestDescription.java | 2 +- .../argumentTypeNames/argumenttypenames003/TestDescription.java | 2 +- .../Method/argumentTypes/argumenttypes001/TestDescription.java | 2 +- .../Method/argumentTypes/argumenttypes002/TestDescription.java | 2 +- .../nsk/jdi/Method/arguments/arguments001/TestDescription.java | 2 +- .../nsk/jdi/Method/arguments/arguments002/TestDescription.java | 2 +- .../nsk/jdi/Method/arguments/arguments003/TestDescription.java | 2 +- .../nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java | 2 +- .../nsk/jdi/Method/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/Method/hashCode/hashcode001/TestDescription.java | 2 +- .../jdi/Method/isAbstract/isabstract001/TestDescription.java | 2 +- .../nsk/jdi/Method/isBridge/isbridge001/TestDescription.java | 2 +- .../Method/isConstructor/isconstructor001/TestDescription.java | 2 +- .../nsk/jdi/Method/isNative/isnative001/TestDescription.java | 2 +- .../jdi/Method/isObsolete/isobsolete001/TestDescription.java | 2 +- .../jdi/Method/isObsolete/isobsolete002/TestDescription.java | 2 +- .../jdi/Method/isObsolete/isobsolete003/TestDescription.java | 2 +- .../isStaticInitializer/isstinitializer001/TestDescription.java | 2 +- .../isSynchronized/issynchronized001/TestDescription.java | 2 +- .../nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java | 2 +- .../locationofcodeindex001/TestDescription.java | 2 +- .../locationsOfLine/locationsofline001/TestDescription.java | 2 +- .../locationsOfLine_ssi002/locationsOfLine_ssi002.java | 2 +- .../locationsOfLine_ssi003/locationsOfLine_ssi003.java | 2 +- .../locationsofline_ssi001/TestDescription.java | 2 +- .../jdi/Method/returnType/returntype001/TestDescription.java | 2 +- .../jdi/Method/returnType/returntype002/TestDescription.java | 2 +- .../jdi/Method/returnType/returntype003/TestDescription.java | 2 +- .../returnTypeNames/returntypenames001/TestDescription.java | 2 +- .../returnTypeNames/returntypenames002/TestDescription.java | 2 +- .../returnTypeNames/returntypenames003/TestDescription.java | 2 +- .../nsk/jdi/Method/variables/variables001/TestDescription.java | 2 +- .../nsk/jdi/Method/variables/variables002/TestDescription.java | 2 +- .../variablesByName/variablesbyname001/TestDescription.java | 2 +- .../variablesByName/variablesbyname002/TestDescription.java | 2 +- .../jdi/MethodEntryEvent/method/method001/TestDescription.java | 2 +- .../jdi/MethodEntryEvent/method/method002/TestDescription.java | 2 +- .../MethodEntryRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt001/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt003/TestDescription.java | 2 +- .../addClassFilter_s/filter_s001/TestDescription.java | 2 +- .../addClassFilter_s/filter_s002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter003/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter004/TestDescription.java | 2 +- .../addThreadFilter/threadfilter001/TestDescription.java | 2 +- .../addThreadFilter/threadfilter002/TestDescription.java | 2 +- .../addThreadFilter/threadfilter003/TestDescription.java | 2 +- .../addThreadFilter/threadfilter004/TestDescription.java | 2 +- .../MethodExitEvent/_itself_/methodexit001/TestDescription.java | 2 +- .../jdi/MethodExitEvent/method/method001/TestDescription.java | 2 +- .../jdi/MethodExitEvent/method/method002/TestDescription.java | 2 +- .../returnValue/returnValue001/returnValue001.java | 2 +- .../returnValue/returnValue002/returnValue002.java | 2 +- .../returnValue/returnValue003/returnValue003.java | 2 +- .../returnValue/returnValue004/returnValue004.java | 2 +- .../MethodExitRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt001/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt003/TestDescription.java | 2 +- .../addClassFilter_s/filter_s001/TestDescription.java | 2 +- .../addClassFilter_s/filter_s002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter003/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter004/TestDescription.java | 2 +- .../addThreadFilter/threadfilter001/TestDescription.java | 2 +- .../addThreadFilter/threadfilter002/TestDescription.java | 2 +- .../addThreadFilter/threadfilter003/TestDescription.java | 2 +- .../addThreadFilter/threadfilter004/TestDescription.java | 2 +- .../nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/Mirror/toString/tostring001/TestDescription.java | 2 +- .../virtualMachine/virtualmachine001/TestDescription.java | 2 +- .../_itself_/mwevent001/TestDescription.java | 2 +- .../valueToBe/valuetobe001/TestDescription.java | 2 +- .../valueToBe/valuetobe002/TestDescription.java | 2 +- .../MonitorContendedEnterRequest001/TestDescription.java | 2 +- .../MonitorContendedEnterRequest002/TestDescription.java | 2 +- .../addClassExclusionFilter/TestDescription.java | 2 +- .../addClassFilter_ClassName/TestDescription.java | 2 +- .../addClassFilter_ReferenceType/TestDescription.java | 2 +- .../addInstanceFilter/TestDescription.java | 2 +- .../addThreadFilter/TestDescription.java | 2 +- .../MonitorContendedEnteredRequest001/TestDescription.java | 2 +- .../MonitorContendedEnteredRequest002/TestDescription.java | 2 +- .../addClassExclusionFilter/TestDescription.java | 2 +- .../addClassFilter_ClassName/TestDescription.java | 2 +- .../addClassFilter_ReferenceType/TestDescription.java | 2 +- .../addInstanceFilter/TestDescription.java | 2 +- .../addThreadFilter/TestDescription.java | 2 +- .../MonitorWaitRequest001/TestDescription.java | 2 +- .../MonitorWaitRequest002/TestDescription.java | 2 +- .../addClassExclusionFilter/TestDescription.java | 2 +- .../addClassFilter_ClassName/TestDescription.java | 2 +- .../addClassFilter_ReferenceType/TestDescription.java | 2 +- .../MonitorWaitRequest/addInstanceFilter/TestDescription.java | 2 +- .../jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java | 2 +- .../MonitorWaitedRequest001/TestDescription.java | 2 +- .../MonitorWaitedRequest002/TestDescription.java | 2 +- .../addClassExclusionFilter/TestDescription.java | 2 +- .../addClassFilter_ClassName/TestDescription.java | 2 +- .../addClassFilter_ReferenceType/TestDescription.java | 2 +- .../MonitorWaitedRequest/addInstanceFilter/TestDescription.java | 2 +- .../MonitorWaitedRequest/addThreadFilter/TestDescription.java | 2 +- .../jdi/ObjectReference/_bounds_/bounds001/TestDescription.java | 2 +- .../jdi/ObjectReference/_bounds_/bounds002/TestDescription.java | 2 +- .../jdi/ObjectReference/_bounds_/bounds003/TestDescription.java | 2 +- .../disableCollection/disablecollection001/TestDescription.java | 2 +- .../disableCollection/disablecollection002/TestDescription.java | 2 +- .../entryCount/entrycount001/TestDescription.java | 2 +- .../entryCount/entrycount002/TestDescription.java | 2 +- .../jdi/ObjectReference/equals/equals001/TestDescription.java | 2 +- .../ObjectReference/getValue/getvalue001/TestDescription.java | 2 +- .../ObjectReference/getValue/getvalue002/TestDescription.java | 2 +- .../ObjectReference/getValue/getvalue003/TestDescription.java | 2 +- .../ObjectReference/getValue/getvalue004/TestDescription.java | 2 +- .../ObjectReference/getValues/getvalues001/TestDescription.java | 2 +- .../ObjectReference/getValues/getvalues002/TestDescription.java | 2 +- .../ObjectReference/getValues/getvalues003/TestDescription.java | 2 +- .../ObjectReference/hashCode/hashcode001/TestDescription.java | 2 +- .../invokeMethod/invokemethod001/TestDescription.java | 2 +- .../invokeMethod/invokemethod002/TestDescription.java | 2 +- .../invokeMethod/invokemethod003/TestDescription.java | 2 +- .../invokeMethod/invokemethod004/TestDescription.java | 2 +- .../invokeMethod/invokemethod005/TestDescription.java | 2 +- .../invokeMethod/invokemethod007/TestDescription.java | 2 +- .../invokeMethod/invokemethod008/TestDescription.java | 2 +- .../invokeMethod/invokemethod009/TestDescription.java | 2 +- .../invokeMethod/invokemethod010/TestDescription.java | 2 +- .../invokeMethod/invokemethod011/TestDescription.java | 2 +- .../invokeMethod/invokemethod012/TestDescription.java | 2 +- .../invokeMethod/invokemethod013/TestDescription.java | 2 +- .../invokeMethod/invokemethod014/TestDescription.java | 2 +- .../isCollected/iscollected001/TestDescription.java | 2 +- .../owningThread/owningthread001/TestDescription.java | 2 +- .../owningThread/owningthread002/TestDescription.java | 2 +- .../referenceType/referencetype001/TestDescription.java | 2 +- .../referenceType/referencetype002/TestDescription.java | 2 +- .../referenceType/referencetype003/TestDescription.java | 2 +- .../referenceType/referencetype004/TestDescription.java | 2 +- .../referenceType/referencetype005/TestDescription.java | 2 +- .../referenceType/referencetype006/TestDescription.java | 2 +- .../referenceType/referencetype007/TestDescription.java | 2 +- .../referringObjects001/referringObjects001.java | 2 +- .../referringObjects003/referringObjects003.java | 2 +- .../referringObjects004/referringObjects004.java | 2 +- .../ObjectReference/setValue/setvalue001/TestDescription.java | 2 +- .../ObjectReference/setValue/setvalue002/TestDescription.java | 2 +- .../ObjectReference/setValue/setvalue003/TestDescription.java | 2 +- .../ObjectReference/setValue/setvalue004/TestDescription.java | 2 +- .../ObjectReference/setValue/setvalue005/TestDescription.java | 2 +- .../ObjectReference/uniqueID/uniqueid001/TestDescription.java | 2 +- .../waitingThreads/waitingthreads001/TestDescription.java | 2 +- .../waitingThreads/waitingthreads002/TestDescription.java | 2 +- .../waitingThreads/waitingthreads003/TestDescription.java | 2 +- .../waitingThreads/waitingthreads004/TestDescription.java | 2 +- .../baseDirectory/directory001/TestDescription.java | 2 +- .../bootClassPath/bootpath001/TestDescription.java | 2 +- .../classPath/classpath001/TestDescription.java | 2 +- .../plugAttachConnect001/plugAttachConnect001.java | 2 +- .../plugAttachConnect002/plugAttachConnect002.java | 2 +- .../plugAttachConnect003/plugAttachConnect003.java | 2 +- .../plugLaunchConnect001/plugLaunchConnect001.java | 2 +- .../plugLaunchConnect002/plugLaunchConnect002.java | 2 +- .../plugLaunchConnect003/plugLaunchConnect003.java | 2 +- .../plugListenConnect001/plugListenConnect001.java | 2 +- .../plugListenConnect002/plugListenConnect002.java | 2 +- .../plugListenConnect003/plugListenConnect003.java | 2 +- .../plugMultiConnect001/plugMultiConnect001.java | 2 +- .../plugMultiConnect002/plugMultiConnect002.java | 2 +- .../plugMultiConnect003/plugMultiConnect003.java | 2 +- .../plugMultiConnect004/plugMultiConnect004.java | 2 +- .../plugMultiConnect005/plugMultiConnect005.java | 2 +- .../plugMultiConnect006/plugMultiConnect006.java | 2 +- .../transportService001/transportService001.java | 2 +- .../transportService002/transportService002.java | 2 +- .../transportService003/transportService003.java | 2 +- .../_itself_/primitivetype001/TestDescription.java | 2 +- .../booleanValue/booleanvalue001/TestDescription.java | 2 +- .../PrimitiveValue/byteValue/bytevalue001/TestDescription.java | 2 +- .../PrimitiveValue/charValue/charvalue001/TestDescription.java | 2 +- .../doubleValue/doublevalue001/TestDescription.java | 2 +- .../doubleValue/doublevalue002/TestDescription.java | 2 +- .../floatValue/floatvalue001/TestDescription.java | 2 +- .../PrimitiveValue/intValue/intvalue001/TestDescription.java | 2 +- .../PrimitiveValue/longValue/longvalue001/TestDescription.java | 2 +- .../shortValue/shortvalue001/TestDescription.java | 2 +- .../jdi/ReferenceType/_bounds_/bounds001/TestDescription.java | 2 +- .../jdi/ReferenceType/_bounds_/bounds002/TestDescription.java | 2 +- .../ReferenceType/allFields/allfields001/TestDescription.java | 2 +- .../ReferenceType/allFields/allfields002/TestDescription.java | 2 +- .../ReferenceType/allFields/allfields004/TestDescription.java | 2 +- .../ReferenceType/allFields/allfields005/TestDescription.java | 2 +- .../ReferenceType/allFields/allfields006/TestDescription.java | 2 +- .../allLineLocations/alllinelocations001/TestDescription.java | 2 +- .../allLineLocations/alllinelocations002/TestDescription.java | 2 +- .../allLineLocations_ss003/allLineLocations_ss003.java | 2 +- .../allLineLocations_ss004/allLineLocations_ss004.java | 2 +- .../alllinelocations_ss001/TestDescription.java | 2 +- .../alllinelocations_ss002/TestDescription.java | 2 +- .../ReferenceType/allMethods/allmethods001/TestDescription.java | 2 +- .../ReferenceType/allMethods/allmethods002/TestDescription.java | 2 +- .../ReferenceType/allMethods/allmethods004/TestDescription.java | 2 +- .../ReferenceType/allMethods/allmethods005/TestDescription.java | 2 +- .../ReferenceType/allMethods/allmethods006/TestDescription.java | 2 +- .../availableStrata/availableStrata002/availableStrata002.java | 2 +- .../availableStrata/availablestrata001/TestDescription.java | 2 +- .../classLoader/classloader001/TestDescription.java | 2 +- .../ReferenceType/classObject/classobj001/TestDescription.java | 2 +- .../ReferenceType/classObject/classobj003/TestDescription.java | 2 +- .../defaultStratum/defaultStratum002/defaultStratum002.java | 2 +- .../defaultStratum/defaultStratum003/defaultStratum003.java | 2 +- .../defaultStratum/defaultStratum004/defaultStratum004.java | 2 +- .../defaultStratum/defaultstratum001/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/equals/equals001/TestDescription.java | 2 +- .../failedToInitialize001/TestDescription.java | 2 +- .../fieldByName/fieldbyname001/TestDescription.java | 2 +- .../fieldByName/fieldbyname002/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/fields/fields001/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/fields/fields002/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/fields/fields004/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/fields/fields005/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/fields/fields006/TestDescription.java | 2 +- .../genericSignature/genericSignature001/TestDescription.java | 2 +- .../genericSignature/genericSignature002/TestDescription.java | 2 +- .../jdi/ReferenceType/getValue/getvalue001/TestDescription.java | 2 +- .../jdi/ReferenceType/getValue/getvalue002/TestDescription.java | 2 +- .../jdi/ReferenceType/getValue/getvalue003/TestDescription.java | 2 +- .../jdi/ReferenceType/getValue/getvalue004/TestDescription.java | 2 +- .../jdi/ReferenceType/getValue/getvalue005/TestDescription.java | 2 +- .../ReferenceType/getValues/getvalues001/TestDescription.java | 2 +- .../ReferenceType/getValues/getvalues002/TestDescription.java | 2 +- .../ReferenceType/getValues/getvalues003/TestDescription.java | 2 +- .../jdi/ReferenceType/hashCode/hashcode001/TestDescription.java | 2 +- .../jdi/ReferenceType/instances/instances001/instances001.java | 2 +- .../jdi/ReferenceType/instances/instances002/instances002.java | 2 +- .../jdi/ReferenceType/instances/instances003/instances003.java | 2 +- .../ReferenceType/instances/instances004/TestDescription.java | 2 +- .../jdi/ReferenceType/instances/instances005/instances005.java | 2 +- .../ReferenceType/isAbstract/isAbstract001/TestDescription.java | 2 +- .../ReferenceType/isAbstract/isabstract003/TestDescription.java | 2 +- .../jdi/ReferenceType/isFinal/isfinal001/TestDescription.java | 2 +- .../jdi/ReferenceType/isFinal/isfinal002/TestDescription.java | 2 +- .../ReferenceType/isInitialized/isinit001/TestDescription.java | 2 +- .../ReferenceType/isInitialized/isinit003/TestDescription.java | 2 +- .../ReferenceType/isPrepared/isprepared001/TestDescription.java | 2 +- .../jdi/ReferenceType/isStatic/isstatic001/TestDescription.java | 2 +- .../jdi/ReferenceType/isStatic/isstatic002/TestDescription.java | 2 +- .../ReferenceType/isVerified/isVerified001/TestDescription.java | 2 +- .../ReferenceType/isVerified/isverified003/TestDescription.java | 2 +- .../locationsOfLine_i/locationsofline_i001/TestDescription.java | 2 +- .../locationsOfLine_i/locationsofline_i002/TestDescription.java | 2 +- .../locationsOfLine_ssi003/locationsOfLine_ssi003.java | 2 +- .../locationsOfLine_ssi004/locationsOfLine_ssi004.java | 2 +- .../locationsofline_ssi001/TestDescription.java | 2 +- .../locationsofline_ssi002/TestDescription.java | 2 +- .../jdi/ReferenceType/methods/methods001/TestDescription.java | 2 +- .../jdi/ReferenceType/methods/methods002/TestDescription.java | 2 +- .../jdi/ReferenceType/methods/methods004/TestDescription.java | 2 +- .../jdi/ReferenceType/methods/methods005/TestDescription.java | 2 +- .../jdi/ReferenceType/methods/methods006/TestDescription.java | 2 +- .../methodsByName_s/methbyname_s001/TestDescription.java | 2 +- .../methodsByName_s/methbyname_s002/TestDescription.java | 2 +- .../methodsByName_s/methbyname_s004/TestDescription.java | 2 +- .../methodsByName_ss/methbyname_ss001/TestDescription.java | 2 +- .../methodsByName_ss/methbyname_ss002/TestDescription.java | 2 +- .../nsk/jdi/ReferenceType/name/name001/TestDescription.java | 2 +- .../nestedTypes/nestedtypes001/TestDescription.java | 2 +- .../nestedTypes/nestedtypes002/TestDescription.java | 2 +- .../sourceDebugExtension/srcdebugx001/TestDescription.java | 2 +- .../sourceDebugExtension/srcdebugx002/TestDescription.java | 2 +- .../ReferenceType/sourceName/sourcename001/TestDescription.java | 2 +- .../ReferenceType/sourceName/sourcename003/TestDescription.java | 2 +- .../ReferenceType/sourceName/sourcename004/TestDescription.java | 2 +- .../sourceNames/sourceNames003/sourceNames003.java | 2 +- .../sourceNames/sourcenames001/TestDescription.java | 2 +- .../sourceNames/sourcenames002/TestDescription.java | 2 +- .../sourcePaths/sourcePaths003/sourcePaths003.java | 2 +- .../sourcePaths/sourcepaths001/TestDescription.java | 2 +- .../sourcePaths/sourcepaths002/TestDescription.java | 2 +- .../visibleFields/visibfield001/TestDescription.java | 2 +- .../visibleFields/visibfield002/TestDescription.java | 2 +- .../visibleFields/visibfield004/TestDescription.java | 2 +- .../visibleFields/visibfield005/TestDescription.java | 2 +- .../visibleFields/visibfield006/TestDescription.java | 2 +- .../visibleMethods/visibmethod001/TestDescription.java | 2 +- .../visibleMethods/visibmethod002/TestDescription.java | 2 +- .../visibleMethods/visibmethod004/TestDescription.java | 2 +- .../visibleMethods/visibmethod005/TestDescription.java | 2 +- .../visibleMethods/visibmethod006/TestDescription.java | 2 +- .../visibleMethods/visibmethod007/TestDescription.java | 2 +- .../Scenarios/invokeMethod/popframes001/TestDescription.java | 2 +- .../invokeMethod/redefineclasses001/TestDescription.java | 2 +- .../SelectedArgument/choices/choices001/TestDescription.java | 2 +- .../SelectedArgument/isValid/isvalid001/TestDescription.java | 2 +- .../SelectedArgument/isValid/isvalid002/TestDescription.java | 2 +- .../jdi/ShortType/_itself_/shorttype001/TestDescription.java | 2 +- .../jdi/ShortValue/compareTo/compareto001/TestDescription.java | 2 +- .../nsk/jdi/ShortValue/equals/equals001/TestDescription.java | 2 +- .../nsk/jdi/ShortValue/equals/equals002/TestDescription.java | 2 +- .../jdi/ShortValue/hashCode/hashcode001/TestDescription.java | 2 +- .../nsk/jdi/ShortValue/value/value001/TestDescription.java | 2 +- .../nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java | 2 +- .../nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java | 2 +- .../getArgumentValues001/getArgumentValues001.java | 2 +- .../getArgumentValues002/getArgumentValues002.java | 2 +- .../getArgumentValues003/getArgumentValues003.java | 2 +- .../jdi/StackFrame/getValue/getvalue001/TestDescription.java | 2 +- .../jdi/StackFrame/getValue/getvalue002/TestDescription.java | 2 +- .../jdi/StackFrame/getValue/getvalue003/TestDescription.java | 2 +- .../jdi/StackFrame/getValues/getvalues001/TestDescription.java | 2 +- .../jdi/StackFrame/getValues/getvalues002/TestDescription.java | 2 +- .../jdi/StackFrame/getValues/getvalues003/TestDescription.java | 2 +- .../jdi/StackFrame/hashCode/hashcode001/TestDescription.java | 2 +- .../jdi/StackFrame/location/location001/TestDescription.java | 2 +- .../nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java | 2 +- .../nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java | 2 +- .../nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java | 2 +- .../nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java | 2 +- .../nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java | 2 +- .../nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java | 2 +- .../StackFrame/thisObject/thisobject001/TestDescription.java | 2 +- .../StackFrame/thisObject/thisobject002/TestDescription.java | 2 +- .../nsk/jdi/StackFrame/thread/thread001/TestDescription.java | 2 +- .../jdi/StackFrame/toString/tostring001/TestDescription.java | 2 +- .../visiblevarbyname001/TestDescription.java | 2 +- .../visiblevarbyname002/TestDescription.java | 2 +- .../visibleVariables/visiblevariables001/TestDescription.java | 2 +- .../visibleVariables/visiblevariables002/TestDescription.java | 2 +- .../nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java | 2 +- .../nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java | 2 +- .../jdi/StepEvent/_itself_/stepevent001/TestDescription.java | 2 +- .../jdi/StepEvent/_itself_/stepevent002/TestDescription.java | 2 +- .../jdi/StepRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt001/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt003/TestDescription.java | 2 +- .../addClassFilter_s/filter_s001/TestDescription.java | 2 +- .../addClassFilter_s/filter_s002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter003/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter004/TestDescription.java | 2 +- .../nsk/jdi/StepRequest/depth/depth001/TestDescription.java | 2 +- .../nsk/jdi/StepRequest/depth/depth002/TestDescription.java | 2 +- .../nsk/jdi/StepRequest/depth/depth003/TestDescription.java | 2 +- .../nsk/jdi/StepRequest/size/size001/TestDescription.java | 2 +- .../nsk/jdi/StepRequest/size/size002/TestDescription.java | 2 +- .../nsk/jdi/StepRequest/thread/thread001/TestDescription.java | 2 +- .../jdi/StringArgument/isValid/isvalid001/TestDescription.java | 2 +- .../jdi/StringArgument/isValid/isvalid002/TestDescription.java | 2 +- .../jdi/StringArgument/isValid/isvalid003/TestDescription.java | 2 +- .../nsk/jdi/StringReference/value/value001/TestDescription.java | 2 +- .../jdi/ThreadDeathEvent/thread/thread001/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter001/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter002/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter003/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter004/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter005/TestDescription.java | 2 +- .../jdi/ThreadGroupReference/name/name001/TestDescription.java | 2 +- .../ThreadGroupReference/parent/parent001/TestDescription.java | 2 +- .../ThreadGroupReference/resume/resume001/TestDescription.java | 2 +- .../suspend/suspend001/TestDescription.java | 2 +- .../threadGroups/threadgroups001/TestDescription.java | 2 +- .../threads/threads001/TestDescription.java | 2 +- .../toString/tostring001/TestDescription.java | 2 +- .../jdi/ThreadReference/_bounds_/bounds001/TestDescription.java | 2 +- .../currentContendedMonitor/currentcm001/TestDescription.java | 2 +- .../forceEarlyReturn001/forceEarlyReturn001.java | 2 +- .../forceEarlyReturn002/forceEarlyReturn002.java | 2 +- .../forceEarlyReturn003/forceEarlyReturn003.java | 2 +- .../forceEarlyReturn004/forceEarlyReturn004.java | 2 +- .../forceEarlyReturn005/forceEarlyReturn005.java | 2 +- .../forceEarlyReturn/forceEarlyReturn006/TestDescription.java | 2 +- .../forceEarlyReturn/forceEarlyReturn007/TestDescription.java | 2 +- .../forceEarlyReturn008/forceEarlyReturn008.java | 2 +- .../forceEarlyReturn009/forceEarlyReturn009.java | 2 +- .../forceEarlyReturn/forceEarlyReturn010/TestDescription.java | 2 +- .../forceEarlyReturn/forceEarlyReturn011/TestDescription.java | 2 +- .../forceEarlyReturn/forceEarlyReturn012/TestDescription.java | 2 +- .../forceEarlyReturn013/forceEarlyReturn013.java | 2 +- .../forceEarlyReturn014/forceEarlyReturn014.java | 2 +- .../forceEarlyReturn015/forceEarlyReturn015.java | 2 +- .../nsk/jdi/ThreadReference/frame/frame001/TestDescription.java | 2 +- .../frameCount/framecount001/TestDescription.java | 2 +- .../jdi/ThreadReference/frames/frames001/TestDescription.java | 2 +- .../ThreadReference/frames_ii/frames_ii001/TestDescription.java | 2 +- .../ThreadReference/frames_ii/frames_ii002/TestDescription.java | 2 +- .../ThreadReference/interrupt/interrupt001/TestDescription.java | 2 +- .../isAtBreakpoint/isatbreakpoint001/TestDescription.java | 2 +- .../isSuspended/issuspended001/TestDescription.java | 2 +- .../isSuspended/issuspended002/TestDescription.java | 2 +- .../isSuspended/issuspended003/TestDescription.java | 2 +- .../isSuspended/issuspended004/TestDescription.java | 2 +- .../nsk/jdi/ThreadReference/name/name001/TestDescription.java | 2 +- .../ownedMonitors/ownedmonitors001/TestDescription.java | 2 +- .../ownedMonitors/ownedmonitors002/TestDescription.java | 2 +- .../ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java | 2 +- .../ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java | 2 +- .../ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java | 2 +- .../ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java | 2 +- .../ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java | 2 +- .../ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java | 2 +- .../ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java | 2 +- .../ownedMonitorsAndFrames008/TestDescription.java | 2 +- .../ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java | 2 +- .../ThreadReference/popFrames/popframes001/TestDescription.java | 2 +- .../ThreadReference/popFrames/popframes002/TestDescription.java | 2 +- .../ThreadReference/popFrames/popframes003/TestDescription.java | 2 +- .../ThreadReference/popFrames/popframes004/TestDescription.java | 2 +- .../ThreadReference/popFrames/popframes005/TestDescription.java | 2 +- .../ThreadReference/popFrames/popframes006/TestDescription.java | 2 +- .../ThreadReference/popFrames/popframes007/TestDescription.java | 2 +- .../jdi/ThreadReference/resume/resume001/TestDescription.java | 2 +- .../nsk/jdi/ThreadReference/status/status003/status003.java | 2 +- .../nsk/jdi/ThreadReference/status/status004/status004.java | 2 +- .../nsk/jdi/ThreadReference/status/status005/status005.java | 2 +- .../nsk/jdi/ThreadReference/status/status006/status006.java | 2 +- .../nsk/jdi/ThreadReference/status/status007/status007.java | 2 +- .../nsk/jdi/ThreadReference/status/status008/status008.java | 2 +- .../nsk/jdi/ThreadReference/stop/stop001/TestDescription.java | 2 +- .../nsk/jdi/ThreadReference/stop/stop002/TestDescription.java | 2 +- .../jdi/ThreadReference/suspend/suspend001/TestDescription.java | 2 +- .../suspendCount/suspendcount001/TestDescription.java | 2 +- .../threadGroup/threadgroup001/TestDescription.java | 2 +- .../jdi/ThreadStartEvent/thread/thread001/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter001/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter002/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter003/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter004/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter005/TestDescription.java | 2 +- .../nsk/jdi/Transport/name/name001/TestDescription.java | 2 +- .../nsk/jdi/Type/hashCode/hashcode001/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java | 2 +- .../nsk/jdi/Type/signature/signature001/TestDescription.java | 2 +- .../nsk/jdi/Type/signature/signature002/TestDescription.java | 2 +- .../nsk/jdi/Type/signature/signature003/TestDescription.java | 2 +- .../declaringType/decltype001/TestDescription.java | 2 +- .../declaringType/decltype002/TestDescription.java | 2 +- .../declaringType/decltype003/TestDescription.java | 2 +- .../declaringType/decltype004/TestDescription.java | 2 +- .../declaringType/decltype005/TestDescription.java | 2 +- .../declaringType/decltype006/TestDescription.java | 2 +- .../declaringType/decltype007/TestDescription.java | 2 +- .../declaringType/decltype008/TestDescription.java | 2 +- .../declaringType/decltype009/TestDescription.java | 2 +- .../genericSignature/genericSignature001/TestDescription.java | 2 +- .../genericSignature/genericSignature002/TestDescription.java | 2 +- .../jdi/TypeComponent/isFinal/isfinal001/TestDescription.java | 2 +- .../jdi/TypeComponent/isFinal/isfinal002/TestDescription.java | 2 +- .../jdi/TypeComponent/isFinal/isfinal003/TestDescription.java | 2 +- .../jdi/TypeComponent/isFinal/isfinal004/TestDescription.java | 2 +- .../isPackagePrivate/ispackageprivate001/TestDescription.java | 2 +- .../isPackagePrivate/ispackageprivate002/TestDescription.java | 2 +- .../TypeComponent/isPrivate/isprivate001/TestDescription.java | 2 +- .../TypeComponent/isPrivate/isprivate002/TestDescription.java | 2 +- .../isProtected/isprotected001/TestDescription.java | 2 +- .../isProtected/isprotected002/TestDescription.java | 2 +- .../jdi/TypeComponent/isPublic/ispublic001/TestDescription.java | 2 +- .../jdi/TypeComponent/isPublic/ispublic002/TestDescription.java | 2 +- .../jdi/TypeComponent/isStatic/isstatic001/TestDescription.java | 2 +- .../jdi/TypeComponent/isStatic/isstatic002/TestDescription.java | 2 +- .../jdi/TypeComponent/isStatic/isstatic003/TestDescription.java | 2 +- .../jdi/TypeComponent/isStatic/isstatic004/TestDescription.java | 2 +- .../isSynthetic/issynthetic001/TestDescription.java | 2 +- .../isSynthetic/issynthetic002/TestDescription.java | 2 +- .../nsk/jdi/TypeComponent/name/name001/TestDescription.java | 2 +- .../nsk/jdi/TypeComponent/name/name002/TestDescription.java | 2 +- .../nsk/jdi/TypeComponent/name/name003/TestDescription.java | 2 +- .../jdi/TypeComponent/signature/sign001/TestDescription.java | 2 +- .../jdi/TypeComponent/signature/sign002/TestDescription.java | 2 +- .../jdi/TypeComponent/signature/sign003/TestDescription.java | 2 +- .../_itself_/canntbemod001/TestDescription.java | 2 +- .../jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java | 2 +- .../jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java | 2 +- .../jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java | 2 +- .../_itself_/disconnect001/TestDescription.java | 2 +- .../_itself_/disconnect002/TestDescription.java | 2 +- .../_itself_/disconnect003/TestDescription.java | 2 +- .../VMOutOfMemoryException001/VMOutOfMemoryException001.java | 2 +- .../nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java | 2 +- .../nsk/jdi/Value/_itself_/value001/TestDescription.java | 2 +- .../vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java | 2 +- .../jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java | 2 +- .../vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java | 2 +- .../allClasses/allclasses001/TestDescription.java | 2 +- .../allClasses/allclasses002/TestDescription.java | 2 +- .../allThreads/allthreads001/TestDescription.java | 2 +- .../canAddMethod/canaddmethod001/TestDescription.java | 2 +- .../canBeModified/canbemodified001/TestDescription.java | 2 +- .../canGetBytecodes/cangetbytecodes001/TestDescription.java | 2 +- .../cangccm001/TestDescription.java | 2 +- .../canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java | 2 +- .../canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java | 2 +- .../cangetsde001/TestDescription.java | 2 +- .../canGetSyntheticAttribute/cangetattr001/TestDescription.java | 2 +- .../canPopFrames/canpopframes001/TestDescription.java | 2 +- .../canredefineclasses001/TestDescription.java | 2 +- .../canRequestVMDeathEvent/canreqvmdev001/TestDescription.java | 2 +- .../curc001/TestDescription.java | 2 +- .../canUseInstanceFilters/canusefilters001/TestDescription.java | 2 +- .../canWatchFieldAccess/canwatchaccess001/TestDescription.java | 2 +- .../canwatchmod001/TestDescription.java | 2 +- .../classesByName/classesbyname001/TestDescription.java | 2 +- .../description/description001/TestDescription.java | 2 +- .../jdi/VirtualMachine/dispose/dispose001/TestDescription.java | 2 +- .../jdi/VirtualMachine/dispose/dispose002/TestDescription.java | 2 +- .../jdi/VirtualMachine/dispose/dispose003/TestDescription.java | 2 +- .../jdi/VirtualMachine/dispose/dispose004/TestDescription.java | 2 +- .../jdi/VirtualMachine/dispose/dispose005/TestDescription.java | 2 +- .../eventQueue/eventqueue001/TestDescription.java | 2 +- .../eventRequestManager/eventrmanager001/TestDescription.java | 2 +- .../nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java | 2 +- .../nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java | 2 +- .../getDefaultStratum/getdefaultstratum001/TestDescription.java | 2 +- .../instanceCounts/instancecounts001/instancecounts001.java | 2 +- .../instanceCounts/instancecounts002/TestDescription.java | 2 +- .../instanceCounts/instancecounts004/instancecounts004.java | 2 +- .../mirrorOf_bool/mirrorof_bool001/TestDescription.java | 2 +- .../mirrorOf_byte/mirrorof_byte001/TestDescription.java | 2 +- .../mirrorOf_char/mirrorof_char001/TestDescription.java | 2 +- .../mirrorOf_double/mirrorof_double001/TestDescription.java | 2 +- .../mirrorOf_float/mirrorof_float001/TestDescription.java | 2 +- .../mirrorOf_int/mirrorof_int001/TestDescription.java | 2 +- .../mirrorOf_long/mirrorof_long001/TestDescription.java | 2 +- .../mirrorOf_short/mirrorof_short001/TestDescription.java | 2 +- .../mirrorOf_string/mirrorof_string001/TestDescription.java | 2 +- .../nsk/jdi/VirtualMachine/name/name001/TestDescription.java | 2 +- .../jdi/VirtualMachine/process/process001/TestDescription.java | 2 +- .../redefineClasses/redefineclasses001/TestDescription.java | 2 +- .../redefineClasses/redefineclasses002/TestDescription.java | 2 +- .../redefineClasses/redefineclasses003/TestDescription.java | 2 +- .../redefineClasses/redefineclasses004/TestDescription.java | 2 +- .../redefineClasses/redefineclasses005/TestDescription.java | 2 +- .../redefineClasses/redefineclasses006/TestDescription.java | 2 +- .../redefineClasses/redefineclasses007/TestDescription.java | 2 +- .../redefineClasses/redefineclasses008/TestDescription.java | 2 +- .../redefineClasses/redefineclasses009/TestDescription.java | 2 +- .../redefineClasses/redefineclasses010/TestDescription.java | 2 +- .../redefineClasses/redefineclasses011/TestDescription.java | 2 +- .../redefineClasses/redefineclasses012/TestDescription.java | 2 +- .../redefineClasses/redefineclasses013/TestDescription.java | 2 +- .../redefineClasses/redefineclasses014/TestDescription.java | 2 +- .../redefineClasses/redefineclasses015/TestDescription.java | 2 +- .../redefineClasses/redefineclasses016/TestDescription.java | 2 +- .../redefineClasses/redefineclasses020/TestDescription.java | 2 +- .../redefineClasses/redefineclasses021/TestDescription.java | 2 +- .../redefineClasses/redefineclasses022/TestDescription.java | 2 +- .../redefineClasses/redefineclasses023/TestDescription.java | 2 +- .../redefineClasses/redefineclasses024/TestDescription.java | 2 +- .../redefineClasses/redefineclasses025/TestDescription.java | 2 +- .../redefineClasses/redefineclasses026/TestDescription.java | 2 +- .../redefineClasses/redefineclasses027/TestDescription.java | 2 +- .../redefineClasses/redefineclasses028/TestDescription.java | 2 +- .../redefineClasses/redefineclasses029/TestDescription.java | 2 +- .../redefineClasses/redefineclasses030/TestDescription.java | 2 +- .../redefineClasses/redefineclasses031/TestDescription.java | 2 +- .../redefineClasses/redefineclasses032/TestDescription.java | 2 +- .../redefineClasses/redefineclasses034/TestDescription.java | 2 +- .../redefineClasses/redefineclasses035/TestDescription.java | 2 +- .../jdi/VirtualMachine/resume/resume001/TestDescription.java | 2 +- .../setDefaultStratum002/setDefaultStratum002.java | 2 +- .../setDefaultStratum003/setDefaultStratum003.java | 2 +- .../setDefaultStratum/setdefaultstratum001/TestDescription.java | 2 +- .../jdi/VirtualMachine/suspend/suspend001/TestDescription.java | 2 +- .../topLevelThreadGroups/toplevelgroups001/TestDescription.java | 2 +- .../jdi/VirtualMachine/version/version001/TestDescription.java | 2 +- .../allConnectors/allconnectors001/TestDescription.java | 2 +- .../attachingConnectors/attaching001/TestDescription.java | 2 +- .../connectedVirtualMachines/convm001/TestDescription.java | 2 +- .../connectedVirtualMachines/convm002/TestDescription.java | 2 +- .../connectedVirtualMachines/convm003/TestDescription.java | 2 +- .../createVirtualMachine/createVM001/TestDescription.java | 2 +- .../createVirtualMachine/createVM002/TestDescription.java | 2 +- .../createVirtualMachine/createVM003/TestDescription.java | 2 +- .../createVirtualMachine/createVM004/TestDescription.java | 2 +- .../createVirtualMachine/createVM005/TestDescription.java | 2 +- .../defaultConnector/default001/TestDescription.java | 2 +- .../launchingConnectors/launching001/TestDescription.java | 2 +- .../listeningConnectors/listening001/TestDescription.java | 2 +- .../majorInterfaceVersion/major001/TestDescription.java | 2 +- .../minorInterfaceVersion/minor001/TestDescription.java | 2 +- .../nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java | 2 +- .../nsk/jdi/VoidType/toString/tostring001/TestDescription.java | 2 +- .../nsk/jdi/VoidValue/equals/equals001/equals001.java | 2 +- .../nsk/jdi/VoidValue/equals/equals002/TestDescription.java | 2 +- .../nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java | 2 +- .../nsk/jdi/VoidValue/toString/tostring001/TestDescription.java | 2 +- .../jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java | 2 +- .../nsk/jdi/WatchpointEvent/field/field001/TestDescription.java | 2 +- .../jdi/WatchpointEvent/object/object001/TestDescription.java | 2 +- .../valueCurrent/valuecur001/TestDescription.java | 2 +- .../WatchpointRequest/_bounds_/filters001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter001/TestDescription.java | 2 +- .../addClassExclusionFilter/filter002/TestDescription.java | 2 +- .../addClassExclusionFilter/filter003/TestDescription.java | 2 +- .../addClassExclusionFilter/filter004/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt001/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt002/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt003/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt004/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt005/TestDescription.java | 2 +- .../addClassFilter_rt/filter_rt006/TestDescription.java | 2 +- .../addClassFilter_s/filter_s001/TestDescription.java | 2 +- .../addClassFilter_s/filter_s002/TestDescription.java | 2 +- .../addClassFilter_s/filter_s003/TestDescription.java | 2 +- .../addClassFilter_s/filter_s004/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter001/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter002/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter003/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter004/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter005/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter006/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter007/TestDescription.java | 2 +- .../addInstanceFilter/instancefilter008/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter001/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter002/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter003/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter004/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter005/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter006/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter007/TestDescription.java | 2 +- .../addThreadFilter/addthreadfilter008/TestDescription.java | 2 +- .../jdi/WatchpointRequest/field/field001/TestDescription.java | 2 +- .../jdi/WatchpointRequest/field/field002/TestDescription.java | 2 +- .../ClassPrepareEvents001/ClassPrepareEvents001.java | 2 +- .../stress/MonitorEvents/MonitorEvents001/TestDescription.java | 2 +- .../stress/MonitorEvents/MonitorEvents002/TestDescription.java | 2 +- .../jdi/stress/serial/forceEarlyReturn001/TestDescription.java | 2 +- .../jdi/stress/serial/forceEarlyReturn002/TestDescription.java | 2 +- .../nsk/jdi/stress/serial/heapwalking001/TestDescription.java | 2 +- .../nsk/jdi/stress/serial/heapwalking002/TestDescription.java | 2 +- .../nsk/jdi/stress/serial/mixed001/TestDescription.java | 2 +- .../nsk/jdi/stress/serial/mixed002/TestDescription.java | 2 +- .../nsk/jdi/stress/serial/monitorEvents001/TestDescription.java | 2 +- .../nsk/jdi/stress/serial/monitorEvents002/TestDescription.java | 2 +- .../serial/ownedMonitorsAndFrames001/TestDescription.java | 2 +- .../serial/ownedMonitorsAndFrames002/TestDescription.java | 2 +- 1114 files changed, 1114 insertions(+), 1114 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java index 00a47f5424f..b53d31a5442 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AccessWatchpointEvent/_itself_/awevent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java index cdd99cf5a63..4900ef15118 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java index 7d16b61df14..836d03d2ec5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java index 2f5a4afeb11..ec5d92252fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isPrivate001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java index 491ee0a7051..26cc8d9ee64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPrivate/isprivate002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java index f283beb4a6f..72fabd05aba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isProtected001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java index e0052a14299..8500226866b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isProtected/isprotected002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java index f1e4827690f..67d9ceffdcf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/isPublic001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java index 36e409fb51c..b5d85b87e47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java index 633a41632ca..62516a09c35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPublic/ispublic003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java index 2c4fffd6918..3929998e970 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java index c5baa18c54f..4e3dc0f99b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/modifiers/modifiers002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java index 784e8a6e325..22936c0fb28 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java index bddfd2bcdb5..3438191beeb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java index c914a3a872b..57c3e37cd36 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java index d5e915c1031..1cf89c18af4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java index 2610752d76c..565a24a800f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java index b05f067f231..67d1f3cc2ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java index da6ad33cc88..92cbe9fc136 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java index ddb13bb334f..dbf21a36e49 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java index 886dcadcc77..be8d9bf6cd1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java index 669e227f45c..04073d1c221 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java index 9999c3473c0..3c0b9c7c485 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java index d019d817d1e..36354244190 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java index 0ee6195dfbc..7c48789457a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java index 464b7750bf1..814f79d5653 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java index 3c0f65e5bf6..924dcb2813e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java index 95d4bf3eb19..5ffc050c7d6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java index 491c735b1d0..c9694bfce49 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValue/getvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java index 4591eaf6cfd..3136b6f04cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java index b58c9e660c2..d4f06b29f84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java index 868d22ec916..df9da4b43ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues/getvalues003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java index af98d12e61b..773a5214902 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java index 56ca8e773a7..8355854057c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java index cac6ef78cf2..f8c1a3b3179 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java index df98bc197e5..4e1619af712 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java index ef10f83631f..ebbb5a884ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/getValues_ii/getvaluesii005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java index 74fb095a4c1..70b4ec0e036 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/length/length001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java index 3fbdbaf6119..cec3c7f01e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java index f6fa3ee22d5..2e1447a437d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java index 0d41f634102..aa02b1da2fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValue/setvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java index e12795b86db..b3f42e07528 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java index 42ea1d8984e..b1d9bb670c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java index 6e226ca1048..cc9bac0ff73 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java index 39858e520fa..a082d22c8e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java index 52cc3dc5c68..57c0a3ddaf8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_ilii/setvaluesilii005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java index 0db8c4cf2c9..997e7445cc7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java index c917d7ed1e3..d7f211ce413 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java index 88745af5e95..61cfd78638d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayReference/setValues_l/setvaluesl003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java index d362e420cfe..bb749ad4900 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java index 5266e5db5f8..e579a1ec154 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentSignature/componentsignature002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java index 5d6f6d1df01..27822e21d16 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentType/componenttype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java index 6bec55236c5..7951507e138 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java index 1dc92b0e962..07839a249df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/componentTypeName/componenttypename002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java index 39a8e9e4c78..67d90bf3214 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java index d72be3008e0..4ed0eab69bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java index 89bdb495523..b6637e20a47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java index 7eefe248990..87d940bec60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ArrayType/newInstance/newinstance004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java index dcfece2048a..52e6268ce9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java index 09b1a1acc67..b83279bf1d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java index 11a73683ff6..2a25ff12bab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java index 3a4e69bf0c8..5935b45720e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java index 049eeeab955..fc186d78599 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java index bedda9e1940..ff6964bc57e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java index 21eb9e76221..c3a9a1074dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java index f1226751613..c79350b5a8f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java index dc2cff8bea0..5c207ee741c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java index a5cac801cf9..14372d48e1e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java index c0b2432fb43..f364f0c7b4c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java index 1a41f71c8e6..19f02f0a235 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java index 5f93113f217..26efb19c104 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc03x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java index 9926e34477d..d3ac5075d37 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java index 8b8f95977d0..b6002bf7640 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java index f7497adeb47..e195f5a7e9d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java index 4dccef0591a..17419252d91 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc05x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java index 0eba41fa8c8..b407459d101 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java index e205aa8dd1a..3bfdbce3a85 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc07x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java index a6dd149ac78..e4b757f8b3c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java index 2da62a1cba7..93a69d8546d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java index 28e15cd77c6..d0da6550cc8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc09x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java index ea1858d1887..91c9fa4d307 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java index e65441bdbdf..4191faa9e03 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java index 20e0642ce38..eac188300c7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc01x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java index c3910a5a1bf..b6cacd588c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java index 89e4382e103..a8f298f37ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java index dc4b2e134f9..b0096306bbb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java index 77a36632ee0..e8364f49564 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java index fe29990d4ae..caf63e92d26 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc03x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java index e2f7378baf3..2442cd60c11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java index 31dd678bdfe..536c69f540b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java index ba60e971475..d05388693dc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc01x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java index c676ea6397a..94fca8c19b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc02x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java index 1475c505302..5da2d08a31a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java index 038fb2de77a..7d808a13681 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java index 09c378ebd8d..7792f773572 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc03x003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java index 8a0a57c0796..419248d207d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc04x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java index ed4227e1bba..d3e294f084d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/singlethrd/tc05x001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java index cf8e89b7969..e89a2d6dafa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java index ced09c07447..78b0c4a7831 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java index 8798bdd3962..6847f5c903c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java index 69711cbeb21..c1856b92b5f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java index b4553950caf..dcca9a3da6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java index b8a01296dd0..7a0398b6015 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java index adc42df3f46..50bf5b6de8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java index e7b2cdf4322..5ab348b8160 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java index f20659bb913..a861a54f849 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java index 64440dd5bc9..9f8f30ed187 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java index bc1cd05985b..2b935c40a3a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java index d4f4d62d39f..588370b4fd0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java index 45ee2ec2f4e..fac7a6d45e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java index 5dd722d02c6..6d09c4b4897 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java index 18e265cbae9..70baaaf93d4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java index 3cc9b04f31a..3947964bd60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java index 7ee3f94de81..a6e2123ce75 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java index e5d2664d8e5..aadef8ddfc2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java index 4f57ef4e833..1691ba00e8f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java index 8cb9433e21c..ffc9a6cd922 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java index 735f37515da..5ddda29a199 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java index b8d9e041b79..8608cade034 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java index b007cb0af4e..5f747f0a7ce 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java index 5c8e69174ba..c1ca0eba8a3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java index 1e475e35c8f..b95b7124d8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java index 48deef17dc4..728d2d5ff76 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java index 74512080d7c..26f1d90a724 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java index 8cfeb28117f..7c1426c029a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java index c19fe92dc88..f0b1ff22bb3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java index 4a80e6be58a..d480b95b2f0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java index 5d669a6aa72..44ce823c6a1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java index a42d1a97cae..d62ab5cd4ee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java index c577aeb411e..143c0c6d204 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java index a96241e6d60..7e6a2fa68ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java index 63f2c30278a..c074510596d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java index 72b5cddbc29..6427474ec84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java index c17c1e9b431..2d05628411e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java index b39b270b71b..84874fa71bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java index 31598116c45..be5870086fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java index 096983732a7..777f400eda6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java index 96f88ef9da4..f011a7050bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java index 4855e46dbf2..58a1f747630 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java index 6e44f7fa3c6..5bd620e2a5e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java index 86787627486..b8d4e2935d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java index a9609d9e974..b695a689508 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java index 0dff4befc56..015a0082c95 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java index f981bec5ea4..120b4e53441 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java index fe75c043c42..9a11548e5c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java index 3608e1e797d..0a3886fa400 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java index 83e0377c323..7b5239885f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java index 738c9a74076..c981fc59ba9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java index 6fd8bab7164..1e264a2ef5c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 903c52c4810..6ef4bd7931e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 4c53e6475bd..f2ced715540 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 9dc65f82ffd..289cf594b64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java index 79ddb2e59d7..df2990ef2ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java index 800e56feff0..902d6e45756 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java index 9a0c562c79d..b97c679605f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter001/addSourceNameFilter001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java index 23fe8c79337..31b4aee8a22 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addSourceNameFilter/addSourceNameFilter002/addSourceNameFilter002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java index 6b0c19a0a29..9f146f22d0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java index d80e21e3eff..9c9c720bea4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/allInterfaces/allinterfaces002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java index 3e93765ac7f..465033581a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java index 5ee8abf9151..93f4f5d02fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/concreteMethodByName/method002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java index 812983e5bb8..d48ce6289d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java index f914f2b6d05..f488a71f79b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/interfaces/interfaces002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java index cdc54a54a47..30307c9a895 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java index 2ed58c22cc6..e338379693f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java index a5b76f05b54..959532f5adb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java index 0cdc5394d9f..035a6c0d6fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java index a987d1e41a0..6f7bc9506f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java index 21b0fbe9eff..6c681bbb5f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java index 61a4c3aef60..74bb40e2b16 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java index 6733dbc954e..1d952cb639e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java index caf8e66ee24..4e42c76fbc5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java index d7b7748c9e9..520e755205e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java index ffc71b28b87..760433e4175 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java index 3f4cd66be61..bb878099ebc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java index 6e68df88e46..467b851f20b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java index 097a2eaf8a8..a47132fa4fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod015/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java index 10b6e1ac5f8..36be2f807fb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/isEnum/isenum001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java index 928db877517..4baffc8aa64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java index 50b74161bca..25e7ac92960 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java index b549d8e2062..ec6ada63657 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java index 035c8258b96..01c728fb362 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java index f77b05deaef..fdde898d679 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java index d72968fa152..da97aede2e8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java index 7cbbd5f70fb..09b7d118928 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java index 129d73c707e..e370198d3ab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java index a7135487ee9..fb7ba562af5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java index be1980f2b36..b352962cbfc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java index 8a8bd0429a9..e4fba76e469 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java index 19cd4c3250b..69dab0def69 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java index f5fc985e1f1..40ff92d2923 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java index 0b3dab74145..22edc938cb0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java index bd4648338f5..bdc10b7b386 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java index b86d50b6eb2..2ea8e3e8b5e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java index 672e12422dd..f086bd1b984 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/setValue/setvalue008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java index 83b7a03fe65..82a9321eac1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java index 0ac4c732823..9ee98b91c15 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/subclasses/subclasses002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java index 41a88f1f221..047664c3388 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java index f43ecb649f5..ea543244a9b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/superclass/superclass002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java index 3b713122ec7..cb178add99f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java index ed3b91b747f..25af670a409 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java index 7d0f505659c..0b57e871104 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java index be507d46513..4fc54a6eeda 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java index 8d99025f078..cdb297ca816 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java index 0769572c720..c667a969737 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java index 0ec96513485..d84008beb50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java index 68ffa1bc68a..6f40e311689 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java index f16266cafc0..804eb22c168 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java index 42b9a706fc2..1e5487f4ac2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java index 539738b9eab..8e58a549d4f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java index edcdd854465..43c32201d45 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ConstantField/values001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java index 2f4b8589b07..fe0f64ca720 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java index 4bbd0070e79..7ada9972200 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java index d579f06dec7..96e68da2146 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java index 2291ce32be2..63707dcfc84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java index 9a46686af6d..d7af8242e66 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java index 2f974664f1e..b33e2649337 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java index 89c4a4a7bd9..eb4cb3252e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java index 5bb78cf4f0e..ae2b65a1485 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/_itself_/event002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java index f262e99b170..884aeb52d9b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java index 89f7a6ac611..8f75c7bc500 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java index e23fd7b87cd..1cbfc82acc5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java index fe4896d4533..2da1b024dbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java index b78eb82ef6a..2030d3f7a67 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java index be9bc49a4c0..8c9ad2a6e09 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java index e29bd438382..86643444f1e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java index f2b7aebdf12..db303a4c75a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java index a002e29ff32..1d3dee37e7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java index 051e9ff2fd9..cd9379f519b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java index 9978d7ff75d..c0f9dbecde4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java index 657ae36f771..bbee0f6adf4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java index 6bd23e25092..321766addbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java index 5b9e2ac572f..4895bf8581d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java index c77f517b93e..e3d0faa9215 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/_bounds_/eventrequest001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java index b2ca2be66b9..3df32fdf412 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java index 455cbe6a874..624c0af75c0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java index cfe971be8d0..c9513b2cf86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java index 2df5aab68f9..857215199fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java index 3e2a3919fa7..a374ecec07b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java index b7e8bf514cf..cf7a75dba33 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java index ada013cdea2..23706d6f777 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java index 82f3266ac85..a2573dcd52e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java index 03a951238af..7829c37e432 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java index bfb42782ccf..60943fff8ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java index 8f8efd78f25..5e888846f57 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java index 759e6b46aea..d6e0822b303 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java index cea4c97e8d6..fffc93c3b7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java index be59ea9025c..21bc8f0739b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java index 5b6a225cf9c..1631de0768e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java index e5e39f69e10..487075711ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java index 6eeec823685..a4909d1f024 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java index 87f864bc8f2..d89c63de995 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java index 0f1decee219..7cd5eb17de3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java index 95829e8d86e..c6a41d1a9d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java index 4cb361ae693..b0949a76a77 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java index 3933a000a0a..94f197c7bec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java index 09e5e0f4e52..98f09a82b4b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java index b1eaec91867..9370914be6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java index 2dec59048b3..ebe80d79458 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java index 10b9a6a3b26..f85be6b1d78 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java index 70740bc2ee0..7cc3a69c95f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java index 2c19a626893..db94516b11b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java index 62f1d1704de..e087b6a8c7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java index 760da9ed497..9eacfeb0204 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java index 71c9cc86131..72746147ade 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java index 177447b3b72..3cc318625c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java index 5f77d3bc378..49d2bfbc13c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java index c18f5c30884..b281ca85bc7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java index a87c19d9e3a..389f51cb636 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java index 991e97d96cc..d515ff634c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java index dc35039419e..0fb749e0618 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java index cda32d4868a..7f97cf35402 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java index 50f353d809c..40011e87ea2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java index 3db0c7ef4c3..abcbf060ad8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java index b8a4e3164b9..36b5e6e2103 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java index 891b67509f6..2189bbd623a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java index 811c3e16373..d0f21451156 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java index 008b22b983b..25d4a733442 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java index 7513ad88e93..43f69277f35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java index 46123bb3eb0..e5dd8da7e4d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java index 07a3d90da2f..aeecd153652 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java index 6d657818439..26c8c8bfa91 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java index 18e71df141b..3ecd31f07b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java index 22cfacbf7de..857916f5872 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java index de3bc0e9851..3e09b51eaf1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java index be9ecfeeb5c..070103a0c80 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java index b0578ff4223..f2447a3041d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java index 57ef943c1b8..a6dbcb5ab4d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java index 7d72aedf641..3814800c182 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java index 15373d64432..abecdee043e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java index 5a7bbbf04c7..8d5728553aa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java index cae6369d641..beccce9ecd2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java index 639203c927f..0622076e399 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java index 3867972f2e2..503681e0cc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java index 3f41f20340e..6dc172f54c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java index c62c205b457..a04e47913df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java index 69e334a9168..4ba585fa759 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java index 2f5114d40e2..ffd6c664198 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java index 943069f9988..f56ad63fdb2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java index 041270551e2..f21a19a38d4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java index 650eb527203..1dc3aa9c92d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java index 2d39b35cffc..d080a3f5b75 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java index 9f7fd4e20cb..1a0400900ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java index 4df8391178a..aecf5328850 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java index 10e253bd699..c3365296fd1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java index 5227fbecafc..1dc3f422306 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java index 9d3d3ec2a87..50813b7ac32 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java index 7387211e10b..ca28ae09ecb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java index 34b57442c9e..dbd15586590 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java index d9d2373f1f6..af0dfdbaa4a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java index cd90cdacf64..690c54488c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java index 1158018d287..7724f79cb82 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java index b1586d41dc9..3eaa9240063 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java index 0b5f56d37ca..58e25e9f459 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java index d090defa6af..5fb2ea31514 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java index 301279c74e6..469833722e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java index 3753ad08617..5abbddb0c92 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java index 5b9327c74fd..b8bd10eee66 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java index e5cffe27d0c..f3ad91b041b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java index 6c15bda8a2e..b161b806764 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java index a0ee0392371..9cec826cb7d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java index 98bc4658f9f..d4e75daa464 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java index 8df2f1d5292..1b9b0e8a539 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java index e8617c4a077..a0d588983bc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java index c2e6904cfd5..0386dbe15ab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java index 58559e68727..613aa2e3d92 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java index 5a2bb9f8dc1..2823ad788d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java index ced912d59c9..477edff8b54 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java index 3203a02a320..48178ba138e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java index bdfe413cf18..1029463fedc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java index f171ea9d72e..8aeacbc2ae5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java index aa56c14327c..de368fc051a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java index a1495eb7a3b..55fcbf2b5b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java index c058b31a9e7..fbcac4a1ca4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java index 1da793e065e..d7f2cf69c9d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java index 95a97c0d145..dbbc2256d76 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java index d790741299a..61cc0cb5494 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java index 402ba5d8b57..340d8c95f8c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy018/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java index 19a7ec14cdf..5ad20ffd1c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java index f854afce553..c18fd98183d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/virtualMachine/virtualmachine001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java index ea8de04a131..a228abcd5ec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java index b27c08e0595..0f0153888aa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java index 25c9b7d489b..dda30d72225 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java index 61a3bd51248..d08303b3bbf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java index 956d20dc2c5..89e8fd449a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java index b362536955c..f0813ec9134 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java index d4031331e29..c6341688f22 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java index dffb36f191b..6c728936d7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java index 4f5d42b74ad..5d6adb4637f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java index 7a27c224ba5..5a956a53f7d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java index e99718d6a51..4bfcf7db2d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java index 9c4c93476c1..6b2a9066697 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java index bd0c4e2a026..7c49b548893 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java index 5fedf0e0c0b..90e1837d422 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 5c59fdaf481..590a38c506e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java index dbd9462b89f..d0213c7ba27 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java index fdd604e1ce6..9ff1f09825e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java index 3b2c0cb2e72..104a1425ddf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java index 735bc03dc15..d09d9ad2fa5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java index eb048b4a7ec..104c8a00253 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java index fc0364082c4..1bc59f30039 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java index f4fd8320273..be1e172c208 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java index 1c5ebe8d96a..99bf4c05c93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java index 6800b65993c..51303c816ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java index ef8a61a6437..4ac56734b51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java index 2b2410a6bbc..e92934a874b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java index 447bf27793c..0a5ce56a2f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java index 61aaf915e38..93f6cd0ae85 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java index 59c61704a2c..7e9148932b7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java index 34b36e22f4f..4dc123f0048 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java index 5ceb1ac11f7..4931394bc62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java index c4087b22a09..4496012052b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java index ccc1a7144d1..60c0757ae2b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java index 4b6372baaa7..83c602686df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/equals/equals005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java index 6bb72dea7d7..977618460f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java index 97c40dbc85e..099b068624e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isEnumConstant/isenumconstant001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java index 54b994f79c5..a1cd4eff94e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isTransient/istrans001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java index 21dd580f6a0..0c4c2b66d64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/isVolatile/isvol001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java index d83148ad178..143e68ed56b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java index 8f333dfeed6..017bdb43760 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java index e339089508e..459d44e8328 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java index 311f78983ee..a02f46ac0e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/type/type004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java index 455c4fb8462..e34643df9be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java index 46a0770315f..228b77c7422 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Field/typeName/typename002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java index 9ff2d10a12c..5b795cbfe56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java index d1639746adc..4b65248e670 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java index a4e495b11c4..9d50a38f06b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java index c076a4d50e3..758a037b7af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java index de0c844ce16..017bcbc1dfb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java index 41f83b38c14..c89f4a1a987 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java index 9d0d726efc2..5bc2499da6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java index 9ca90a5b724..13f8388b132 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java index e4829d67ae1..33df3ba3ec0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java index 0e1d21fb55e..87417a8acc8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java index 4aeb6630531..549a2c45116 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java index 85f799fe11c..cd34c3192b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java index 0c34c680b7d..d392c6c8025 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java index bd2c6a4823a..8f45b403ca9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java index 974795a9395..394acbc020b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java index 8eb47b348ee..aa69dc5dc78 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java index 9135cd249c8..b116c619d2d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java index 2f471504b6a..f85d91ecc50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java index 66754e0a22e..38153b1a18f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java index f5023eb6e46..4f60b848452 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java index e79d2c34799..cf8096c64b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java index 79c2af4bd03..dcde50adaec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/implementors/implementors001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java index 94c7388b156..01aa6c69d94 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/subinterfaces/subinterfaces001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java index 19a46d2802b..b9e9b96b69a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/InterfaceType/superinterfaces/superinterfaces001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java index 365c799b134..dfdb5f97194 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java index 645b06acbda..a7edac1faae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java index af86d47cac6..033d0bfd7cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java index 3ada6d9ee53..13902731797 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java index 9c7bacf1d93..5cff163b6cd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java index 958492ce5a2..a43ede08828 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java index 9845628bf9b..876f3507e77 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java index 52a4c7daf1c..cb6a5ddf425 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java index 1abc8d75958..837ab393ab6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java index ce2fe65ed69..af13e9c0d79 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java index bfa8c502d73..ad14b39deb8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java index b2ba8c8aed6..cb4d8322921 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java index 5cc4cfb2a8d..98f98c5899e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java index 2f249860c3e..85e71d58678 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java index 1afd1c0532c..23c50087732 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/genericSignature/gensignature001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java index 02e6e131579..96b1aef098c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java index 2c846337e48..7e6990b1b34 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isArgument/isargument001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java index df5a574bbe1..828255dda9e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java index 580cabf9cef..8f13416b6e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java index 7b695f8e33c..77eade5bdc7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/signature/signature001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java index fca42920bec..44497cb1594 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java index 10d2e6e2044..d55dbd94278 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java index 92f2d074439..c3e7f9591ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/type/type002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java index 6c252ae8af7..84b2c942b0d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java index 867adaeb070..8b735f18d43 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/typeName/typename002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java index 144ae892425..4da36790d5d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java index cd3edb36ab3..ef445c8968b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java index 72f0a84e528..425583bbb0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java index 84aa977717d..86d24d0278c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java index 538b35f816c..e6cbe217739 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java index bbd85fe5980..a81b4e7155f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java index aefe5a2f18d..a0de6bb6cd7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java index 290b4c24d41..47ca866d340 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/codeIndex/codeindex001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java index 4d50958dbb6..10efec44d7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/declaringType/declaringtype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java index 84e8e14ef8a..a0fb4b287a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java index 59073badc23..9bba2469348 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java index 061aa3a222d..bf75f999db8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber/linenumber001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java index 0be1c2b9f24..a51eb9c1dc3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/lineNumber_s002/lineNumber_s002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java index 4de5cfbab51..d2d70c39617 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/lineNumber_s/linenumber_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java index a49f807781e..0a797d69c6c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/method/method001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java index c18eaa61634..02aa1add40c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName/sourcename001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java index 56f91445d43..4ba283f4988 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourceName_s002/sourceName_s002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java index e531712ec30..a30e6c140e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourceName_s/sourcename_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java index 19d751b2352..be1d4013b5f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath/sourcepath001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java index 47c82b63d24..66864009049 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcePath_s002/sourcePath_s002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java index 31f8a82eaae..65f41b05508 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Location/sourcePath_s/sourcepath_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java index e3bddbca93b..ed1e744e253 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java index 6ba901f5555..c4d8520f8c0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java index abcc4a2e79f..254df6ae1fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java index 25676aac587..2d26abb94cd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java index 3486c269c59..a305a5bb91c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java index 7eb0d3edbc0..6dfceaa5d9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java index 74d9ab3afe3..7238e1261c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/_bounds_/bounds001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java index 940684bf7b0..13c68cc29ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java index 185d9a3d7af..532119878b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations/alllinelocations002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java index 56df88dd8bc..9b1cf3bd4f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss002/allLineLocations_ss002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java index 52a8225dd7e..a661abc15d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java index 28dcd96ca3c..4c17b029038 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/allLineLocations_ss/alllinelocations_ss001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java index da26dd049b3..cc673a1137d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java index 86d73af02f2..b52dd3d9b31 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java index 7060c5e25e2..ea18c65fe85 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypeNames/argumenttypenames003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java index d34e2ff1361..1d2f2d1c362 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java index f1f919b5e13..426e80a427a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/argumentTypes/argumenttypes002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java index c947b74838a..48db3c2a109 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java index a6f94e944f6..4a5c18e0fef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java index b81af28120d..324025ed458 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/arguments/arguments003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java index 2f1fe12414d..1afa1934ae9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/bytecodes/bytecodes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java index 349f94fb3cb..7c47fd70b2f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java index 748eeaf052f..460f02d154b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java index c12f51d6b0a..9f29601326d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isAbstract/isabstract001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java index 345fc0caacd..c1146b99e72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isBridge/isbridge001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java index 90321642eaf..6a94a6eb3dd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isConstructor/isconstructor001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java index c12d36a5cb5..3f4fa0bf3d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isNative/isnative001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java index 5ab780e1f33..2b3ff2b3181 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java index 9bbba8955f7..58e56a2d9ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java index d3ecdf2f669..e4d1f3b31a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java index 0ef6d68ff87..710c6db89fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isStaticInitializer/isstinitializer001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java index 60022552f54..b9c712cbd14 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isSynchronized/issynchronized001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java index 4594858edfe..48f7748fcff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isVarArgs/isvarargs001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java index 6feb10ba223..9c1d15eed12 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationOfCodeIndex/locationofcodeindex001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java index 20375892218..8855beb914b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine/locationsofline001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java index 4a5e84fb256..0a807b186a3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi002/locationsOfLine_ssi002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java index d48f47981dd..f7b900bb58e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java index 62f036e98c6..558f01cf7f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java index afefcbae510..c063ed628fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java index c8dfa50f237..19adb74ffd0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java index f42f5b1ea9d..bcf28766405 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnType/returntype003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java index 68c98d06674..410de3739f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java index 6279f286729..336884c8647 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java index 99628d5e338..4c2744943ed 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/returnTypeNames/returntypenames003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java index d752d0f6fa2..3642dfaa07c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java index 39cd63e46b0..ddef4b70d3d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variables/variables002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java index c1cfb1caef3..ef747e39ce0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java index a0bd75f94d5..9b78d89c4b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/variablesByName/variablesbyname002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java index 896e3e2a277..f5af65f2755 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java index e425785de86..3275bc2cdb4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java index 6fb01690f97..9fd44bb076a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java index 80704a47847..df3e7c4d4d2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java index ec2a2b3b018..1f9e0749b0a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 9de2dcefad3..07f7d207c54 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 14ac096b3fd..0e7fb7a8a6f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java index dc71888570b..4f562df1214 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java index 6158593d167..7f4f4c8927b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java index a0b6f29c9ad..9101190f481 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java index 0a324bb7da6..edac4aaa493 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java index d7272d61ba5..9bce85075b7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java index 4b70bd8cefa..42a57187ded 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java index cc0e5cc09db..d501a48b8ed 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java index 6988bbd4e18..937b83a95eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java index ed3a0c484fa..e598a276db8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java index 6ff739907f7..604bb89d2ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java index 5b6d4c50da7..b1203d89aec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java index c3aee3e2906..3845e752d35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/_itself_/methodexit001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java index 10940a93e8b..22f9a8ae877 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java index bdf23268e07..14e871eac55 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java index 32f9035b124..82da047b0f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue001/returnValue001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java index 68742198fdd..ea40253adb5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue002/returnValue002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java index a37f9dda9f3..aa3233f6fb0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java index e1bc1455f8f..be8ad91d42d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue004/returnValue004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java index 4a8db463085..616671e2f20 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java index 2fec065274b..0770a23cb45 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java index 01206e61563..83e887d7285 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 4781991d333..fbc592ccc35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java index 81b1173626a..e20653793b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java index dbb423bc425..e304c7f47e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java index e00e2b3ffba..4cb9dcd4d30 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java index 483fbcbcc1e..ea5fa72a402 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java index aa4a832d98c..c8a5604e857 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java index 911e0fe2b87..ef630007ff9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java index bcf34ce2347..4bd73a8192c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java index d6039bc5056..e87d027ce8c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java index 1661c717c11..5142ba28cbd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java index 2c7007c3846..53a97503a1f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java index 1a396f7944d..397c0b2e33e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java index 094e2fffc4b..af17b2de1ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java index 9cc5d25898f..55a2b251486 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java index c22d01bea6f..2e8e0296765 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java index 4ef249c6b44..e805b8cfb52 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Mirror/virtualMachine/virtualmachine001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java index a84b7c650cb..ac71ac60c90 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java index dbcf25905c8..76829e4ce75 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java index d96f56ae1ff..74c06e403a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/valueToBe/valuetobe002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java index 131c4d7c615..de822350544 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java index 254b094ed0d..f58487d5ef7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/MonitorContendedEnterRequest002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java index 3c85e2fa0a0..4eec47def51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassExclusionFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java index 6091d77e1f4..4c52669fad5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ClassName/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java index a082f7a3b6c..43d02916e4f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addClassFilter_ReferenceType/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java index c8cee915bdc..0f1058081e4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addInstanceFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java index c8d9511fb7e..021ef8e634d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnterRequest/addThreadFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java index b08ccbc1efc..d7853313e0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java index d6fd92d201a..02098968653 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/MonitorContendedEnteredRequest002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java index 652b71bd0a8..671041a87ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassExclusionFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java index 33fc47ce8bc..39df5add572 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ClassName/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java index ab50a55ad56..1a9be9c9389 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addClassFilter_ReferenceType/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java index 43e970993b2..5d2f6a9a833 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addInstanceFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java index 7ac9cfa633d..9b4967020b1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorContendedEnteredRequest/addThreadFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java index fc1c9ff43d6..721c5c51c81 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java index bf3cf523269..3e36caf2cc8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/MonitorWaitRequest002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java index 2971c3b989b..eae771f1f2a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassExclusionFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java index 8a19fe1107d..90b455dcfbe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ClassName/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java index 44184a8c0f2..6ae35ba2f06 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addClassFilter_ReferenceType/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java index 483d8bfd661..d1b168e8215 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addInstanceFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java index 840dce2cac8..e3a72c2f259 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitRequest/addThreadFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java index f67e525e601..d54e424dcf3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java index c82cf748474..6bbaee3e366 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/MonitorWaitedRequest002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java index 11db5a5b6aa..27a149e91d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassExclusionFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java index a150c3b8cf6..7cb347fb943 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ClassName/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java index d29fb86b823..8f25a80e685 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addClassFilter_ReferenceType/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java index 114c14a15c1..56af75b0c98 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addInstanceFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java index 7c5ada839e4..8f74353c9c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MonitorWaitedRequest/addThreadFilter/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java index c7824a361d0..3c33990d34b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java index 9d8e0391ff2..d5dbee3e79a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java index eeb7a778f55..aeb12d559cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/_bounds_/bounds003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java index 5aa7fbb4a57..1ff71d254a5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java index 35d4394877d..23c1f05d984 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java index 62c3f67891f..f23d079a3db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java index f4b3bdccd88..070ea7c9c8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java index 285f40ae4a2..2ed35009fc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java index 2d63065ecf6..e0ed1568f3d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java index e598ee06b49..3dd356e447a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java index 68a3d6b0709..6bd6cdfc462 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java index f2163501c7f..984294744f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java index f81d7d023c9..ed9474becf3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java index 64ea4073829..d24f92a3687 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java index 425a5b7c7c2..2501b678eb8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java index 40a018074a0..195c3214a81 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java index b2c4f38c3e0..74ba2cc9e6c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java index 90b1b9f5522..cc3f9a27aa1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java index b0b8966cddf..65490b7d64f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java index 28ce6378cd9..fb719aeb136 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java index 80d0aeb90b5..236d5471f5b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java index d6c60724b2f..35c061e6571 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java index d732d7d58fa..3ebfb55ba32 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java index 6a4f9c9de86..45758d24e3e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java index ca2d43a1eae..fd7c21dc853 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java index 561ed4d9fe4..61436cb1360 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java index 1420fda081b..7da7d95a4ef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java index c9f9fb4c7a7..53635ae3b31 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java index cb660a1108d..c8cc6ee2834 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java index 42355e76e61..529fa277706 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/isCollected/iscollected001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java index ab9ab2dd09f..e715063be4e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java index 4eea3cb35ea..489bbd6855c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java index 2e0490006eb..c8320daaa01 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java index 8373554353e..09ab19b2b46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java index 24c41ab159d..20774333d5e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java index 6cf450b5281..279e01be850 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java index 8551c94b72a..41fd128fee6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java index 10b9349c8c0..d83fd9adbd8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java index c4204f2b4cb..1a6550e2415 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java index 678fb11fd13..865218da915 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects001/referringObjects001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java index a5a015b5d68..5a3dc4bb70a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects003/referringObjects003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java index 911707d4cda..fbf95d6853b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects004/referringObjects004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java index b55ef19604c..0ca6863f02a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java index c63b85d7466..0ec1374f5fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java index 77d8542194c..1f20feb69e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java index cf4cc6448a0..ec75216097a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java index 8d46a2f2a9c..053b386eaf4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java index 0736b815aae..fe550b935a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/uniqueID/uniqueid001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java index 942a9848a74..47ce0f1493f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java index e0596320742..d59108b9ec6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java index d1b63bcab81..0983d26568c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java index 36cb71e69f7..f8e83f73bd0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java index 360fedadef3..5cbfa8fda62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/baseDirectory/directory001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java index b3eafd056bf..8bfea6f42c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/bootClassPath/bootpath001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java index 05aab5b402c..1ba7891d4d4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java index e598ec75821..778ac76c35c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java index 675f3b82847..dd8fecc5ae6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java index f1a6e989c11..5a406cec527 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java index 46d6377bd34..aec8783b4ce 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java index da59e66fca1..6b6694dc09e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java index 4636ae35eb2..4928874c66b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java index e387db1ae0b..3369a1578bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java index 8c7cbccab5a..280efea18a3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java index adcab7d9311..afc1baa5765 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java index 43e4199c7ef..5f3d27de757 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java index 07491942d46..0a4b3924eeb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java index 81703a82084..c1baef5c976 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java index 902a7ab1bf1..1c6c73ec7a4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java index 8d7d695d383..2e4039c4635 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java index 793c5da39f5..95437d555b6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java index b6402040b30..00bd1397c56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java index 9eeed2efc89..3417548e087 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java index 19f546a6199..9b182c77cbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java index f787c725efe..86cfd765989 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java index 5118890fc9f..3473d2c72d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/booleanValue/booleanvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java index 0bef35a6667..7a9ab9f9cad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/byteValue/bytevalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java index cf021d4ae91..0f03ae7c1bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/charValue/charvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java index 3014b9a715e..5c2d20b2aa2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java index 6d5817ff558..373984a708f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/doubleValue/doublevalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java index d17b2ff0a3c..27041c83a5a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/floatValue/floatvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java index e52a7e7ec94..09cc701c699 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/intValue/intvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java index 632d805da2a..862cbc7b914 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/longValue/longvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java index 086ee775f45..1fd7447c8b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveValue/shortValue/shortvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java index bb31cd554ef..fb818901e97 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java index 560e5ca207b..8807022b51c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/_bounds_/bounds002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java index 5443c3caf56..85d310ffde7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java index 5d1df7f4e44..d7720e2fbee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java index 183902f17e1..01d3d63ee31 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java index 5bb39520565..9240e2d7042 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java index 5b5fc31c179..6b72dff898d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java index 9fd44d2a0dd..f25731e4062 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java index 8edbc5e47be..7c0bce29ffb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations/alllinelocations002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java index 17591879b62..6eacca83392 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss003/allLineLocations_ss003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java index e59a5d5fe67..dbdc77e326b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/allLineLocations_ss004/allLineLocations_ss004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java index 251e8ba4685..ad8166563c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java index 0a7024840cc..70fa0ab763d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allLineLocations_ss/alllinelocations_ss002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java index 109167a0152..68e0623080f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java index e83da13c2a8..96598466169 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java index df9ab2462d8..ec4e9e5fcd2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java index 56efb2ca125..217a9436b8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java index 1fab784fb8f..495515d1cdb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java index f354bac7816..d80b8e1217f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availableStrata002/availableStrata002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java index dc647a97599..76ba2a2e0b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/availableStrata/availablestrata001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java index 09f29b1e1f8..da0da59ec68 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java index a4ba109b317..3bdafbb28ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java index 100578a4d99..56cd4bb28ee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java index fe2afac0129..8e04986a55b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum002/defaultStratum002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java index bd48bed9dd3..8cbbf214558 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java index 93c7180f43a..8fc845116af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java index 004e6e75345..d8cc5a798e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultstratum001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java index 38d2e304a62..301f1e9dbf3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java index 50fba1910d3..e452ec9c367 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedToInitialize001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java index 94ac65a3101..d6c37f59d66 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java index d384abd467d..21991697ca4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java index 9d6ac4b6e05..ecf32c8d8c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java index b8f99cde6eb..da2a4947175 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java index 932376bceb7..36b2f581b9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java index 0ad34a01c47..bd474ecea89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java index 9b00c9b24ed..36528da79dc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java index 92b1f19b543..0739ba90b1d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java index 012b1836c59..c5168743478 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/genericSignature/genericSignature002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java index f72735ca89f..9c90fc65e41 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java index 89f00dced83..ac54bb0bf44 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java index 17e6776c3bf..9b3c5b2403f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java index 8edb49a69a1..4c51f5185c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java index 65edc4b7667..5fc38cf1e24 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java index 4cea22b58cc..546663e25d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java index 8d1822116cd..f386e273728 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java index 89268de966c..34a17fea620 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java index dc49f7b114f..0302d97b893 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java index e04ee2bb906..a41f80dfa61 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances001/instances001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java index 16cbc9580a9..b065996c4da 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java index 6faf64b17ad..32ae542a534 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances003/instances003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java index ea731be7aeb..2cc66ddb3b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java index be5dd8507d6..9d3281cd521 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/instances/instances005/instances005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java index c778e3c44a2..83459b70bae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isAbstract001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java index 5ce25e6efee..9bb6a359eba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java index d4f435387aa..91588d7116c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java index 41deb88c8bc..fbb17cac6fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java index 2652ac847d3..056aaa5e890 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java index 215ffb6b56e..c34a04043bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java index 9ffe6687321..2330f1835de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java index 4df25d92c6b..2d87aa3d0b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java index 00dca767977..5f5d6ee1671 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java index 0c75595477f..fcbe4af0b16 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isVerified001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java index bd03a5e9f0d..9098d36cb27 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java index 0cd520f3fa2..245bc601725 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java index 94b79e3dd8f..d29ebbfe6fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_i/locationsofline_i002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java index 7fe631a0167..b54e4ff1778 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi003/locationsOfLine_ssi003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java index 8aaf3d30c3b..05296a74c40 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsOfLine_ssi004/locationsOfLine_ssi004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java index 0e2df8f6439..f8a40a15030 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java index 672af5183c5..2cdf16c2d90 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/locationsOfLine_ssi/locationsofline_ssi002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java index 021857b46fa..399bb7bd2ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java index f08bd7e0021..4fcc49e4dd1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java index b8b726c51ed..714802d945e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java index e011ffbcbea..11662e3a3c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java index a89f0f7c205..435d336c866 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java index 15bcb13b083..fff1de278e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java index a2d094455ca..a10312bc9e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java index 96d661cb9ea..255c12dcb7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java index 070a5eaa724..6227c9bf0cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java index 679c846d4df..36619398952 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java index b638bcbc521..70116a951b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java index a046eed0e9c..574f23ecb42 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java index af7962ea5df..0c0ab360b00 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java index 0134134294c..81e84719a7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java index 15132559f55..989a5b3ade5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceDebugExtension/srcdebugx002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java index 17023ce6432..c74a13a563d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java index 66396fff8e1..fe0ea7b1865 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java index 433a5f4ec8b..5ba35564c60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java index 690bb2da649..8b3a2281e1d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourceNames003/sourceNames003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java index c630b6386bb..f1b824bd478 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java index 7bb9a62201d..cbf0d2368ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java index 8ca686f5209..3e3b3ed9c8c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcePaths003/sourcePaths003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java index d90333a8375..9a3d53ede48 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java index 5b3c0bc0726..3f9b8cc5771 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourcePaths/sourcepaths002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java index 1d6da49d1f6..ab7bfbf50d6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java index 19801dea482..093b219611a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java index aef0eb809ba..2eb04dc86cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java index 8872cceb88c..596b90b18d4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java index c0bbe79f1e0..5849b861df3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java index a32c8ae0b62..c71d63f733d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java index 5a527089d84..06da7e7f0f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java index 5b53bf92df5..b70760ba327 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java index f4db58c0fe6..288a86bb151 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java index e5334090a32..f6d600db7f0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java index 11f4f0a02b1..392181319ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java index 1016dd60393..6186dc2501d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java index 8c3b6d857c1..e3a57c825d2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Scenarios/invokeMethod/redefineclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java index 42d52b66174..23f4b28cb0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java index 75015bd1da5..63f4b4c00b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java index bbf04347aea..303a3e109a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java index 61c65b738a6..8e7925e8140 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java index ef300b6eac8..30435abe80f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/compareTo/compareto001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java index 6f86edd6d59..8adb64a1053 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java index f6422aff63e..b8494e515fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java index d42e0122a94..87a4b8e5ea9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java index 9503b3b3d7f..a10ec23c9c5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortValue/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java index 64fdf669b59..4573b20c540 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java index a9ed83d5e3c..ce7715ec89f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java index 360dfe9164e..f2a3df1fdeb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues001/getArgumentValues001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java index f80b7e49806..da6c342f475 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java index 2a8f8b5b9f2..1153dbe0fa2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java index 16b2a20cb33..8de704179eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java index bd3120d2f12..d2d16b01b8c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java index b8763320f59..7ee8f1ae52a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java index 30639afae96..77b684e2b15 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java index 0ef274a9b67..cae54ef20cf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java index cefc8e2d1b0..027da86df93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java index 81d6e2a163f..926e81ebb70 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java index d51000146f1..b34cdb0fe51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java index 31dc08c0314..0cefad0e7f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java index cd095d19483..63de9efe93a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java index 5d71bf5d38e..f28f5b93b1c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java index ddc4dc63ce5..eae6e4372a6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java index 84d867907d7..47a6ac75092 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java index 6aa195e1abe..ba528311385 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java index c2b90a0b5bd..6d98981c07c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java index 600c5320f48..2d3c2928121 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java index 4a605ed3f53..e1452312a19 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java index a61955ab579..9628cf11bd8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java index 6fa53156f85..628cc2daca9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java index 0b42066e33f..df8a9d95f13 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java index 24cafa8a0bb..1a7a7ceef44 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java index cde1e0447b9..45d9c5c46b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java index abc66c3efda..e5a22f88108 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java index 94a7eb2b703..0336d4d2d0d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java index 7d8d4268954..c08512450cf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java index 57b38b36ab8..6e7c7d80c68 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java index 059ac70e607..bb418f55f4e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java index 6d16b578021..01497b15446 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java index 9692963c271..7b10bd3e574 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java index d2fe7867854..a048120958f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java index c40504abf99..90493d66c74 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 2dbeda16d93..3d7de3313d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java index cd47825c071..cb9d1e56b8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java index 1e88f7f1278..e0023045d66 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java index 7fa48faa29f..a3538627629 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java index e57bcec0019..3352ff6f773 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java index d3b8a647ea7..1235429fb59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java index 16f1fc4217d..e8c91f68227 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java index 534b2315064..6710f6c25a3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java index 7b5b1a12675..0312a7de6bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java index 57a4194c184..6577af7497d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java index 6929572089e..e0c242d335c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java index 491ad286994..5f438ddbc07 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java index 56e941e29cc..c3547776dd5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java index b8374665377..842c7633806 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java index f6ec8d518a8..24602835da8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java index 99010b00242..eb3dd0262b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java index f7ef7ee208a..085a6e82acc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StringReference/value/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java index 81e54c588ca..bc879e2a8d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java index 40fa327dee7..01e4ce0d939 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java index 6116f754bd8..ea0c8ae1fef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java index a9afa155568..2128e2bcc8d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java index 233708f9b39..40ff3a02d9a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java index 155b47f0930..f3c98626733 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java index fe8f715b375..1808989b289 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java index b91ec86a89e..f75104b709c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/parent/parent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java index 30831c43c8a..6f296d08495 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/resume/resume001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java index fc61aeac914..137f3bd078a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/suspend/suspend001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java index 23877755991..e8c04e8563d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threadGroups/threadgroups001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java index a0e11dfc14e..97f57b946ab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/threads/threads001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java index 4be3f995651..15fccc874d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadGroupReference/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java index 1bf96b98edc..b5b11a64df9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java index a25f75ab020..7622d22d50f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java index 2b3f49bc5fd..22a7cc6eba7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java index b46e59e565f..ab1f1911284 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java index 2a74bc4852d..5035c3e3970 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn003/forceEarlyReturn003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java index 21505dc7727..ced27ff2251 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn004/forceEarlyReturn004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java index fef2751c13c..442cc548495 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn005/forceEarlyReturn005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java index cfaac8a8ed6..0eca1999e1a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java index c4c7faac150..cab5fde141c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java index c572780b5aa..28f89695de0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn008/forceEarlyReturn008.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java index 6beb71587e3..3e515493ad1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn009/forceEarlyReturn009.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java index 526c78d550c..08331091381 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java index a2d197c2798..e2c5b728b9c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java index 47f49ead185..59e366cab7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java index abd2afcc0e0..43f5d23666d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn013/forceEarlyReturn013.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java index 29f1aa22df0..46dc746d16f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn014/forceEarlyReturn014.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java index c0c62c4ccc7..250707641bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn015/forceEarlyReturn015.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java index 7d4b7a6ce01..3f1539278ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java index eba60e0a064..89dbb850323 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java index 024844bb74c..f9d8dae151f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java index 52103443519..b4c0b44fc2f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java index 34e7e9d0678..fc2031b98ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java index 15e13388e64..3d1d5fae0e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java index 9fdef02fe84..d0be68a52a6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java index 8c999d08694..b4c0db1b5ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java index 20ce55e424c..19686eb8215 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java index 8e5f801a263..3fad3f5dcfc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java index 76de5d765a5..a2288ce895d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java index cb181725e64..221c7491e26 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java index 902ce1b5e84..9aad06c9132 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java index 3ab655607fd..1d41537445b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java index 3b1feadb00f..90dbb2d664f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames001/ownedMonitorsAndFrames001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java index 4a79cf2f595..9adb9f65df8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames002/ownedMonitorsAndFrames002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java index 78303a8775a..67a11931e57 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames003/ownedMonitorsAndFrames003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java index 1bc276e6b5e..a3368445021 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames004/ownedMonitorsAndFrames004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java index e9cd6c71ab0..5a25d28d253 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames005/ownedMonitorsAndFrames005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java index 1ba448d9db0..6c28b7be192 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames006/ownedMonitorsAndFrames006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java index c459f0493b6..cbd407361de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames007/ownedMonitorsAndFrames007.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java index 603eb1a8c8b..3d917b648d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java index 8e5a7522d10..80884637f10 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitorsAndFrames/ownedMonitorsAndFrames009/ownedMonitorsAndFrames009.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java index c7c1f8b788f..aeb4b65120e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java index a99e45a3d7f..c0e047b481d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java index cbfd4ef8cba..e24bf84ca50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java index f5ade83d8f6..8c03c7f5dce 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java index d5be5cbb7dd..536d4c40b7d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java index 144f94aa1c2..64aa3f696e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java index 19fda8badbb..a466daebf50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java index 898136b292b..76bf1e5c185 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java index ea33fe04dbc..e8f1e77a5f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status003/status003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java index 54e9859d012..cbe7a6040b7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status004/status004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java index 9d12873ab01..44be1e66281 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status005/status005.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java index 82ca7745a8b..da925accbb0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status006/status006.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java index f2ac5fc119c..c439e313109 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status007/status007.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java index 75b95f56979..cf59af08c2b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/status/status008/status008.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java index 1dedcae5c80..332549ac5f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java index bf67d80dfd3..6bc0ba895af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java index eeab0ee6170..4b02211d4fe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java index d442ac820cc..3034d24c5de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java index 32f20a92de8..b628c4381c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java index 0d60e8a05c9..7e9b4c4967d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java index 839cd2bd8be..2dfe912d866 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java index 8e26561a390..df1206644ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java index ba759e35b32..ba56b949b59 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java index b1d55ed64c8..49671aaa2ba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java index 70cc6164329..056d5d191e5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java index 38714ea6225..b564cc05e51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java index 40057db7ead..06ddf2d1ddb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/hashCode/hashcode001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java index 728b0d85ffa..7683d4cf65a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java index 51160163080..6bc739cfd29 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java index cb5b090de6c..6688eb7d566 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/name/name003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java index ffad95e3472..a12d3dc9d36 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java index f725f100356..4794f31a2e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java index 28cae841d03..464f71d11be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Type/signature/signature003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java index 7f6a36a6a8d..9df2cd35997 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java index c1d4669770f..d3c4dc05a3a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java index 93f2971dc63..75a204949fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java index 29163cdb0fe..f734f06d46e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java index 0f5f9ec6d9e..015516353ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java index 09371673e51..1f35325f582 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java index 241561d73c9..b3b5ea680f1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java index c59bdcc26be..9180dad98bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java index 80d6eb0ca78..30a45958c17 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/declaringType/decltype009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java index 373e8516610..0f1e15a96d8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java index ec18337a2ac..41b70982d66 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/genericSignature/genericSignature002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java index 67c36f244e1..b0229031c50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java index 6750ae16e13..a23378d8ecf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java index e0246a3d195..c1c772f5286 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java index 576ec508c4b..410a157ee5e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isFinal/isfinal004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java index 15dd7f0b990..2c7310f3e37 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java index 60ca0231cf8..bc87986a80f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPackagePrivate/ispackageprivate002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java index 5bdc294c4fa..272d4656799 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java index cb557c2a81f..edac29d5247 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPrivate/isprivate002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java index 0c81bbf267e..57e26947cb5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java index 8026d36847b..3d3b2f44067 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isProtected/isprotected002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java index 361affb44b7..78b2d9422ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java index cfd2757e83d..01baf696bb4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isPublic/ispublic002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java index 70ea0f4690b..fcfb4998622 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java index 8d70a387218..03b3c82a7e5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java index 1b8b0d2f0b5..e2d7d36b021 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java index 4ed8b4dbfe4..dc540d3df58 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isStatic/isstatic004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java index bb9f060370a..0c13b6a5c89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java index 7197f4d36a1..72e4d1f8708 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/isSynthetic/issynthetic002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java index 93a66a6b32e..900bd421308 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java index d4df30afd0b..d619ce55fda 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java index 16e0fc6d4a9..5495c9120c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/name/name003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java index 6953d523f8a..8b4ba398f8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java index adac615876c..61ec367dd0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java index d6597070440..65129b3cce0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/TypeComponent/signature/sign003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java index fe9707f432b..33ddcfe46ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMCannotBeModifiedEx/_itself_/canntbemod001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java index 6a13069a38d..5eeb7c47248 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java index d266aba037c..d79b8e49e1d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java index 452b60dbb96..28512e2d1f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java index 395fbf9ca87..00d6fe253f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java index efefc807b90..969677114ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java index dbd939a4f2a..41148401b69 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDisconnectEvent/_itself_/disconnect003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java index 92c79d79ddd..9dcb67a263c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java index a6fc6970126..ad7d9f32e94 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java index 2af62bd98db..c03e9d6e36f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java index 76b8664cf6d..e03c075a76e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java index 99f7ef894c1..53841e408b1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java index cd538cb8daa..4616a8649f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java index aadff2b96e2..fd4caedc2f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java index 99665023bc8..bd692763836 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java index 1031be53722..fd2d21fa024 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java index c4f4da0f134..4ce1ce67acd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java index b89692f06ad..a17a6c258d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java index 97623ff558c..244142249f4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetBytecodes/cangetbytecodes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java index 090660a7ebc..eea4b9f8203 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java index 303cc06af00..928edb32dc6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java index b99469c3b8b..949dea4d34c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java index 3ee7ed37ab5..205a1a6cb17 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSourceDebugExtension/cangetsde001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java index ae5fceb0c47..4d825548631 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetSyntheticAttribute/cangetattr001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java index e0f3f564230..52a35cc2da3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java index 81e725f8ad3..0c836a1f13b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java index f771278f292..b34e2fd630a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java index 7ee8030ab9d..8e932d06886 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java index df3b0800c7b..0cc705abd0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java index a08b01fda68..01687e8f91f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java index bd6dca70e6b..2ee7b53a183 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java index 287fc90f3ce..d7436685b09 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/classesByName/classesbyname001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java index 0060d38fe38..c03a2b13fb4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/description/description001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java index a7eef44220a..4f66b843c1c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java index 6c7df2657dd..7f073e5bb97 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java index 7d8d86d75f3..5a313a0531f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java index 540c5b20430..324e7bbbe0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java index d74ae97eafa..6a9675c8e27 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java index ac44865edcd..47388d31947 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventQueue/eventqueue001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java index 1d957261f6d..30cdb672334 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/eventRequestManager/eventrmanager001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java index 09b2a99420e..29f2d25faa9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java index 55b4a61264e..3ea2af900a3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java index 4d13e6bd0d3..5fc40a2fc34 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/getDefaultStratum/getdefaultstratum001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java index 90f1951d4c9..b5a5f640232 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts001/instancecounts001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java index 6e0ae427a0c..1801887663f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java index 77540cc4776..c9efd712f7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts004/instancecounts004.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java index e08e5509f38..2e4898b47cf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_bool/mirrorof_bool001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java index f2bcb7774f3..b84224624a8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_byte/mirrorof_byte001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java index a29a2b61fd1..5790f9e79c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_char/mirrorof_char001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java index a22ac4715fa..69c6a39dfe8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_double/mirrorof_double001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java index 9e71904cdc2..ad1f96d5639 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_float/mirrorof_float001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java index 7cfa1e069eb..b9467aa619e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_int/mirrorof_int001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java index 2e6208be2e2..d5c7b8881b6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_long/mirrorof_long001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java index 64e247ce8b6..bb26ed2d27f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_short/mirrorof_short001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java index f6577a766e2..fc50c81a551 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/mirrorOf_string/mirrorof_string001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java index a74c1b842b1..7db4cac9043 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/name/name001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java index c84b4a59e9f..a267c489eb8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/process/process001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java index 461d94e9897..667f33eaf0a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java index 9b7f5542a15..f87b23c7ec9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java index 26eb9dc3405..3f0390862de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java index 87cdb277590..bdc105c3af3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java index 786f068df36..8e2e509c91f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java index 2c5897c9059..f63dc50c682 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java index cffd3bde610..4e34545e2b5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java index 355b6af8f72..1c714b5a32a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java index 5c6d58da981..97d4c505ea4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java index 7fd497ccdad..8f402f8f97e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java index 6b3b59a100d..226d89ddedf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java index 75afa8e590b..3c834ad75f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java index 11942c5a904..8b23543af3d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java index c8ad602c0e7..fdbc5fcd57c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java index d12f64dd57d..7b0ef5f9a8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java index b813f3e21b4..ccf6c498f04 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java index 9332841cab8..8d9b5d03b09 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java index e59181cf4f5..47860e7be2b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java index ac2a8c78efe..b5358f88f60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java index e8004129fcf..a2d96f02d97 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java index 10c4cb8f07a..150aa0b3c60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java index 1c4bf610c53..52cc6e1e987 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java index ea96f686871..3b508ea3e47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java index 80ac46ed320..7fe38267ff5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java index c968529fd2e..3ac6d6b6224 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java index f53d1dab9fd..f32501b56d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses029/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java index 73ddeed3df8..a35b521b3d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java index 9198e3f9d63..d98a1d7800d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java index ad3c3f6c852..0d74ec034c4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java index 1d6b9e676e6..828130ab963 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses034/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java index 14bca5fb586..8faea360264 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses035/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java index 2cab730199c..e56c922ee72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/resume/resume001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java index c20b5e1e066..c910da799d9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum002/setDefaultStratum002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java index 04d7bac77b6..d2effea1e69 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java index c10d7c00b7c..5fd7fc9a862 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setdefaultstratum001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java index 4372c40d3fd..cd96d48fb11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java index 50e09d73ace..9d1157a38f1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/topLevelThreadGroups/toplevelgroups001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java index 722fca97f4a..304d7acc015 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/version/version001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java index ea3a4bb18b8..8cdc9b5c06a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java index 212b176a9f3..f53bb42277a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java index 6d71b262a3a..f1a62c90115 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java index 1e3c70afcf9..7955186a68c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java index 3be6571eb1f..6f70755bcb8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java index b3e35b07e57..28cdcff2358 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java index 1dee5891de4..aabe9ce0ecb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java index 2faac1d44b3..1d136869f98 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java index 54ea54f31ba..74ce4c3dcfd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java index cb4dcbe3444..c9441bb5f69 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java index 77f164ba728..a4ea7c1fe64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java index 961c4374fad..0ac859c63c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java index 58d370d8f09..ca8dd296aec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java index 4bd3b20c26d..e0a55fc72f0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/majorInterfaceVersion/major001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java index b90f440e468..c5068027344 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/minorInterfaceVersion/minor001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java index c2ba694bb84..9309fc0851f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java index 2fd89cbac93..575b78fa710 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java index a57963ef78c..d67a9e911c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java index 71c0667b5f8..67b0f8a6797 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java index e80d5525591..87ab1fffe64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java index 58c02e4f5aa..3c9bd831b42 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java index 888aa893424..fa457b4b44f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/_itself_/wevent001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java index 177ff5ad508..408379d6587 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/field/field001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java index 61dafb3c8ff..ad22f8879e4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java index d1bad2770d8..90b169861e8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/valueCurrent/valuecur001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java index 5e85367300f..ec6da43cc21 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/_bounds_/filters001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java index f13f2f083ff..9eb38beef8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java index 2eccc8e0d7e..1ca8723b9e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java index 79f2c138213..c4bba18abc1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java index 8be5b7ecf03..74188f8f91f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java index 043e7bb330e..9e2bd4d889c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java index a9049f66788..9a93d5f25cf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java index 5d051e8c5d9..3974432486a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java index 71a6f58a762..86133adf314 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java index 44ba2502340..ff6f47b891f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java index 959d8051de6..2a75b2acaa1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java index b556a0be504..538b0fcb0dc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java index 5ad005626c4..d34c91dc53d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java index 8e13182f233..f506c14e3eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java index 9f49e1b5cc3..df78f5cab53 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java index d79e4ca54e4..ea117497712 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java index 0dbf8f0aa82..5c939c2ef1a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java index 34795d4cbb1..58feafe4748 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java index 76257d26434..9c6e127b3a5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java index 7451ea50061..789402da0e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java index 9682b3dbc23..d926b717f6b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java index 72accc01f07..f871555a1ab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java index d5736d82ee7..1292a3f16d4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java index 70972b75335..d0231859858 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java index 86bf9e889d1..34f1e903215 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java index ff7d6043f30..69a6adb9120 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java index 96327a25e17..6aed1d3cf7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java index 59fff44d750..7ebc85a261d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java index 4f7a4122077..2646e444f49 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java index 40416c22480..ea6b3ee9b02 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter007/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java index bd836d28d0c..d33d3c36e3f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter008/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java index 6402a599dfe..b564ec66b11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java index e5c8613c8af..5302d832baa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java index 77f9ae6e973..b88bf17ab3a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java index ac0f05478ec..0961b1ac9ca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents001/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java index 5f95c050034..f482dc42d21 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/MonitorEvents/MonitorEvents002/TestDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, 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 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java index d113f62376b..d8847783a41 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java @@ -71,6 +71,6 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./forceEarlyReturn001.tests + * -configFile ${test.src}/forceEarlyReturn001.tests */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java index f12844f931e..2a85e41e993 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java @@ -73,7 +73,7 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./forceEarlyReturn002.tests + * -configFile ${test.src}/forceEarlyReturn002.tests * -testWorkDir . */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java index cf10ad7282b..4bc5e8c3fbe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java @@ -65,6 +65,6 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./heapwalking001.tests + * -configFile ${test.src}/heapwalking001.tests */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java index 984cb2b8742..b5056d690f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java @@ -67,7 +67,7 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./heapwalking002.tests + * -configFile ${test.src}/heapwalking002.tests * -testWorkDir . */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java index 39772d8ffb3..b31d05ad20d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed001/TestDescription.java @@ -75,6 +75,6 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./mixed001.tests + * -configFile ${test.src}/mixed001.tests */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java index 9e09b35821f..b27829f5782 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java @@ -73,7 +73,7 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xmx256M ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./mixed002.tests + * -configFile ${test.src}/mixed002.tests * -testWorkDir . */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java index 2cbfcd89fd0..a98c0fd7f7a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents001/TestDescription.java @@ -60,6 +60,6 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./monitorEvents001.tests + * -configFile ${test.src}/monitorEvents001.tests */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java index f050185de3d..683650789ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java @@ -62,7 +62,7 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./monitorEvents002.tests + * -configFile ${test.src}/monitorEvents002.tests * -testWorkDir . */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java index 49750461b4e..d56947d2ac5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames001/TestDescription.java @@ -64,6 +64,6 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./ownedMonitorsAndFrames001.tests + * -configFile ${test.src}/ownedMonitorsAndFrames001.tests */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java index 7cc55f30483..34c34d6d81b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java @@ -68,7 +68,7 @@ * "-debugee.vmkeys=-Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI ${test.vm.opts} ${test.java.opts}" * -testClassPath ${test.class.path} - * -configFile ./ownedMonitorsAndFrames002.tests + * -configFile ${test.src}/ownedMonitorsAndFrames002.tests * -testWorkDir . */ From 13946835b5cc5e3888d20e311aaf6f13fd7b521d Mon Sep 17 00:00:00 2001 From: Leonid Mesnik Date: Wed, 5 Aug 2020 10:48:55 -0700 Subject: [PATCH 086/100] 8244537: JDI tests fail due to "ERROR: Exception : nsk.share.jdi.JDITestRuntimeException: JDITestRuntimeException : ** event IS NOT a breakpoint **" Reviewed-by: sspitsyn, amenkov --- .../jdi/EventRequest/addCountFilter/addcountfilter001.java | 2 ++ .../vmTestbase/nsk/jdi/EventRequest/disable/disable001.java | 2 ++ .../vmTestbase/nsk/jdi/EventRequest/enable/enable001.java | 2 ++ .../nsk/jdi/EventRequest/isEnabled/isenabled001.java | 3 ++- .../nsk/jdi/EventRequest/setEnabled/setenabled001.java | 3 ++- .../nsk/jdi/EventRequest/setEnabled/setenabled002.java | 2 ++ .../nsk/jdi/EventRequest/setEnabled/setenabled003.java | 4 ++-- .../EventRequest/setSuspendPolicy/setsuspendpolicy001.java | 2 ++ test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java | 2 +- 9 files changed, 17 insertions(+), 5 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java index b7ca96dcaa9..1eeae0e3456 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java @@ -398,6 +398,7 @@ public class addcountfilter001 extends JDIBase { log3("ERROR: IllegalArgumentException"); } + vm.suspend(); try { log2("......eventRequest1.enable();"); eventRequest1.enable(); @@ -419,6 +420,7 @@ public class addcountfilter001 extends JDIBase { } catch ( InvalidRequestStateException e ) { log2(" InvalidRequestStateException"); } + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java index 6b1a8b1e3a1..566f634cf9d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java @@ -411,6 +411,7 @@ public class disable001 { throw new JDITestRuntimeException("** default case 2 **"); } + vm.suspend(); log2("......eventRequest1.setEnabled(true);"); eventRequest1.setEnabled(true); @@ -423,6 +424,7 @@ public class disable001 { log3("ERROR: EventRequest is still enabled"); } eventRequest1.setEnabled(false); + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java index c374cfd31dd..c93d79344fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java @@ -363,6 +363,7 @@ public class enable001 extends JDIBase { throw new JDITestRuntimeException("** default case 2 **"); } + vm.suspend(); log2("......eventRequest1.enable();"); eventRequest1.enable(); log2(" checking up on eventRequest1"); @@ -371,6 +372,7 @@ public class enable001 extends JDIBase { log3("ERROR: EventRequest is not enabled"); } eventRequest1.disable(); + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java index 17283512c9a..e0ba70c9bb6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java @@ -364,6 +364,7 @@ public class isenabled001 extends JDIBase { throw new JDITestRuntimeException("** default case 2 **"); } + vm.suspend(); log2("......eventRequest1.setEnabled(true);"); eventRequest1.setEnabled(true); log2(" checking up on eventRequest1"); @@ -379,7 +380,7 @@ public class isenabled001 extends JDIBase { testExitCode = FAILED; log3("ERROR: EventRequest is enabled"); } - + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java index ac1c2fc133b..e0cb8ca82b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java @@ -362,6 +362,7 @@ public class setenabled001 extends JDIBase { throw new JDITestRuntimeException("** default case 2 **"); } + vm.suspend(); log2("......eventRequest1.setEnable(true);"); eventRequest1.setEnabled(true); log2(" checking up on eventRequest1"); @@ -377,7 +378,7 @@ public class setenabled001 extends JDIBase { testExitCode = FAILED; log3("ERROR: EventRequest is enabled"); } - + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java index b598b0d23c6..7974b007666 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java @@ -368,6 +368,7 @@ public class setenabled002 extends JDIBase { throw new JDITestRuntimeException("** default case 2 **"); } + vm.suspend(); if (eventRequest1 instanceof StepRequest) { try { log2("......eventRequest1.setEnabled(true); IllegalThreadStateException is expected"); @@ -405,6 +406,7 @@ public class setenabled002 extends JDIBase { } catch ( InvalidRequestStateException e ) { log2(" InvalidRequestStateException"); } + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java index 6817dad7ff4..799c253cc86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java @@ -282,7 +282,7 @@ public class setenabled003 extends JDIBase { //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part - + vm.suspend(); switch (i) { case 0: @@ -292,7 +292,6 @@ public class setenabled003 extends JDIBase { log2("......setting up StepRequest"); eventRequest1 = eventRManager.createStepRequest (thread1, StepRequest.STEP_MIN, StepRequest.STEP_INTO); - try { log2("......eventRequest1.setEnabled(true); IllegalThreadStateException is expected"); eventRequest1.setEnabled(true); @@ -359,6 +358,7 @@ public class setenabled003 extends JDIBase { default: throw new JDITestRuntimeException("** default case 2 **"); } + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java index 5da99f0ddcb..90ad166b9df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java @@ -401,6 +401,7 @@ public class setsuspendpolicy001 extends JDIBase { log3("ERROR: suspendPolicy() != EventRequest.SUSPEND_NONE"); } + vm.suspend(); log2("......eventRequest1.setEnabled(true);"); eventRequest1.setEnabled(true); try { @@ -421,6 +422,7 @@ public class setsuspendpolicy001 extends JDIBase { } catch ( InvalidRequestStateException e ) { log2(" InvalidRequestStateException"); } + vm.resume(); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java index 9d0950e260c..a4164271d46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java @@ -161,7 +161,7 @@ public class JDIBase { return; } - throw new JDITestRuntimeException("** event IS NOT a breakpoint **"); + throw new JDITestRuntimeException("** event '" + event + "' IS NOT a breakpoint **"); } } From 18d5626e250b6086035acc68ece3190d7493bb30 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Wed, 5 Aug 2020 13:24:53 -0700 Subject: [PATCH 087/100] 8250929: Missing "classpath exception" in LambdaProxyClassArchive.java Reviewed-by: sundar --- .../classes/java/lang/invoke/LambdaProxyClassArchive.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java b/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java index dac54acd80e..bad015a5624 100644 --- a/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java +++ b/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java @@ -4,7 +4,9 @@ * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or From 44c6537b57ac6de8a842ce1a76e334e85545438f Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Wed, 5 Aug 2020 18:59:04 -0700 Subject: [PATCH 088/100] Added tag jdk-15+35 for changeset fd60c3146a02 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 312324e8778..f914358da11 100644 --- a/.hgtags +++ b/.hgtags @@ -649,3 +649,4 @@ a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31 2dad000726b8d5db9f3df647fb4949d88f269dd4 jdk-15+32 6b65f4e7a975628df51ef755b02642075390041d jdk-15+33 b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34 +fd60c3146a024037cdd9be34c645bb793995a7cc jdk-15+35 From 764b50a7e3726f00d05c54560770cbab0e2236f3 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Fri, 7 Aug 2020 07:03:12 +0530 Subject: [PATCH 089/100] 8248299: two jdeps files miss copyright header Reviewed-by: mchung --- .../tools/jdeps/resources/jdk8_internals.txt | 26 +++++++++++++++++++ .../jdeps/resources/jdkinternals.properties | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt index 1f2b073eb8c..f421e26723f 100644 --- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt +++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt @@ -1,3 +1,29 @@ +########################################################################### +# +# Copyright (c) 2016, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# +########################################################################### # This file is auto-generated by ListJDKInternals tool on 2016-07-12T16:13:20.303865 apple.applescript apple.laf diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties index 4eb67eaa029..b833eb702c1 100644 --- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties +++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties @@ -1,3 +1,29 @@ +########################################################################### +# +# Copyright (c) 2014, 2016, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# +########################################################################### # No translation needed com.sun.crypto.provider.SunJCE=Use java.security.Security.getProvider(provider-name) @since 1.3 com.sun.org.apache.xml.internal.security=Use java.xml.crypto @since 1.6 From f70fc149b5512ab0d660dd2832b6ee1c744765ad Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Sat, 8 Aug 2020 12:22:05 +0530 Subject: [PATCH 090/100] 8251276: JDK-8248299 breaks JDK 15 validate-headers build Reviewed-by: mchung, iris, vtewari --- .../classes/com/sun/tools/jdeps/resources/jdk8_internals.txt | 2 +- .../com/sun/tools/jdeps/resources/jdkinternals.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt index f421e26723f..b60a88c825a 100644 --- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt +++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt @@ -11,7 +11,7 @@ # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # version 2 for more details (a copy is included in the LICENSE file that # accompanied this code). # diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties index b833eb702c1..cf38447ceee 100644 --- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties +++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties @@ -11,7 +11,7 @@ # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # version 2 for more details (a copy is included in the LICENSE file that # accompanied this code). # From 5e9702d390536a00ccbb7c2b34be8fb9d8911b4a Mon Sep 17 00:00:00 2001 From: Vladimir Kempik Date: Mon, 10 Aug 2020 22:42:09 +0300 Subject: [PATCH 091/100] 8250876: Fix issues with cross-compile on macos Reviewed-by: erikj, ihse --- make/autoconf/flags.m4 | 10 ++++++---- make/autoconf/toolchain.m4 | 9 +++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4 index a7f959ff9ef..0301e64dc17 100644 --- a/make/autoconf/flags.m4 +++ b/make/autoconf/flags.m4 @@ -218,10 +218,12 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS], # We also need -iframework/System/Library/Frameworks $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks" $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks" - # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework - # set this here so it doesn't have to be peppered throughout the forest - $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" - $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" + if test -d "[$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" ; then + # These always need to be set on macOS 10.X, or we can't find the frameworks embedded in JavaVM.framework + # set this here so it doesn't have to be peppered throughout the forest + $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" + $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks" + fi fi AC_SUBST($1SYSROOT_CFLAGS) diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 index 0f1b8eb868e..25b89ecce36 100644 --- a/make/autoconf/toolchain.m4 +++ b/make/autoconf/toolchain.m4 @@ -902,9 +902,14 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS], # FIXME: we should list the discovered compilers as an exclude pattern! # If we do that, we can do this detection before POST_DETECTION, and still # find the build compilers in the tools dir, if needed. - UTIL_REQUIRE_PROGS(BUILD_CC, [cl cc gcc]) + if test "x$OPENJDK_BUILD_OS" = xmacosx; then + UTIL_REQUIRE_PROGS(BUILD_CC, [clang cl cc gcc]) + UTIL_REQUIRE_PROGS(BUILD_CXX, [clang++ cl CC g++]) + else + UTIL_REQUIRE_PROGS(BUILD_CC, [cl cc gcc]) + UTIL_REQUIRE_PROGS(BUILD_CXX, [cl CC g++]) + fi UTIL_FIXUP_EXECUTABLE(BUILD_CC) - UTIL_REQUIRE_PROGS(BUILD_CXX, [cl CC g++]) UTIL_FIXUP_EXECUTABLE(BUILD_CXX) UTIL_PATH_PROGS(BUILD_NM, nm gcc-nm) UTIL_FIXUP_EXECUTABLE(BUILD_NM) From e64a25b256e9b46ff4531114f9642b63af6d9362 Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Mon, 10 Aug 2020 21:52:02 +0200 Subject: [PATCH 092/100] 8246347: [JVMCI] Set is_method_handle_invoke flag accordingly when describing scope in jvmciCodeInstaller Reviewed-by: kvn, dlong --- src/hotspot/share/code/compiledMethod.hpp | 4 +-- .../share/code/compiledMethod.inline.hpp | 10 ++++++- .../share/jvmci/jvmciCodeInstaller.cpp | 29 ++++++++++++++----- .../share/jvmci/jvmciCodeInstaller.hpp | 9 +++--- src/hotspot/share/jvmci/jvmciJavaClasses.hpp | 3 +- src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 7 ++++- 6 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/hotspot/share/code/compiledMethod.hpp b/src/hotspot/share/code/compiledMethod.hpp index f43e7ee038e..02cbd4c9a61 100644 --- a/src/hotspot/share/code/compiledMethod.hpp +++ b/src/hotspot/share/code/compiledMethod.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, 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 @@ -330,7 +330,7 @@ public: // Deopt // Return true is the PC is one would expect if the frame is being deopted. inline bool is_deopt_pc(address pc); - bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); } + inline bool is_deopt_mh_entry(address pc); inline bool is_deopt_entry(address pc); virtual bool can_convert_to_zombie() = 0; diff --git a/src/hotspot/share/code/compiledMethod.inline.hpp b/src/hotspot/share/code/compiledMethod.inline.hpp index 99c120ab443..670a2ae2a65 100644 --- a/src/hotspot/share/code/compiledMethod.inline.hpp +++ b/src/hotspot/share/code/compiledMethod.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, 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 @@ -41,6 +41,14 @@ inline bool CompiledMethod::is_deopt_entry(address pc) { ; } +inline bool CompiledMethod::is_deopt_mh_entry(address pc) { + return pc == deopt_mh_handler_begin() +#if INCLUDE_JVMCI + || (is_compiled_by_jvmci() && pc == (deopt_mh_handler_begin() + NativeCall::instruction_size)) +#endif + ; +} + // ----------------------------------------------------------------------------- // CompiledMethod::get_deopt_original_pc // diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp index f44a5b8cd55..4f6ad79d558 100644 --- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp +++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp @@ -1043,7 +1043,7 @@ GrowableArray* CodeInstaller::record_virtual_objects(JVMCIObject de return objects; } -void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool return_oop, JVMCI_TRAPS) { +void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS) { JVMCIObject position = jvmci_env()->get_DebugInfo_bytecodePosition(debug_info); if (position.is_null()) { // Stubs do not record scope info, just oop maps @@ -1056,7 +1056,7 @@ void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMo } else { objectMapping = NULL; } - record_scope(pc_offset, position, scope_mode, objectMapping, return_oop, JVMCI_CHECK); + record_scope(pc_offset, position, scope_mode, objectMapping, is_mh_invoke, return_oop, JVMCI_CHECK); } int CodeInstaller::map_jvmci_bci(int bci) { @@ -1079,7 +1079,7 @@ int CodeInstaller::map_jvmci_bci(int bci) { return bci; } -void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool return_oop, JVMCI_TRAPS) { +void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS) { JVMCIObject frame; if (scope_mode == CodeInstaller::FullFrame) { if (!jvmci_env()->isa_BytecodeFrame(position)) { @@ -1089,7 +1089,7 @@ void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode } JVMCIObject caller_frame = jvmci_env()->get_BytecodePosition_caller(position); if (caller_frame.is_non_null()) { - record_scope(pc_offset, caller_frame, scope_mode, objects, return_oop, JVMCI_CHECK); + record_scope(pc_offset, caller_frame, scope_mode, objects, is_mh_invoke, return_oop, JVMCI_CHECK); } JVMCIObject hotspot_method = jvmci_env()->get_BytecodePosition_method(position); @@ -1181,7 +1181,7 @@ void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode throw_exception = jvmci_env()->get_BytecodeFrame_rethrowException(frame) == JNI_TRUE; } - _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, return_oop, + _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, is_mh_invoke, return_oop, locals_token, expressions_token, monitors_token); } @@ -1236,9 +1236,19 @@ void CodeInstaller::site_Call(CodeBuffer& buffer, jint pc_offset, JVMCIObject si OopMap *map = create_oop_map(debug_info, JVMCI_CHECK); _debug_recorder->add_safepoint(next_pc_offset, map); - bool return_oop = hotspot_method.is_non_null() && jvmci_env()->asMethod(hotspot_method)->is_returning_oop(); - - record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, return_oop, JVMCI_CHECK); + if (hotspot_method.is_non_null()) { + Method *method = jvmci_env()->asMethod(hotspot_method); + vmIntrinsics::ID iid = method->intrinsic_id(); + bool is_mh_invoke = false; + if (jvmci_env()->get_site_Call_direct(site)) { + is_mh_invoke = !method->is_static() && (iid == vmIntrinsics::_compiledLambdaForm || + (MethodHandles::is_signature_polymorphic(iid) && MethodHandles::is_signature_polymorphic_intrinsic(iid))); + } + bool return_oop = method->is_returning_oop(); + record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, is_mh_invoke, return_oop, JVMCI_CHECK); + } else { + record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, JVMCI_CHECK); + } } if (foreign_call.is_non_null()) { @@ -1347,6 +1357,9 @@ void CodeInstaller::site_Mark(CodeBuffer& buffer, jint pc_offset, JVMCIObject si case DEOPT_HANDLER_ENTRY: _offsets.set_value(CodeOffsets::Deopt, pc_offset); break; + case DEOPT_MH_HANDLER_ENTRY: + _offsets.set_value(CodeOffsets::DeoptMH, pc_offset); + break; case FRAME_COMPLETE: _offsets.set_value(CodeOffsets::Frame_Complete, pc_offset); break; diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp index 45f9232b3d1..0bbaf3f3e66 100644 --- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp +++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -159,6 +159,7 @@ private: CRC_TABLE_ADDRESS, LOG_OF_HEAP_REGION_GRAIN_BYTES, INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED, + DEOPT_MH_HANDLER_ENTRY, INVOKE_INVALID = -1 }; @@ -297,11 +298,11 @@ protected: int map_jvmci_bci(int bci); - void record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool return_oop, JVMCI_TRAPS); + void record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS); void record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, JVMCI_TRAPS) { - record_scope(pc_offset, debug_info, scope_mode, false /* return_oop */, JVMCIENV); + record_scope(pc_offset, debug_info, scope_mode, false /* is_mh_invoke */, false /* return_oop */, JVMCIENV); } - void record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool return_oop, JVMCI_TRAPS); + void record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS); void record_object_value(ObjectValue* sv, JVMCIObject value, GrowableArray* objects, JVMCI_TRAPS); GrowableArray* record_virtual_objects(JVMCIObject debug_info, JVMCI_TRAPS); diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp index fae548065a5..91c9302729a 100644 --- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp +++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -175,6 +175,7 @@ end_class \ start_class(site_Call, jdk_vm_ci_code_site_Call) \ object_field(site_Call, target, "Ljdk/vm/ci/meta/InvokeTarget;") \ + boolean_field(site_Call, direct) \ end_class \ start_class(site_DataPatch, jdk_vm_ci_code_site_DataPatch) \ object_field(site_DataPatch, reference, "Ljdk/vm/ci/code/site/Reference;") \ diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp index f6aec1f3f1e..e12eca30ff9 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -471,8 +471,14 @@ declare_constant(CodeInstaller::CRC_TABLE_ADDRESS) \ declare_constant(CodeInstaller::LOG_OF_HEAP_REGION_GRAIN_BYTES) \ declare_constant(CodeInstaller::INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED) \ + declare_constant(CodeInstaller::DEOPT_MH_HANDLER_ENTRY) \ declare_constant(CodeInstaller::INVOKE_INVALID) \ \ + declare_constant(vmIntrinsics::FIRST_MH_SIG_POLY) \ + declare_constant(vmIntrinsics::LAST_MH_SIG_POLY) \ + declare_constant(vmIntrinsics::_invokeGeneric) \ + declare_constant(vmIntrinsics::_compiledLambdaForm) \ + \ declare_constant(CollectedHeap::Serial) \ declare_constant(CollectedHeap::Parallel) \ declare_constant(CollectedHeap::G1) \ @@ -966,4 +972,3 @@ void jvmci_vmStructs_init() { JVMCIVMStructs::init(); } #endif // ASSERT - From 092389e3c91822b1e3f56f203cb7b90e84673f8e Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Mon, 10 Aug 2020 15:31:01 -0700 Subject: [PATCH 093/100] 8249749: modify a primitive array through a stream and a for cycle causes jre crash Check align_to_ref for NULL early and bailout SuperWord optimization. Reviewed-by: vlivanov, thartmann --- src/hotspot/share/opto/superword.cpp | 33 ++-- .../vectorization/TestComplexAddrExpr.java | 169 ++++++++++++++++++ 2 files changed, 191 insertions(+), 11 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestComplexAddrExpr.java diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index 4a708488c42..e7829d0d89b 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -499,6 +499,10 @@ void SuperWord::SLP_extract() { find_adjacent_refs(); + if (align_to_ref() == NULL) { + return; // Did not find memory reference to align vectors + } + extend_packlist(); if (_do_vector_loop) { @@ -575,6 +579,9 @@ void SuperWord::find_adjacent_refs() { } } } + if (TraceSuperWord) { + tty->print_cr("\nfind_adjacent_refs found %d memops", memops.size()); + } Node_List align_to_refs; int max_idx; @@ -3229,15 +3236,15 @@ void SuperWord::compute_vector_element_type() { //------------------------------memory_alignment--------------------------- // Alignment within a vector memory reference int SuperWord::memory_alignment(MemNode* s, int iv_adjust) { - #ifndef PRODUCT - if(TraceSuperWord && Verbose) { - tty->print("SuperWord::memory_alignment within a vector memory reference for %d: ", s->_idx); s->dump(); - } - #endif +#ifndef PRODUCT + if ((TraceSuperWord && Verbose) || is_trace_alignment()) { + tty->print("SuperWord::memory_alignment within a vector memory reference for %d: ", s->_idx); s->dump(); + } +#endif NOT_PRODUCT(SWPointer::Tracer::Depth ddd(0);) SWPointer p(s, this, NULL, false); if (!p.valid()) { - NOT_PRODUCT(if(is_trace_alignment()) tty->print("SWPointer::memory_alignment: SWPointer p invalid, return bottom_align");) + NOT_PRODUCT(if(is_trace_alignment()) tty->print_cr("SWPointer::memory_alignment: SWPointer p invalid, return bottom_align");) return bottom_align; } int vw = get_vw_bytes_special(s); @@ -3249,9 +3256,11 @@ int SuperWord::memory_alignment(MemNode* s, int iv_adjust) { offset += iv_adjust*p.memory_size(); int off_rem = offset % vw; int off_mod = off_rem >= 0 ? off_rem : off_rem + vw; - if (TraceSuperWord && Verbose) { +#ifndef PRODUCT + if ((TraceSuperWord && Verbose) || is_trace_alignment()) { tty->print_cr("SWPointer::memory_alignment: off_rem = %d, off_mod = %d", off_rem, off_mod); } +#endif return off_mod; } @@ -3766,6 +3775,7 @@ bool SWPointer::invariant(Node* n) { NOT_PRODUCT(_tracer.invariant_1(n, n_c);) return !lpt()->is_member(phase()->get_loop(n_c)); } + //------------------------scaled_iv_plus_offset-------------------- // Match: k*iv + offset // where: k is a constant that maybe zero, and @@ -3786,20 +3796,20 @@ bool SWPointer::scaled_iv_plus_offset(Node* n) { int opc = n->Opcode(); if (opc == Op_AddI) { - if (scaled_iv(n->in(1)) && offset_plus_k(n->in(2))) { + if (offset_plus_k(n->in(2)) && scaled_iv_plus_offset(n->in(1))) { NOT_PRODUCT(_tracer.scaled_iv_plus_offset_4(n);) return true; } - if (scaled_iv(n->in(2)) && offset_plus_k(n->in(1))) { + if (offset_plus_k(n->in(1)) && scaled_iv_plus_offset(n->in(2))) { NOT_PRODUCT(_tracer.scaled_iv_plus_offset_5(n);) return true; } } else if (opc == Op_SubI) { - if (scaled_iv(n->in(1)) && offset_plus_k(n->in(2), true)) { + if (offset_plus_k(n->in(2), true) && scaled_iv_plus_offset(n->in(1))) { NOT_PRODUCT(_tracer.scaled_iv_plus_offset_6(n);) return true; } - if (scaled_iv(n->in(2)) && offset_plus_k(n->in(1))) { + if (offset_plus_k(n->in(1)) && scaled_iv_plus_offset(n->in(2))) { _scale *= -1; NOT_PRODUCT(_tracer.scaled_iv_plus_offset_7(n);) return true; @@ -3871,6 +3881,7 @@ bool SWPointer::scaled_iv(Node* n) { int mult = 1 << n->in(2)->get_int(); _scale = tmp._scale * mult; _offset += tmp._offset * mult; + _invar = tmp._invar; NOT_PRODUCT(_tracer.scaled_iv_9(n, _scale, _offset, mult);) return true; } diff --git a/test/hotspot/jtreg/compiler/vectorization/TestComplexAddrExpr.java b/test/hotspot/jtreg/compiler/vectorization/TestComplexAddrExpr.java new file mode 100644 index 00000000000..f1560428d22 --- /dev/null +++ b/test/hotspot/jtreg/compiler/vectorization/TestComplexAddrExpr.java @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2020, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8249749 + * @summary Test vectorization for complex address expressions + * @requires vm.compMode != "Xint" + * @run main compiler.vectorization.TestComplexAddrExpr test1 + * @run main compiler.vectorization.TestComplexAddrExpr test2 + * @run main compiler.vectorization.TestComplexAddrExpr test3 + * @run main compiler.vectorization.TestComplexAddrExpr test4 + * @run main compiler.vectorization.TestComplexAddrExpr test5 + * @run main compiler.vectorization.TestComplexAddrExpr test6 + */ + +package compiler.vectorization; + +import java.util.stream.IntStream; + +public class TestComplexAddrExpr { + + static final int n = 1024; + + static void test1(int[] data) { + IntStream.range(0, n).forEach(j -> { + for (int i = 0; i < n; i++) { + data[j * n + i]++; + } + }); + } + + static void test2(int[] data) { + IntStream.range(0, n).forEach(j -> { + for (int i = n - 1; i >= 0; i--) { + data[j * n + i]--; + } + }); + } + + static void test3(int[] data) { + IntStream.range(0, n).forEach(j -> { + for (int i = 1 - n; i < 1; i++) { + data[j * n - i]++; + } + }); + } + + static void test4(int[] data) { + IntStream.range(0, n).forEach(j -> { + for (int i = 0; i >= 1 - n; i--) { + data[j * n - i]--; + } + }); + } + + static void test5(int[] data) { + IntStream.range(0, n).forEach(j -> { + for (int i = 0; i < n/2; i++) { + data[j * n + (i << 1)]++; + } + for (int i = 0; i < n/2; i++) { + data[j * n + i * 2 + 1]++; + } + }); + } + + static void test6(int[] data) { + IntStream.range(0, n).forEach(j -> { + for (int i = (n - 1)/2; i >= 0; i--) { + data[j * n + (i << 1)]--; + } + for (int i = (n - 1)/2; i >= 0; i--) { + data[j * n + i * 2 + 1]--; + } + }); + } + + static void verify(int[] data, int k) { + for (int i = 0; i < n * n; i++) { + if (data[i] != k) { + throw new RuntimeException(" Invalid result: data[" + i + "]: " + data[i] + " != " + k); + } + } + } + + public static void main(String[] args) { + // int n = 1024; + int[] data = new int[n * n]; + + if (args.length == 0) { + throw new RuntimeException(" Missing test name: test1, test2, test3, test4, test5, test6"); + } + + if (args[0].equals("test1")) { + System.out.println(" Run test1 ..."); + for (int k = 0; k < n; k++) { + test1(data); + } + verify(data, n); + System.out.println(" Finished test1."); + } + + if (args[0].equals("test2")) { + System.out.println(" Run test2 ..."); + for (int k = 0; k < n; k++) { + test2(data); + } + verify(data, -n); + System.out.println(" Finished test2."); + } + + if (args[0].equals("test3")) { + System.out.println(" Run test3 ..."); + for (int k = 0; k < n; k++) { + test3(data); + } + verify(data, n); + System.out.println(" Finished test3."); + } + + if (args[0].equals("test4")) { + System.out.println(" Run test4 ..."); + for (int k = 0; k < n; k++) { + test4(data); + } + verify(data, -n); + System.out.println(" Finished test4."); + } + + if (args[0].equals("test5")) { + System.out.println(" Run test5 ..."); + for (int k = 0; k < n; k++) { + test5(data); + } + verify(data, n); + System.out.println(" Finished test5."); + } + + if (args[0].equals("test6")) { + System.out.println(" Run test6 ..."); + for (int k = 0; k < n; k++) { + test6(data); + } + verify(data, -n); + System.out.println(" Finished test6."); + } + } +} From b83ea8b3919708bd9d0566e50413177a6ad34964 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Mon, 10 Aug 2020 16:26:08 -0700 Subject: [PATCH 094/100] 8251369: [JVMCI] Backout 8246347 changes Reviewed-by: dholmes --- src/hotspot/share/code/compiledMethod.hpp | 4 +-- .../share/code/compiledMethod.inline.hpp | 10 +------ .../share/jvmci/jvmciCodeInstaller.cpp | 29 +++++-------------- .../share/jvmci/jvmciCodeInstaller.hpp | 9 +++--- src/hotspot/share/jvmci/jvmciJavaClasses.hpp | 3 +- src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 7 +---- 6 files changed, 17 insertions(+), 45 deletions(-) diff --git a/src/hotspot/share/code/compiledMethod.hpp b/src/hotspot/share/code/compiledMethod.hpp index 02cbd4c9a61..f43e7ee038e 100644 --- a/src/hotspot/share/code/compiledMethod.hpp +++ b/src/hotspot/share/code/compiledMethod.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -330,7 +330,7 @@ public: // Deopt // Return true is the PC is one would expect if the frame is being deopted. inline bool is_deopt_pc(address pc); - inline bool is_deopt_mh_entry(address pc); + bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); } inline bool is_deopt_entry(address pc); virtual bool can_convert_to_zombie() = 0; diff --git a/src/hotspot/share/code/compiledMethod.inline.hpp b/src/hotspot/share/code/compiledMethod.inline.hpp index 670a2ae2a65..99c120ab443 100644 --- a/src/hotspot/share/code/compiledMethod.inline.hpp +++ b/src/hotspot/share/code/compiledMethod.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, 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 @@ -41,14 +41,6 @@ inline bool CompiledMethod::is_deopt_entry(address pc) { ; } -inline bool CompiledMethod::is_deopt_mh_entry(address pc) { - return pc == deopt_mh_handler_begin() -#if INCLUDE_JVMCI - || (is_compiled_by_jvmci() && pc == (deopt_mh_handler_begin() + NativeCall::instruction_size)) -#endif - ; -} - // ----------------------------------------------------------------------------- // CompiledMethod::get_deopt_original_pc // diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp index 4f6ad79d558..f44a5b8cd55 100644 --- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp +++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp @@ -1043,7 +1043,7 @@ GrowableArray* CodeInstaller::record_virtual_objects(JVMCIObject de return objects; } -void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS) { +void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool return_oop, JVMCI_TRAPS) { JVMCIObject position = jvmci_env()->get_DebugInfo_bytecodePosition(debug_info); if (position.is_null()) { // Stubs do not record scope info, just oop maps @@ -1056,7 +1056,7 @@ void CodeInstaller::record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMo } else { objectMapping = NULL; } - record_scope(pc_offset, position, scope_mode, objectMapping, is_mh_invoke, return_oop, JVMCI_CHECK); + record_scope(pc_offset, position, scope_mode, objectMapping, return_oop, JVMCI_CHECK); } int CodeInstaller::map_jvmci_bci(int bci) { @@ -1079,7 +1079,7 @@ int CodeInstaller::map_jvmci_bci(int bci) { return bci; } -void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS) { +void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool return_oop, JVMCI_TRAPS) { JVMCIObject frame; if (scope_mode == CodeInstaller::FullFrame) { if (!jvmci_env()->isa_BytecodeFrame(position)) { @@ -1089,7 +1089,7 @@ void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode } JVMCIObject caller_frame = jvmci_env()->get_BytecodePosition_caller(position); if (caller_frame.is_non_null()) { - record_scope(pc_offset, caller_frame, scope_mode, objects, is_mh_invoke, return_oop, JVMCI_CHECK); + record_scope(pc_offset, caller_frame, scope_mode, objects, return_oop, JVMCI_CHECK); } JVMCIObject hotspot_method = jvmci_env()->get_BytecodePosition_method(position); @@ -1181,7 +1181,7 @@ void CodeInstaller::record_scope(jint pc_offset, JVMCIObject position, ScopeMode throw_exception = jvmci_env()->get_BytecodeFrame_rethrowException(frame) == JNI_TRUE; } - _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, is_mh_invoke, return_oop, + _debug_recorder->describe_scope(pc_offset, method, NULL, bci, reexecute, throw_exception, false, return_oop, locals_token, expressions_token, monitors_token); } @@ -1236,19 +1236,9 @@ void CodeInstaller::site_Call(CodeBuffer& buffer, jint pc_offset, JVMCIObject si OopMap *map = create_oop_map(debug_info, JVMCI_CHECK); _debug_recorder->add_safepoint(next_pc_offset, map); - if (hotspot_method.is_non_null()) { - Method *method = jvmci_env()->asMethod(hotspot_method); - vmIntrinsics::ID iid = method->intrinsic_id(); - bool is_mh_invoke = false; - if (jvmci_env()->get_site_Call_direct(site)) { - is_mh_invoke = !method->is_static() && (iid == vmIntrinsics::_compiledLambdaForm || - (MethodHandles::is_signature_polymorphic(iid) && MethodHandles::is_signature_polymorphic_intrinsic(iid))); - } - bool return_oop = method->is_returning_oop(); - record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, is_mh_invoke, return_oop, JVMCI_CHECK); - } else { - record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, JVMCI_CHECK); - } + bool return_oop = hotspot_method.is_non_null() && jvmci_env()->asMethod(hotspot_method)->is_returning_oop(); + + record_scope(next_pc_offset, debug_info, CodeInstaller::FullFrame, return_oop, JVMCI_CHECK); } if (foreign_call.is_non_null()) { @@ -1357,9 +1347,6 @@ void CodeInstaller::site_Mark(CodeBuffer& buffer, jint pc_offset, JVMCIObject si case DEOPT_HANDLER_ENTRY: _offsets.set_value(CodeOffsets::Deopt, pc_offset); break; - case DEOPT_MH_HANDLER_ENTRY: - _offsets.set_value(CodeOffsets::DeoptMH, pc_offset); - break; case FRAME_COMPLETE: _offsets.set_value(CodeOffsets::Frame_Complete, pc_offset); break; diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp index 0bbaf3f3e66..45f9232b3d1 100644 --- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp +++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2019, 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 @@ -159,7 +159,6 @@ private: CRC_TABLE_ADDRESS, LOG_OF_HEAP_REGION_GRAIN_BYTES, INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED, - DEOPT_MH_HANDLER_ENTRY, INVOKE_INVALID = -1 }; @@ -298,11 +297,11 @@ protected: int map_jvmci_bci(int bci); - void record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS); + void record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, bool return_oop, JVMCI_TRAPS); void record_scope(jint pc_offset, JVMCIObject debug_info, ScopeMode scope_mode, JVMCI_TRAPS) { - record_scope(pc_offset, debug_info, scope_mode, false /* is_mh_invoke */, false /* return_oop */, JVMCIENV); + record_scope(pc_offset, debug_info, scope_mode, false /* return_oop */, JVMCIENV); } - void record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool is_mh_invoke, bool return_oop, JVMCI_TRAPS); + void record_scope(jint pc_offset, JVMCIObject position, ScopeMode scope_mode, GrowableArray* objects, bool return_oop, JVMCI_TRAPS); void record_object_value(ObjectValue* sv, JVMCIObject value, GrowableArray* objects, JVMCI_TRAPS); GrowableArray* record_virtual_objects(JVMCIObject debug_info, JVMCI_TRAPS); diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp index 91c9302729a..fae548065a5 100644 --- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp +++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2019, 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 @@ -175,7 +175,6 @@ end_class \ start_class(site_Call, jdk_vm_ci_code_site_Call) \ object_field(site_Call, target, "Ljdk/vm/ci/meta/InvokeTarget;") \ - boolean_field(site_Call, direct) \ end_class \ start_class(site_DataPatch, jdk_vm_ci_code_site_DataPatch) \ object_field(site_DataPatch, reference, "Ljdk/vm/ci/code/site/Reference;") \ diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp index e12eca30ff9..f6aec1f3f1e 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -471,14 +471,8 @@ declare_constant(CodeInstaller::CRC_TABLE_ADDRESS) \ declare_constant(CodeInstaller::LOG_OF_HEAP_REGION_GRAIN_BYTES) \ declare_constant(CodeInstaller::INLINE_CONTIGUOUS_ALLOCATION_SUPPORTED) \ - declare_constant(CodeInstaller::DEOPT_MH_HANDLER_ENTRY) \ declare_constant(CodeInstaller::INVOKE_INVALID) \ \ - declare_constant(vmIntrinsics::FIRST_MH_SIG_POLY) \ - declare_constant(vmIntrinsics::LAST_MH_SIG_POLY) \ - declare_constant(vmIntrinsics::_invokeGeneric) \ - declare_constant(vmIntrinsics::_compiledLambdaForm) \ - \ declare_constant(CollectedHeap::Serial) \ declare_constant(CollectedHeap::Parallel) \ declare_constant(CollectedHeap::G1) \ @@ -972,3 +966,4 @@ void jvmci_vmStructs_init() { JVMCIVMStructs::init(); } #endif // ASSERT + From 23ed3a9e91ac57295d274fefdf6c0a322b1e87b7 Mon Sep 17 00:00:00 2001 From: Xiaohong Gong Date: Tue, 11 Aug 2020 06:00:43 +0000 Subject: [PATCH 095/100] 8250808: Re-associate loop invariants with other associative operations Reviewed-by: kvn, thartmann --- src/hotspot/share/opto/loopTransform.cpp | 177 +++++++++++++++++------ src/hotspot/share/opto/loopnode.hpp | 12 +- 2 files changed, 141 insertions(+), 48 deletions(-) diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp index d49458f0027..ec7ecc7bdfc 100644 --- a/src/hotspot/share/opto/loopTransform.cpp +++ b/src/hotspot/share/opto/loopTransform.cpp @@ -245,21 +245,45 @@ void IdealLoopTree::compute_profile_trip_cnt(PhaseIdealLoop *phase) { head->set_profile_trip_cnt(trip_cnt); } -//---------------------is_invariant_addition----------------------------- -// Return nonzero index of invariant operand for an Add or Sub -// of (nonconstant) invariant and variant values. Helper for reassociate_invariants. -int IdealLoopTree::is_invariant_addition(Node* n, PhaseIdealLoop *phase) { - int op = n->Opcode(); - if (op == Op_AddI || op == Op_SubI) { - bool in1_invar = this->is_invariant(n->in(1)); - bool in2_invar = this->is_invariant(n->in(2)); - if (in1_invar && !in2_invar) return 1; - if (!in1_invar && in2_invar) return 2; - } +//---------------------find_invariant----------------------------- +// Return nonzero index of invariant operand for an associative +// binary operation of (nonconstant) invariant and variant values. +// Helper for reassociate_invariants. +int IdealLoopTree::find_invariant(Node* n, PhaseIdealLoop *phase) { + bool in1_invar = this->is_invariant(n->in(1)); + bool in2_invar = this->is_invariant(n->in(2)); + if (in1_invar && !in2_invar) return 1; + if (!in1_invar && in2_invar) return 2; return 0; } -//---------------------reassociate_add_sub----------------------------- +//---------------------is_associative----------------------------- +// Return TRUE if "n" is an associative binary node. If "base" is +// not NULL, "n" must be re-associative with it. +bool IdealLoopTree::is_associative(Node* n, Node* base) { + int op = n->Opcode(); + if (base != NULL) { + assert(is_associative(base), "Base node should be associative"); + int base_op = base->Opcode(); + if (base_op == Op_AddI || base_op == Op_SubI) { + return op == Op_AddI || op == Op_SubI; + } + if (base_op == Op_AddL || base_op == Op_SubL) { + return op == Op_AddL || op == Op_SubL; + } + return op == base_op; + } else { + // Integer "add/sub/mul/and/or/xor" operations are associative. + return op == Op_AddI || op == Op_AddL + || op == Op_SubI || op == Op_SubL + || op == Op_MulI || op == Op_MulL + || op == Op_AndI || op == Op_AndL + || op == Op_OrI || op == Op_OrL + || op == Op_XorI || op == Op_XorL; + } +} + +//---------------------reassociate_add_sub------------------------ // Reassociate invariant add and subtract expressions: // // inv1 + (x + inv2) => ( inv1 + inv2) + x @@ -275,22 +299,12 @@ int IdealLoopTree::is_invariant_addition(Node* n, PhaseIdealLoop *phase) { // (inv2 - x) - inv1 => (-inv1 + inv2) - x // inv1 - (x + inv2) => ( inv1 - inv2) - x // -Node* IdealLoopTree::reassociate_add_sub(Node* n1, PhaseIdealLoop *phase) { - if ((!n1->is_Add() && !n1->is_Sub()) || n1->outcnt() == 0) return NULL; - if (is_invariant(n1)) return NULL; - int inv1_idx = is_invariant_addition(n1, phase); - if (!inv1_idx) return NULL; - // Don't mess with add of constant (igvn moves them to expression tree root.) - if (n1->is_Add() && n1->in(2)->is_Con()) return NULL; +Node* IdealLoopTree::reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, PhaseIdealLoop *phase) { + assert(n1->is_Add() || n1->is_Sub(), "Target node should be add or subtract"); + Node* n2 = n1->in(3 - inv1_idx); Node* inv1 = n1->in(inv1_idx); - Node* n2 = n1->in(3 - inv1_idx); - int inv2_idx = is_invariant_addition(n2, phase); - if (!inv2_idx) return NULL; - - if (!phase->may_require_nodes(10, 10)) return NULL; - - Node* x = n2->in(3 - inv2_idx); Node* inv2 = n2->in(inv2_idx); + Node* x = n2->in(3 - inv2_idx); bool neg_x = n2->is_Sub() && inv2_idx == 1; bool neg_inv2 = n2->is_Sub() && inv2_idx == 2; @@ -299,36 +313,111 @@ Node* IdealLoopTree::reassociate_add_sub(Node* n1, PhaseIdealLoop *phase) { neg_x = !neg_x; neg_inv2 = !neg_inv2; } + + bool is_int = n1->bottom_type()->isa_int() != NULL; Node* inv1_c = phase->get_ctrl(inv1); - Node* inv2_c = phase->get_ctrl(inv2); Node* n_inv1; if (neg_inv1) { - Node *zero = phase->_igvn.intcon(0); + Node* zero; + if (is_int) { + zero = phase->_igvn.intcon(0); + n_inv1 = new SubINode(zero, inv1); + } else { + zero = phase->_igvn.longcon(0L); + n_inv1 = new SubLNode(zero, inv1); + } phase->set_ctrl(zero, phase->C->root()); - n_inv1 = new SubINode(zero, inv1); phase->register_new_node(n_inv1, inv1_c); } else { n_inv1 = inv1; } - Node* inv; - if (neg_inv2) { - inv = new SubINode(n_inv1, inv2); - } else { - inv = new AddINode(n_inv1, inv2); - } - phase->register_new_node(inv, phase->get_early_ctrl(inv)); - Node* addx; - if (neg_x) { - addx = new SubINode(inv, x); + Node* inv; + if (is_int) { + if (neg_inv2) { + inv = new SubINode(n_inv1, inv2); + } else { + inv = new AddINode(n_inv1, inv2); + } + phase->register_new_node(inv, phase->get_early_ctrl(inv)); + if (neg_x) { + return new SubINode(inv, x); + } else { + return new AddINode(x, inv); + } } else { - addx = new AddINode(x, inv); + if (neg_inv2) { + inv = new SubLNode(n_inv1, inv2); + } else { + inv = new AddLNode(n_inv1, inv2); + } + phase->register_new_node(inv, phase->get_early_ctrl(inv)); + if (neg_x) { + return new SubLNode(inv, x); + } else { + return new AddLNode(x, inv); + } } - phase->register_new_node(addx, phase->get_ctrl(x)); - phase->_igvn.replace_node(n1, addx); +} + +//---------------------reassociate----------------------------- +// Reassociate invariant binary expressions with add/sub/mul/ +// and/or/xor operators. +// For add/sub expressions: see "reassociate_add_sub" +// +// For mul/and/or/xor expressions: +// +// inv1 op (x op inv2) => (inv1 op inv2) op x +// +Node* IdealLoopTree::reassociate(Node* n1, PhaseIdealLoop *phase) { + if (!is_associative(n1) || n1->outcnt() == 0) return NULL; + if (is_invariant(n1)) return NULL; + // Don't mess with add of constant (igvn moves them to expression tree root.) + if (n1->is_Add() && n1->in(2)->is_Con()) return NULL; + + int inv1_idx = find_invariant(n1, phase); + if (!inv1_idx) return NULL; + Node* n2 = n1->in(3 - inv1_idx); + if (!is_associative(n2, n1)) return NULL; + int inv2_idx = find_invariant(n2, phase); + if (!inv2_idx) return NULL; + + if (!phase->may_require_nodes(10, 10)) return NULL; + + Node* result = NULL; + switch (n1->Opcode()) { + case Op_AddI: + case Op_AddL: + case Op_SubI: + case Op_SubL: + result = reassociate_add_sub(n1, inv1_idx, inv2_idx, phase); + break; + case Op_MulI: + case Op_MulL: + case Op_AndI: + case Op_AndL: + case Op_OrI: + case Op_OrL: + case Op_XorI: + case Op_XorL: { + Node* inv1 = n1->in(inv1_idx); + Node* inv2 = n2->in(inv2_idx); + Node* x = n2->in(3 - inv2_idx); + Node* inv = n2->clone_with_data_edge(inv1, inv2); + phase->register_new_node(inv, phase->get_early_ctrl(inv)); + result = n1->clone_with_data_edge(x, inv); + break; + } + default: + ShouldNotReachHere(); + } + + assert(result != NULL, ""); + phase->register_new_node(result, phase->get_ctrl(n1)); + phase->_igvn.replace_node(n1, result); assert(phase->get_loop(phase->get_ctrl(n1)) == this, ""); _body.yank(n1); - return addx; + return result; } //---------------------reassociate_invariants----------------------------- @@ -337,7 +426,7 @@ void IdealLoopTree::reassociate_invariants(PhaseIdealLoop *phase) { for (int i = _body.size() - 1; i >= 0; i--) { Node *n = _body.at(i); for (int j = 0; j < 5; j++) { - Node* nn = reassociate_add_sub(n, phase); + Node* nn = reassociate(n, phase); if (nn == NULL) break; n = nn; // again } diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp index 2fbeb04d5f9..74f3c8243a2 100644 --- a/src/hotspot/share/opto/loopnode.hpp +++ b/src/hotspot/share/opto/loopnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -636,11 +636,15 @@ public: // Reassociate invariant expressions. void reassociate_invariants(PhaseIdealLoop *phase); + // Reassociate invariant binary expressions. + Node* reassociate(Node* n1, PhaseIdealLoop *phase); // Reassociate invariant add and subtract expressions. - Node* reassociate_add_sub(Node* n1, PhaseIdealLoop *phase); + Node* reassociate_add_sub(Node* n1, int inv1_idx, int inv2_idx, PhaseIdealLoop *phase); // Return nonzero index of invariant operand if invariant and variant - // are combined with an Add or Sub. Helper for reassociate_invariants. - int is_invariant_addition(Node* n, PhaseIdealLoop *phase); + // are combined with an associative binary. Helper for reassociate_invariants. + int find_invariant(Node* n, PhaseIdealLoop *phase); + // Return TRUE if "n" is associative. + bool is_associative(Node* n, Node* base=NULL); // Return true if n is invariant bool is_invariant(Node* n) const; From 315ae4c51ceaa862e5bf9ee1b5c3c01f502a9e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Tue, 11 Aug 2020 08:38:47 +0200 Subject: [PATCH 096/100] 8250954: Avoid multiple warnings for external docs with mismatching modularity Reviewed-by: jjg --- .../javadoc/internal/doclets/toolkit/util/Extern.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java index 0430472c93c..645a09e042d 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Extern.java @@ -384,6 +384,7 @@ public class Extern { DocPath elempath; String moduleName = null; DocPath basePath = DocPath.create(path); + boolean issueWarning = true; while ((elemname = in.readLine()) != null) { if (elemname.length() > 0) { elempath = basePath; @@ -398,10 +399,11 @@ public class Extern { } else { elempath = elempath.resolve(pkgPath); } - String actualModuleName = checkLinkCompatibility(elemname, moduleName, path); + String actualModuleName = checkLinkCompatibility(elemname, moduleName, path, issueWarning); Item item = new Item(elemname, elempath, relative); packageItems.computeIfAbsent(actualModuleName, k -> new TreeMap<>()) .putIfAbsent(elemname, item); // first-one-wins semantics + issueWarning = false; } } } @@ -416,14 +418,15 @@ public class Extern { * @param packageName the package name * @param moduleName the module name or null * @param path the documentation path + * @param issueWarning whether to print a warning in case of modularity mismatch * @return the module name to use according to actual modularity of the package */ - private String checkLinkCompatibility(String packageName, String moduleName, String path) { + private String checkLinkCompatibility(String packageName, String moduleName, String path, boolean issueWarning) { PackageElement pe = utils.elementUtils.getPackageElement(packageName); if (pe != null) { ModuleElement me = (ModuleElement)pe.getEnclosingElement(); if (me == null || me.isUnnamed()) { - if (moduleName != null) { + if (moduleName != null && issueWarning) { configuration.getReporter().print(Kind.WARNING, resources.getText("doclet.linkMismatch_PackagedLinkedtoModule", path)); } @@ -431,7 +434,7 @@ public class Extern { return DocletConstants.DEFAULT_ELEMENT_NAME; } else if (moduleName == null) { // suppress the warning message in the case of automatic modules - if (!isAutomaticModule(me)) { + if (!isAutomaticModule(me) && issueWarning) { configuration.getReporter().print(Kind.WARNING, resources.getText("doclet.linkMismatch_ModuleLinkedtoPackage", path)); } From 28f963f6fc0f1c7e84d8abad395c11d38c6b5fbd Mon Sep 17 00:00:00 2001 From: Dmitry Cherepanov Date: Tue, 11 Aug 2020 13:03:15 +0300 Subject: [PATCH 097/100] 8251365: Build failure on AIX after 8250636 Reviewed-by: dholmes --- src/hotspot/share/runtime/os.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index 0581954e02f..a10c7ba2f55 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -148,19 +148,23 @@ char* os::iso8601_time(char* buffer, size_t buffer_length, bool utc) { // No offset when dealing with UTC time_t UTC_to_local = 0; if (!utc) { -#if defined(_WINDOWS) +#if defined(_ALLBSD_SOURCE) || defined(_GNU_SOURCE) + UTC_to_local = -(time_struct.tm_gmtoff); +#elif defined(_WINDOWS) long zone; _get_timezone(&zone); UTC_to_local = static_cast(zone); +#else + UTC_to_local = timezone; +#endif + // tm_gmtoff already includes adjustment for daylight saving +#if !defined(_ALLBSD_SOURCE) && !defined(_GNU_SOURCE) // If daylight savings time is in effect, // we are 1 hour East of our time zone if (time_struct.tm_isdst > 0) { UTC_to_local = UTC_to_local - seconds_per_hour; } -#else - // tm_gmtoff already includes adjustment for daylight saving - UTC_to_local = -(time_struct.tm_gmtoff); #endif } From b16a01bb677d551fff30d0e18f2b9020d7ec2e63 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Tue, 11 Aug 2020 07:29:45 -0400 Subject: [PATCH 098/100] 8251302: Create dedicated OopStorages for Management and Jvmti Reviewed-by: sspitsyn, dholmes --- src/hotspot/share/gc/shared/oopStorageSet.hpp | 2 +- src/hotspot/share/prims/jvmtiExport.cpp | 17 +++++++-- src/hotspot/share/prims/jvmtiExport.hpp | 5 +++ src/hotspot/share/prims/jvmtiImpl.cpp | 6 ++-- src/hotspot/share/runtime/init.cpp | 2 ++ src/hotspot/share/services/threadService.cpp | 35 +++++++++++-------- .../gc/collection/TestG1ParallelPhases.java | 2 ++ 7 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/hotspot/share/gc/shared/oopStorageSet.hpp b/src/hotspot/share/gc/shared/oopStorageSet.hpp index 66c39414889..9fd8a3ce5be 100644 --- a/src/hotspot/share/gc/shared/oopStorageSet.hpp +++ b/src/hotspot/share/gc/shared/oopStorageSet.hpp @@ -37,7 +37,7 @@ class OopStorageSet : public AllStatic { public: // Must be updated when new OopStorages are introduced - static const uint strong_count = 3; + static const uint strong_count = 4 JVMTI_ONLY(+ 1); static const uint weak_count = 4 JFR_ONLY(+ 1); static const uint all_count = strong_count + weak_count; diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp index 32c30d3d761..6ed7079173f 100644 --- a/src/hotspot/share/prims/jvmtiExport.cpp +++ b/src/hotspot/share/prims/jvmtiExport.cpp @@ -29,6 +29,7 @@ #include "code/nmethod.hpp" #include "code/pcDesc.hpp" #include "code/scopeDesc.hpp" +#include "gc/shared/oopStorageSet.hpp" #include "interpreter/interpreter.hpp" #include "jvmtifiles/jvmtiEnv.hpp" #include "logging/log.hpp" @@ -678,6 +679,18 @@ void JvmtiExport::post_vm_start() { } } +static OopStorage* _jvmti_oop_storage = NULL; + +OopStorage* JvmtiExport::jvmti_oop_storage() { + assert(_jvmti_oop_storage != NULL, "not yet initialized"); + return _jvmti_oop_storage; +} + +void JvmtiExport::initialize_oop_storage() { + // OopStorage needs to be created early in startup and unconditionally + // because of OopStorageSet static array indices. + _jvmti_oop_storage = OopStorageSet::create_strong("JVMTI OopStorage"); +} void JvmtiExport::post_vm_initialized() { EVT_TRIG_TRACE(JVMTI_EVENT_VM_INIT, ("Trg VM init event triggered" )); @@ -2828,7 +2841,7 @@ void JvmtiObjectAllocEventCollector::generate_call_for_allocated() { oop obj = _allocated->at(i).resolve(); _post_callback(JavaThread::current(), obj); // Release OopHandle - _allocated->at(i).release(Universe::vm_global()); + _allocated->at(i).release(JvmtiExport::jvmti_oop_storage()); } delete _allocated, _allocated = NULL; @@ -2840,7 +2853,7 @@ void JvmtiObjectAllocEventCollector::record_allocation(oop obj) { if (_allocated == NULL) { _allocated = new (ResourceObj::C_HEAP, mtServiceability) GrowableArray(1, mtServiceability); } - _allocated->push(OopHandle(Universe::vm_global(), obj)); + _allocated->push(OopHandle(JvmtiExport::jvmti_oop_storage(), obj)); } // Disable collection of VMObjectAlloc events diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp index 6d1a7b6da32..ce7f4100a5a 100644 --- a/src/hotspot/share/prims/jvmtiExport.hpp +++ b/src/hotspot/share/prims/jvmtiExport.hpp @@ -47,6 +47,8 @@ class JvmtiManageCapabilities; class JvmtiEnv; class JvmtiThreadState; +class OopStorage; + #define JVMTI_SUPPORT_FLAG(key) \ private: \ static bool _##key; \ @@ -162,6 +164,9 @@ class JvmtiExport : public AllStatic { static void post_dynamic_code_generated_internal(const char *name, const void *code_begin, const void *code_end) NOT_JVMTI_RETURN; static void post_class_unload_internal(const char *name) NOT_JVMTI_RETURN; + + static void initialize_oop_storage() NOT_JVMTI_RETURN; + static OopStorage* jvmti_oop_storage(); private: // GenerateEvents support to allow posting of CompiledMethodLoad and diff --git a/src/hotspot/share/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp index e377a17de5c..7962fc69a5b 100644 --- a/src/hotspot/share/prims/jvmtiImpl.cpp +++ b/src/hotspot/share/prims/jvmtiImpl.cpp @@ -200,19 +200,19 @@ JvmtiBreakpoint::JvmtiBreakpoint(Method* m_method, jlocation location) assert(_method != NULL, "No method for breakpoint."); assert(_bci >= 0, "Negative bci for breakpoint."); oop class_holder_oop = _method->method_holder()->klass_holder(); - _class_holder = OopHandle(Universe::vm_global(), class_holder_oop); + _class_holder = OopHandle(JvmtiExport::jvmti_oop_storage(), class_holder_oop); } JvmtiBreakpoint::~JvmtiBreakpoint() { if (_class_holder.peek() != NULL) { - _class_holder.release(Universe::vm_global()); + _class_holder.release(JvmtiExport::jvmti_oop_storage()); } } void JvmtiBreakpoint::copy(JvmtiBreakpoint& bp) { _method = bp._method; _bci = bp._bci; - _class_holder = OopHandle(Universe::vm_global(), bp._class_holder.resolve()); + _class_holder = OopHandle(JvmtiExport::jvmti_oop_storage(), bp._class_holder.resolve()); } bool JvmtiBreakpoint::equals(JvmtiBreakpoint& bp) { diff --git a/src/hotspot/share/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp index 8b35bfca814..9d7014778d2 100644 --- a/src/hotspot/share/runtime/init.cpp +++ b/src/hotspot/share/runtime/init.cpp @@ -34,6 +34,7 @@ #include "logging/log.hpp" #include "logging/logTag.hpp" #include "memory/universe.hpp" +#include "prims/jvmtiExport.hpp" #include "prims/methodHandles.hpp" #include "runtime/atomic.hpp" #include "runtime/flags/jvmFlag.hpp" @@ -106,6 +107,7 @@ void vm_init_globals() { jint init_globals() { management_init(); + JvmtiExport::initialize_oop_storage(); bytecodes_init(); classLoader_init1(); compilationPolicy_init(); diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp index 53382e2cb6e..28e054c0fb5 100644 --- a/src/hotspot/share/services/threadService.cpp +++ b/src/hotspot/share/services/threadService.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "classfile/systemDictionary.hpp" +#include "gc/shared/oopStorageSet.hpp" #include "memory/allocation.hpp" #include "memory/heapInspection.hpp" #include "memory/oopFactory.hpp" @@ -67,6 +68,9 @@ ThreadDumpResult* ThreadService::_threaddump_list = NULL; static const int INITIAL_ARRAY_SIZE = 10; +// OopStorage for thread stack sampling +static OopStorage* _thread_service_storage = NULL; + void ThreadService::init() { EXCEPTION_MARK; @@ -95,6 +99,9 @@ void ThreadService::init() { } _thread_allocated_memory_enabled = true; // Always on, so enable it + + // Initialize OopStorage for thread stack sampling walking + _thread_service_storage = OopStorageSet::create_strong("ThreadService OopStorage"); } void ThreadService::reset_peak_thread_count() { @@ -563,7 +570,7 @@ ThreadsList* ThreadDumpResult::t_list() { StackFrameInfo::StackFrameInfo(javaVFrame* jvf, bool with_lock_info) { _method = jvf->method(); _bci = jvf->bci(); - _class_holder = OopHandle(Universe::vm_global(), _method->method_holder()->klass_holder()); + _class_holder = OopHandle(_thread_service_storage, _method->method_holder()->klass_holder()); _locked_monitors = NULL; if (with_lock_info) { Thread* current_thread = Thread::current(); @@ -576,7 +583,7 @@ StackFrameInfo::StackFrameInfo(javaVFrame* jvf, bool with_lock_info) { for (int i = 0; i < length; i++) { MonitorInfo* monitor = list->at(i); assert(monitor->owner() != NULL, "This monitor must have an owning object"); - _locked_monitors->append(OopHandle(Universe::vm_global(), monitor->owner())); + _locked_monitors->append(OopHandle(_thread_service_storage, monitor->owner())); } } } @@ -585,11 +592,11 @@ StackFrameInfo::StackFrameInfo(javaVFrame* jvf, bool with_lock_info) { StackFrameInfo::~StackFrameInfo() { if (_locked_monitors != NULL) { for (int i = 0; i < _locked_monitors->length(); i++) { - _locked_monitors->at(i).release(Universe::vm_global()); + _locked_monitors->at(i).release(_thread_service_storage); } delete _locked_monitors; } - _class_holder.release(Universe::vm_global()); + _class_holder.release(_thread_service_storage); } void StackFrameInfo::metadata_do(void f(Metadata*)) { @@ -640,7 +647,7 @@ ThreadStackTrace::ThreadStackTrace(JavaThread* t, bool with_locked_monitors) { } void ThreadStackTrace::add_jni_locked_monitor(oop object) { - _jni_locked_monitors->append(OopHandle(Universe::vm_global(), object)); + _jni_locked_monitors->append(OopHandle(_thread_service_storage, object)); } ThreadStackTrace::~ThreadStackTrace() { @@ -650,7 +657,7 @@ ThreadStackTrace::~ThreadStackTrace() { delete _frames; if (_jni_locked_monitors != NULL) { for (int i = 0; i < _jni_locked_monitors->length(); i++) { - _jni_locked_monitors->at(i).release(Universe::vm_global()); + _jni_locked_monitors->at(i).release(_thread_service_storage); } delete _jni_locked_monitors; } @@ -834,13 +841,13 @@ ThreadConcurrentLocks::ThreadConcurrentLocks(JavaThread* thread) { ThreadConcurrentLocks::~ThreadConcurrentLocks() { for (int i = 0; i < _owned_locks->length(); i++) { - _owned_locks->at(i).release(Universe::vm_global()); + _owned_locks->at(i).release(_thread_service_storage); } delete _owned_locks; } void ThreadConcurrentLocks::add_lock(instanceOop o) { - _owned_locks->append(OopHandle(Universe::vm_global(), o)); + _owned_locks->append(OopHandle(_thread_service_storage, o)); } ThreadStatistics::ThreadStatistics() { @@ -857,7 +864,7 @@ oop ThreadSnapshot::threadObj() const { return _threadObj.resolve(); } void ThreadSnapshot::initialize(ThreadsList * t_list, JavaThread* thread) { _thread = thread; oop threadObj = thread->threadObj(); - _threadObj = OopHandle(Universe::vm_global(), threadObj); + _threadObj = OopHandle(_thread_service_storage, threadObj); ThreadStatistics* stat = thread->get_thread_stat(); _contended_enter_ticks = stat->contended_enter_ticks(); @@ -910,10 +917,10 @@ void ThreadSnapshot::initialize(ThreadsList * t_list, JavaThread* thread) { } if (blocker_object != NULL) { - _blocker_object = OopHandle(Universe::vm_global(), blocker_object); + _blocker_object = OopHandle(_thread_service_storage, blocker_object); } if (blocker_object_owner != NULL) { - _blocker_object_owner = OopHandle(Universe::vm_global(), blocker_object_owner); + _blocker_object_owner = OopHandle(_thread_service_storage, blocker_object_owner); } } @@ -921,9 +928,9 @@ oop ThreadSnapshot::blocker_object() const { return _blocker_object.re oop ThreadSnapshot::blocker_object_owner() const { return _blocker_object_owner.resolve(); } ThreadSnapshot::~ThreadSnapshot() { - _blocker_object.release(Universe::vm_global()); - _blocker_object_owner.release(Universe::vm_global()); - _threadObj.release(Universe::vm_global()); + _blocker_object.release(_thread_service_storage); + _blocker_object_owner.release(_thread_service_storage); + _threadObj.release(_thread_service_storage); delete _stack_trace; delete _concurrent_locks; diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java index 90667c97cd1..06837a04cd0 100644 --- a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java +++ b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java @@ -95,6 +95,8 @@ public class TestG1ParallelPhases { "VM Global", "JNI Global", "Thread OopStorage", + "ThreadService OopStorage", + "JVMTI OopStorage", "CLDGRoots", "CMRefRoots", "MergeER", From d6bd183b844ab3e3f64da98ba56d525f7d486672 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 11 Aug 2020 16:07:04 +0200 Subject: [PATCH 099/100] 8251399: JDK-8248701 had incorrect indentation Reviewed-by: erikj --- make/common/Modules.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index daffb1ed5b7..72e19840501 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -346,7 +346,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ sub(/\/\*.*\*\//, ""); \ gsub(/^ +\*.*/, ""); \ gsub(/ /, ""); \ - gsub(/\r/, ""); \ + gsub(/\r/, ""); \ printf(" %s", $$0) } \ END { printf("\n") }' $m && \ $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \ @@ -360,7 +360,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ sub(/\/\*.*\*\//, ""); \ gsub(/^ +\*.*/, ""); \ gsub(/ /, ""); \ - gsub(/\r/, ""); \ + gsub(/\r/, ""); \ printf(" %s", $$0) } \ END { printf("\n") }' $m \ ) >> $@ $(NEWLINE)) From 5d2f6e737bdd7bba293e153ea08e27c643ded37e Mon Sep 17 00:00:00 2001 From: Patric Hedlin Date: Mon, 10 Aug 2020 17:36:46 +0200 Subject: [PATCH 100/100] 8250848: [aarch64] nativeGotJump_at() missing call to verify() Reviewed-by: aph --- .../cpu/aarch64/nativeInst_aarch64.hpp | 196 ++++++++---------- 1 file changed, 91 insertions(+), 105 deletions(-) diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp index da8ae97887a..d40c533a82c 100644 --- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp @@ -53,7 +53,7 @@ class NativeCall; class NativeInstruction { friend class Relocation; friend bool is_NativeCallTrampolineStub_at(address); - public: +public: enum { instruction_size = 4 }; @@ -62,12 +62,16 @@ class NativeInstruction { return uint_at(0); } - bool is_blr() const { return (encoding() & 0xff9ffc1f) == 0xd61f0000; } // blr(register) or br(register) - bool is_adr_aligned() const { return (encoding() & 0xff000000) == 0x10000000; } // adr Xn,