diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp index 64d3a8d4a1068..961451e5b5959 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp @@ -122,7 +122,7 @@ jint ParallelScavengeHeap::initialize() { _gc_policy_counters = new PSGCAdaptivePolicyCounters("ParScav:MSC", 2, 2, _size_policy); - if (!PSParallelCompact::initialize()) { + if (!PSParallelCompact::initialize_aux_data()) { return JNI_ENOMEM; } diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp index 14be4745b153d..2e1de34258ae0 100644 --- a/src/hotspot/share/gc/parallel/psOldGen.cpp +++ b/src/hotspot/share/gc/parallel/psOldGen.cpp @@ -121,12 +121,6 @@ void PSOldGen::initialize_performance_counters(const char* perf_data_name, int l _object_space, _gen_counters); } -// Assume that the generation has been allocated if its -// reserved size is not 0. -bool PSOldGen::is_allocated() { - return virtual_space()->reserved_size() != 0; -} - size_t PSOldGen::num_iterable_blocks() const { return (object_space()->used_in_bytes() + IterateBlockSize - 1) / IterateBlockSize; } diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp index 4898baa3a4409..82aa920f4013b 100644 --- a/src/hotspot/share/gc/parallel/psOldGen.hpp +++ b/src/hotspot/share/gc/parallel/psOldGen.hpp @@ -105,9 +105,6 @@ class PSOldGen : public CHeapObj { ObjectStartArray* start_array() { return &_start_array; } PSVirtualSpace* virtual_space() const { return _virtual_space;} - // Has the generation been successfully allocated? - bool is_allocated(); - // Size info size_t capacity_in_bytes() const { return object_space()->capacity_in_bytes(); } size_t used_in_bytes() const { return object_space()->used_in_bytes(); } diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 9df0d7fb4d764..aafbdfaeb04cd 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -862,14 +862,10 @@ void PSParallelCompact::post_initialize() { ParCompactionManager::initialize(mark_bitmap()); } -bool PSParallelCompact::initialize() { +bool PSParallelCompact::initialize_aux_data() { ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); MemRegion mr = heap->reserved_region(); - - // Was the old gen get allocated successfully? - if (!heap->old_gen()->is_allocated()) { - return false; - } + assert(mr.byte_size() != 0, "heap should be reserved"); initialize_space_info(); initialize_dead_wood_limiter(); @@ -1048,142 +1044,6 @@ void PSParallelCompact::post_compact() Universe::heap()->record_whole_heap_examined_timestamp(); } -HeapWord* -PSParallelCompact::compute_dense_prefix_via_density(const SpaceId id, - bool maximum_compaction) -{ - const size_t region_size = ParallelCompactData::RegionSize; - const ParallelCompactData& sd = summary_data(); - - const MutableSpace* const space = _space_info[id].space(); - HeapWord* const top_aligned_up = sd.region_align_up(space->top()); - const RegionData* const beg_cp = sd.addr_to_region_ptr(space->bottom()); - const RegionData* const end_cp = sd.addr_to_region_ptr(top_aligned_up); - - // Skip full regions at the beginning of the space--they are necessarily part - // of the dense prefix. - size_t full_count = 0; - const RegionData* cp; - for (cp = beg_cp; cp < end_cp && cp->data_size() == region_size; ++cp) { - ++full_count; - } - - const uint total_invocations = ParallelScavengeHeap::heap()->total_full_collections(); - assert(total_invocations >= _maximum_compaction_gc_num, "sanity"); - const size_t gcs_since_max = total_invocations - _maximum_compaction_gc_num; - const bool interval_ended = gcs_since_max > HeapMaximumCompactionInterval; - if (maximum_compaction || cp == end_cp || interval_ended) { - _maximum_compaction_gc_num = total_invocations; - return sd.region_to_addr(cp); - } - - HeapWord* const new_top = _space_info[id].new_top(); - const size_t space_live = pointer_delta(new_top, space->bottom()); - const size_t space_used = space->used_in_words(); - const size_t space_capacity = space->capacity_in_words(); - - const double cur_density = double(space_live) / space_capacity; - const double deadwood_density = - (1.0 - cur_density) * (1.0 - cur_density) * cur_density * cur_density; - const size_t deadwood_goal = size_t(space_capacity * deadwood_density); - - log_develop_debug(gc, compaction)( - "cur_dens=%5.3f dw_dens=%5.3f dw_goal=" SIZE_FORMAT, - cur_density, deadwood_density, deadwood_goal); - log_develop_debug(gc, compaction)( - "space_live=" SIZE_FORMAT " space_used=" SIZE_FORMAT " " - "space_cap=" SIZE_FORMAT, - space_live, space_used, - space_capacity); - - // XXX - Use binary search? - HeapWord* dense_prefix = sd.region_to_addr(cp); - const RegionData* full_cp = cp; - const RegionData* const top_cp = sd.addr_to_region_ptr(space->top() - 1); - while (cp < end_cp) { - HeapWord* region_destination = cp->destination(); - const size_t cur_deadwood = pointer_delta(dense_prefix, region_destination); - - log_develop_trace(gc, compaction)( - "c#=" SIZE_FORMAT_W(4) " dst=" PTR_FORMAT " " - "dp=" PTR_FORMAT " cdw=" SIZE_FORMAT_W(8), - sd.region(cp), p2i(region_destination), - p2i(dense_prefix), cur_deadwood); - - if (cur_deadwood >= deadwood_goal) { - // Found the region that has the correct amount of deadwood to the left. - // This typically occurs after crossing a fairly sparse set of regions, so - // iterate backwards over those sparse regions, looking for the region - // that has the lowest density of live objects 'to the right.' - size_t space_to_left = sd.region(cp) * region_size; - size_t live_to_left = space_to_left - cur_deadwood; - size_t space_to_right = space_capacity - space_to_left; - size_t live_to_right = space_live - live_to_left; - double density_to_right = double(live_to_right) / space_to_right; - while (cp > full_cp) { - --cp; - const size_t prev_region_live_to_right = live_to_right - - cp->data_size(); - const size_t prev_region_space_to_right = space_to_right + region_size; - double prev_region_density_to_right = - double(prev_region_live_to_right) / prev_region_space_to_right; - if (density_to_right <= prev_region_density_to_right) { - return dense_prefix; - } - - log_develop_trace(gc, compaction)( - "backing up from c=" SIZE_FORMAT_W(4) " d2r=%10.8f " - "pc_d2r=%10.8f", - sd.region(cp), density_to_right, - prev_region_density_to_right); - - dense_prefix -= region_size; - live_to_right = prev_region_live_to_right; - space_to_right = prev_region_space_to_right; - density_to_right = prev_region_density_to_right; - } - return dense_prefix; - } - - dense_prefix += region_size; - ++cp; - } - - return dense_prefix; -} - -#ifndef PRODUCT -void PSParallelCompact::print_dense_prefix_stats(const char* const algorithm, - const SpaceId id, - const bool maximum_compaction, - HeapWord* const addr) -{ - const size_t region_idx = summary_data().addr_to_region_idx(addr); - RegionData* const cp = summary_data().region(region_idx); - const MutableSpace* const space = _space_info[id].space(); - HeapWord* const new_top = _space_info[id].new_top(); - - const size_t space_live = pointer_delta(new_top, space->bottom()); - const size_t dead_to_left = pointer_delta(addr, cp->destination()); - const size_t space_cap = space->capacity_in_words(); - const double dead_to_left_pct = double(dead_to_left) / space_cap; - const size_t live_to_right = new_top - cp->destination(); - const size_t dead_to_right = space->top() - addr - live_to_right; - - log_develop_debug(gc, compaction)( - "%s=" PTR_FORMAT " dpc=" SIZE_FORMAT_W(5) " " - "spl=" SIZE_FORMAT " " - "d2l=" SIZE_FORMAT " d2l%%=%6.4f " - "d2r=" SIZE_FORMAT " l2r=" SIZE_FORMAT " " - "ratio=%10.8f", - algorithm, p2i(addr), region_idx, - space_live, - dead_to_left, dead_to_left_pct, - dead_to_right, live_to_right, - double(dead_to_right) / live_to_right); -} -#endif // #ifndef PRODUCT - // Return a fraction indicating how much of the generation can be treated as // "dead wood" (i.e., not reclaimed). The function uses a normal distribution // based on the density of live objects in the generation to determine a limit, @@ -1511,15 +1371,6 @@ PSParallelCompact::summarize_space(SpaceId id, bool maximum_compaction) HeapWord* dense_prefix_end = compute_dense_prefix(id, maximum_compaction); _space_info[id].set_dense_prefix(dense_prefix_end); -#ifndef PRODUCT - if (log_is_enabled(Debug, gc, compaction)) { - print_dense_prefix_stats("ratio", id, maximum_compaction, - dense_prefix_end); - HeapWord* addr = compute_dense_prefix_via_density(id, maximum_compaction); - print_dense_prefix_stats("density", id, maximum_compaction, addr); - } -#endif // #ifndef PRODUCT - // Recompute the summary data, taking into account the dense prefix. If // every last byte will be reclaimed, then the existing summary data which // compacts everything can be left in place. diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 94995bd4f195c..b5efb52a24599 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -975,11 +975,6 @@ class PSParallelCompact : AllStatic { // Mark live objects static void marking_phase(ParallelOldTracer *gc_tracer); - // Compute the dense prefix for the designated space. This is an experimental - // implementation currently not used in production. - static HeapWord* compute_dense_prefix_via_density(const SpaceId id, - bool maximum_compaction); - // Methods used to compute the dense prefix. // Compute the value of the normal distribution at x = density. The mean and @@ -1069,7 +1064,7 @@ class PSParallelCompact : AllStatic { // allocations. This should be called during the VM initialization // at a pointer where it would be appropriate to return a JNI_ENOMEM // in the event of a failure. - static bool initialize(); + static bool initialize_aux_data(); // Closure accessors static BoolObjectClosure* is_alive_closure() { return &_is_alive_closure; } @@ -1170,10 +1165,6 @@ class PSParallelCompact : AllStatic { // Debugging support. static const char* space_names[last_space_id]; static void print_region_ranges(); - static void print_dense_prefix_stats(const char* const algorithm, - const SpaceId id, - const bool maximum_compaction, - HeapWord* const addr); static void summary_phase_msg(SpaceId dst_space_id, HeapWord* dst_beg, HeapWord* dst_end, SpaceId src_space_id, diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp index c864ded21c5eb..926006a8a0ecd 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.cpp +++ b/src/hotspot/share/gc/parallel/psScavenge.cpp @@ -298,8 +298,6 @@ class ScavengeRootsTask : public WorkerTask { _active_workers(active_workers), _is_old_gen_empty(old_gen->object_space()->is_empty()), _terminator(active_workers, PSPromotionManager::vm_thread_promotion_manager()->stack_array_depth()) { - assert(_old_gen != nullptr, "Sanity"); - if (!_is_old_gen_empty) { PSCardTable* card_table = ParallelScavengeHeap::heap()->card_table(); card_table->pre_scavenge(active_workers); diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp index 1e4c8fc51b7af..338732b420faf 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -4879,6 +4879,7 @@ void Compile::add_coarsened_locks(GrowableArray& locks) { // Locking regions (BoxLock) could be Unbalanced here: // - its coarsened locks were eliminated in earlier // macro nodes elimination followed by loop unroll + // - it is OSR locking region (no Lock node) // Preserve Unbalanced status in such cases. if (!this_box->is_unbalanced()) { this_box->set_coarsened(); diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp index 91e1c40076e2a..0e21933b6dee3 100644 --- a/src/hotspot/share/opto/ifnode.cpp +++ b/src/hotspot/share/opto/ifnode.cpp @@ -1031,7 +1031,7 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f const TypeInt* type2 = filtered_int_type(igvn, n, fail); if (type2 != nullptr) { failtype = failtype->join(type2)->is_int(); - if (failtype->_lo > failtype->_hi) { + if (failtype->empty()) { // previous if determines the result of this if so // replace Bool with constant igvn->replace_input_of(this, 1, igvn->intcon(success->_con)); @@ -1039,55 +1039,49 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f } } } - lo = nullptr; - hi = nullptr; + return false; + } + + assert(lo != nullptr && hi != nullptr, "sanity"); + Node* hook = new Node(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 == nullptr) { + adjusted_lim = igvn->transform(new SubINode(hi, lo)); } + hook->destruct(igvn); - 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 == nullptr) { - adjusted_lim = igvn->transform(new SubINode(hi, lo)); + if (igvn->type(adjusted_lim)->is_int()->_lo < 0 && + !igvn->C->post_loop_opts_phase()) { + // If range check elimination applies to this comparison, it includes code to protect from overflows that may + // cause the main loop to be skipped entirely. Delay this transformation. + // Example: + // for (int i = 0; i < limit; i++) { + // if (i < max_jint && i > min_jint) {... + // } + // Comparisons folded as: + // i - min_jint - 1 outcnt() == 0) { + igvn->remove_dead_node(adjusted_val); } - hook->destruct(igvn); - - int lo = igvn->type(adjusted_lim)->is_int()->_lo; - if (lo < 0) { - // If range check elimination applies to this comparison, it includes code to protect from overflows that may - // cause the main loop to be skipped entirely. Delay this transformation. - // Example: - // for (int i = 0; i < limit; i++) { - // if (i < max_jint && i > min_jint) {... - // } - // Comparisons folded as: - // i - min_jint - 1 C->post_loop_opts_phase()) { - if (adjusted_val->outcnt() == 0) { - igvn->remove_dead_node(adjusted_val); - } - if (adjusted_lim->outcnt() == 0) { - igvn->remove_dead_node(adjusted_lim); - } - igvn->C->record_for_post_loop_opts_igvn(this); - return false; - } + if (adjusted_lim->outcnt() == 0) { + igvn->remove_dead_node(adjusted_lim); } + igvn->C->record_for_post_loop_opts_igvn(this); + return false; + } - Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim)); - Node* newbool = igvn->transform(new BoolNode(newcmp, cond)); + Node* newcmp = igvn->transform(new CmpUNode(adjusted_val, adjusted_lim)); + Node* newbool = igvn->transform(new BoolNode(newcmp, cond)); - igvn->replace_input_of(dom_iff, 1, igvn->intcon(proj->_con)); - igvn->replace_input_of(this, 1, newbool); + igvn->replace_input_of(dom_iff, 1, igvn->intcon(proj->_con)); + igvn->replace_input_of(this, 1, newbool); - return true; - } - return false; + return true; } // Merge the branches that trap for this If and the dominating If into diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp index 7c0f5cadeeb82..97cc025b45b72 100644 --- a/src/hotspot/share/opto/parse1.cpp +++ b/src/hotspot/share/opto/parse1.cpp @@ -224,11 +224,20 @@ void Parse::load_interpreter_state(Node* osr_buf) { Node *monitors_addr = basic_plus_adr(osr_buf, osr_buf, (max_locals+mcnt*2-1)*wordSize); for (index = 0; index < mcnt; index++) { // Make a BoxLockNode for the monitor. - Node *box = new BoxLockNode(next_monitor()); + BoxLockNode* osr_box = new BoxLockNode(next_monitor()); // Check for bailout after new BoxLockNode if (failing()) { return; } - box = _gvn.transform(box); + // This OSR locking region is unbalanced because it does not have Lock node: + // locking was done in Interpreter. + // This is similar to Coarsened case when Lock node is eliminated + // and as result the region is marked as Unbalanced. + + // Emulate Coarsened state transition from Regular to Unbalanced. + osr_box->set_coarsened(); + osr_box->set_unbalanced(); + + Node* box = _gvn.transform(osr_box); // Displaced headers and locked objects are interleaved in the // temp OSR buffer. We only copy the locked objects out here. @@ -1805,11 +1814,24 @@ void Parse::merge_common(Parse::Block* target, int pnum) { const JVMState* jvms = map()->jvms(); if (EliminateNestedLocks && jvms->is_mon(j) && jvms->is_monitor_box(j)) { - // BoxLock nodes are not commoning. + // BoxLock nodes are not commoning when EliminateNestedLocks is on. // Use old BoxLock node as merged box. assert(newin->jvms()->is_monitor_box(j), "sanity"); // This assert also tests that nodes are BoxLock. assert(BoxLockNode::same_slot(n, m), "sanity"); + BoxLockNode* old_box = m->as_BoxLock(); + if (n->as_BoxLock()->is_unbalanced() && !old_box->is_unbalanced()) { + // Preserve Unbalanced status. + // + // `old_box` can have only Regular or Coarsened status + // because this code is executed only during Parse phase and + // Incremental Inlining before EA and Macro nodes elimination. + // + // Incremental Inlining is executed after IGVN optimizations + // during which BoxLock can be marked as Coarsened. + old_box->set_coarsened(); // Verifies state + old_box->set_unbalanced(); + } C->gvn_replace_by(n, m); } else if (!check_elide_phi || !target->can_elide_SEL_phi(j)) { phi = ensure_phi(j, nophi); diff --git a/src/hotspot/share/prims/jvmtiAgentList.cpp b/src/hotspot/share/prims/jvmtiAgentList.cpp index 2a0f71728888b..75f9ba63d3dc9 100644 --- a/src/hotspot/share/prims/jvmtiAgentList.cpp +++ b/src/hotspot/share/prims/jvmtiAgentList.cpp @@ -258,7 +258,6 @@ static bool match(JvmtiEnv* env, const JvmtiAgent* agent, const void* os_module_ JvmtiAgent* JvmtiAgentList::lookup(JvmtiEnv* env, void* f_ptr) { assert(env != nullptr, "invariant"); assert(f_ptr != nullptr, "invariant"); - static char ebuf[1024]; static char buffer[JVM_MAXPATHLEN]; int offset; if (!os::dll_address_to_library_name(reinterpret_cast
(f_ptr), &buffer[0], JVM_MAXPATHLEN, &offset)) { diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp index d40504d6d2008..156a0fd2ec674 100644 --- a/src/hotspot/share/utilities/vmError.cpp +++ b/src/hotspot/share/utilities/vmError.cpp @@ -489,6 +489,10 @@ void VMError::print_native_stack(outputStream* st, frame fr, Thread* t, bool pri static void print_oom_reasons(outputStream* st) { st->print_cr("# Possible reasons:"); st->print_cr("# The system is out of physical RAM or swap space"); +#ifdef LINUX + st->print_cr("# This process has exceeded the maximum number of memory mappings (check below"); + st->print_cr("# for `/proc/sys/vm/max_map_count` and `Total number of mappings`)"); +#endif if (UseCompressedOops) { st->print_cr("# This process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap"); } diff --git a/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java b/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java index fd48d4baa6e1e..27fce3c1e091f 100644 --- a/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java +++ b/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved. * 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 interface ScatteringByteChannel * *

An invocation of this method attempts to read up to r bytes * from this channel, where r is the total number of bytes remaining - * the specified subsequence of the given buffer array, that is, + * in the specified subsequence of the given buffer array, that is, * * {@snippet lang=java : * dsts[offset].remaining() diff --git a/src/java.base/share/classes/sun/net/www/MessageHeader.java b/src/java.base/share/classes/sun/net/www/MessageHeader.java index 4192d8920f7c5..6af23e43ad25d 100644 --- a/src/java.base/share/classes/sun/net/www/MessageHeader.java +++ b/src/java.base/share/classes/sun/net/www/MessageHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,17 +40,15 @@ the header that don't have a valid key, but do have a value (this isn't legal according to the standard, but lines like this are everywhere). */ -public -class MessageHeader { - private String keys[]; - private String values[]; +public final class MessageHeader { + private String[] keys; + private String[] values; private int nkeys; public MessageHeader () { grow(); } - @SuppressWarnings("this-escape") public MessageHeader (InputStream is) throws java.io.IOException { parseHeader(is); } diff --git a/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp index 5386e4afdd36a..c16fd791e5b40 100644 --- a/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp +++ b/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -82,6 +82,22 @@ AccessBridgeJavaEntryPoints::~AccessBridgeJavaEntryPoints() { return (returnVal); \ } +#define EXCEPTION_CHECK_WITH_RELEASE(situationDescription, returnVal, js, stringBytes) \ + if (exception = jniEnv->ExceptionOccurred()) { \ + PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to GetStringLength; returning %d", situationDescription, returnVal); \ + jniEnv->ExceptionDescribe(); \ + jniEnv->ExceptionClear(); \ + jniEnv->ReleaseStringChars(js, stringBytes); \ + return (returnVal); \ + } \ + jniEnv->ReleaseStringChars(js, stringBytes); \ + if (exception = jniEnv->ExceptionOccurred()) { \ + PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to ReleaseStringChars; returning %d", situationDescription, returnVal); \ + jniEnv->ExceptionDescribe(); \ + jniEnv->ExceptionClear(); \ + return (returnVal); \ + } + #define EXCEPTION_CHECK_VOID(situationDescription) \ if (exception = jniEnv->ExceptionOccurred()) { \ PrintDebugString("[ERROR]: *** Exception occured while doing: %s", situationDescription); \ @@ -1215,9 +1231,7 @@ AccessBridgeJavaEntryPoints::getVirtualAccessibleName ( EXCEPTION_CHECK("Getting AccessibleName - call to GetStringChars()", FALSE); wcsncpy(name, stringBytes, nameSize - 1); length = jniEnv->GetStringLength(js); - EXCEPTION_CHECK("Getting AccessibleName - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleName - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleName", FALSE, js, stringBytes); jniEnv->CallVoidMethod ( accessBridgeObject, decrementReferenceMethod, js); @@ -1380,9 +1394,7 @@ AccessBridgeJavaEntryPoints::getTextAttributesInRange(const jobject accessibleCo length = jniEnv->GetStringLength(js); test_attributes.fullAttributesString[length < (sizeof(test_attributes.fullAttributesString) / sizeof(wchar_t)) ? length : (sizeof(test_attributes.fullAttributesString) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleAttributesAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to CallVoidMethod()", FALSE); @@ -1735,11 +1747,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleName - call to GetStringChars()", FALSE); wcsncpy(info->name, stringBytes, (sizeof(info->name) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleName", FALSE, js, stringBytes); info->name[length < (sizeof(info->name) / sizeof(wchar_t)) ? length : (sizeof(info->name) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleName - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleName - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleName - call to CallVoidMethod()", FALSE); @@ -1767,11 +1777,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleName - call to GetStringChars()", FALSE); wcsncpy(info->description, stringBytes, (sizeof(info->description) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleName", FALSE, js, stringBytes); info->description[length < (sizeof(info->description) / sizeof(wchar_t)) ? length : (sizeof(info->description) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleName - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleName - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleName - call to CallVoidMethod()", FALSE); @@ -1799,11 +1807,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleRole - call to GetStringChars()", FALSE); wcsncpy(info->role, stringBytes, (sizeof(info->role) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleRole", FALSE, js, stringBytes); info->role[length < (sizeof(info->role) / sizeof(wchar_t)) ? length : (sizeof(info->role) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleRole - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleRole - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleRole - call to CallVoidMethod()", FALSE); @@ -1831,11 +1837,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to GetStringChars()", FALSE); wcsncpy(info->role_en_US, stringBytes, (sizeof(info->role_en_US) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleRole_en_US", FALSE, js, stringBytes); info->role_en_US[length < (sizeof(info->role_en_US) / sizeof(wchar_t)) ? length : (sizeof(info->role_en_US) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleRole_en_US - call to CallVoidMethod()", FALSE); @@ -1862,11 +1866,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleState - call to GetStringChars()", FALSE); wcsncpy(info->states, stringBytes, (sizeof(info->states) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleState", FALSE, js, stringBytes); info->states[length < (sizeof(info->states) / sizeof(wchar_t)) ? length : (sizeof(info->states) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleState - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleState - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleState - call to CallVoidMethod()", FALSE); @@ -1893,11 +1895,9 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleState_en_US - call to GetStringChars()", FALSE); wcsncpy(info->states_en_US, stringBytes, (sizeof(info->states_en_US) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleState_en_US", FALSE, js, stringBytes); info->states_en_US[length < (sizeof(info->states_en_US) / sizeof(wchar_t)) ? length : (sizeof(info->states_en_US) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleState_en_US - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleState_en_US - call to ReleaseStringChars()", FALSE); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleState_en_US - call to CallVoidMethod()", FALSE); @@ -2809,11 +2809,9 @@ AccessBridgeJavaEntryPoints::getAccessibleRelationSet(jobject accessibleContext, EXCEPTION_CHECK("Getting AccessibleRelation key - call to GetStringChars()", FALSE); wcsncpy(relationSet->relations[i].key, stringBytes, (sizeof(relationSet->relations[i].key ) / sizeof(wchar_t))); length = jniEnv->GetStringLength(js); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleRelation key", FALSE, js, stringBytes); relationSet->relations[i].key [length < (sizeof(relationSet->relations[i].key ) / sizeof(wchar_t)) ? length : (sizeof(relationSet->relations[i].key ) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleRelation key - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleRelation key - call to ReleaseStringChars()", FALSE); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleRelation key - call to CallVoidMethod()", FALSE); @@ -2915,9 +2913,7 @@ AccessBridgeJavaEntryPoints::getAccessibleHypertext(jobject accessibleContext, length = (sizeof(hypertext->links[i].text) / sizeof(wchar_t)) - 2; } hypertext->links[i].text[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleHyperlink text", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to CallVoidMethod()", FALSE); @@ -3052,9 +3048,7 @@ AccessBridgeJavaEntryPoints::getAccessibleHypertextExt(const jobject accessibleC length = (sizeof(hypertext->links[bufIndex].text) / sizeof(wchar_t)) - 2; } hypertext->links[bufIndex].text[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleHyperlink text", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to CallVoidMethod()", FALSE); @@ -3171,9 +3165,7 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleHyperlink(jobject hypertext, length = (sizeof(info->text) / sizeof(wchar_t)) - 2; } info->text[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleHyperlink text", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleHyperlink text - call to CallVoidMethod()", FALSE); @@ -3300,9 +3292,7 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleIcons(jobject accessibleContext, length = (sizeof(icons->iconInfo[i].description) / sizeof(wchar_t)) - 2; } icons->iconInfo[i].description[length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleIcon description - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleIcon description - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleIcon description", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleIcon description - call to CallVoidMethod()", FALSE); @@ -3379,9 +3369,7 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleActions(jobject accessibleContext length = (sizeof(actions->actionInfo[i].name ) / sizeof(wchar_t)) - 2; } actions->actionInfo[i].name [length] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleAction name - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleAction name - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleAction name", FALSE, js, stringBytes); // jniEnv->CallVoidMethod(accessBridgeObject, // decrementReferenceMethod, js); //EXCEPTION_CHECK("Getting AccessibleAction name - call to CallVoidMethod()", FALSE); @@ -3561,9 +3549,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextItems(jobject accessibleContext, length = jniEnv->GetStringLength(js); textItems->word[length < (sizeof(textItems->word) / sizeof(wchar_t)) ? length : (sizeof(textItems->word) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleWordAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleWordAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleWordAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleWordAtIndex - call to CallVoidMethod()", FALSE); @@ -3597,9 +3583,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextItems(jobject accessibleContext, } else { textItems->sentence[(sizeof(textItems->sentence) / sizeof(wchar_t))-2] = (wchar_t) 0; } - EXCEPTION_CHECK("Getting AccessibleSentenceAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleSentenceAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleSentenceAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleSentenceAtIndex - call to CallVoidMethod()", FALSE); @@ -3673,9 +3657,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextSelectionInfo(jobject accessibleCo length = jniEnv->GetStringLength(js); selectionInfo->selectedText[length < (sizeof(selectionInfo->selectedText) / sizeof(wchar_t)) ? length : (sizeof(selectionInfo->selectedText) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleTextSelectedText - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleTextSelectedText - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleTextSelectedText", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleTextSelectedText - call to CallVoidMethod()", FALSE); @@ -3890,9 +3872,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->backgroundColor[length < (sizeof(attributes->backgroundColor) / sizeof(wchar_t)) ? length : (sizeof(attributes->backgroundColor) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting BackgroundColorFromAttributeSet - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting BackgroundColorFromAttributeSet - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting BackgroundColorFromAttributeSet", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting BackgroundColorFromAttributeSet - call to CallVoidMethod()", FALSE); @@ -3927,9 +3907,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->foregroundColor[length < (sizeof(attributes->foregroundColor) / sizeof(wchar_t)) ? length : (sizeof(attributes->foregroundColor) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting ForegroundColorFromAttributeSet - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting ForegroundColorFromAttributeSet - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting ForegroundColorFromAttributeSet", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting ForegroundColorFromAttributeSet - call to CallVoidMethod()", FALSE); @@ -3964,9 +3942,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->fontFamily[length < (sizeof(attributes->fontFamily) / sizeof(wchar_t)) ? length : (sizeof(attributes->fontFamily) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting FontFamilyFromAttributeSet - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting FontFamilyFromAttributeSet - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting FontFamilyFromAttributeSet", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting FontFamilyFromAttributeSet - call to CallVoidMethod()", FALSE); @@ -4170,9 +4146,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte length = jniEnv->GetStringLength(js); attributes->fullAttributesString[length < (sizeof(attributes->fullAttributesString) / sizeof(wchar_t)) ? length : (sizeof(attributes->fullAttributesString) / sizeof(wchar_t))-2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleAttributesAtIndex", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleAttributesAtIndex - call to CallVoidMethod()", FALSE); @@ -4413,9 +4387,7 @@ AccessBridgeJavaEntryPoints::getAccessibleTextRange(jobject accessibleContext, PrintDebugString("[INFO]: Accessible Text stringBytes length = %d", length); text[length < len ? length : len - 2] = (wchar_t) 0; wPrintDebugString(L"[INFO]: Accessible Text 'text' after null termination = %ls", text); - EXCEPTION_CHECK("Getting AccessibleTextRange - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting AccessibleTextRange - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting AccessibleTextRange", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting AccessibleTextRange - call to CallVoidMethod()", FALSE); @@ -4458,9 +4430,7 @@ AccessBridgeJavaEntryPoints::getCurrentAccessibleValueFromContext(jobject access wcsncpy(value, stringBytes, len); length = jniEnv->GetStringLength(js); value[length < len ? length : len - 2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting CurrentAccessibleValue - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting CurrentAccessibleValue - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting CurrentAccessibleValue", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting CurrentAccessibleValue - call to CallVoidMethod()", FALSE); @@ -4501,9 +4471,7 @@ AccessBridgeJavaEntryPoints::getMaximumAccessibleValueFromContext(jobject access wcsncpy(value, stringBytes, len); length = jniEnv->GetStringLength(js); value[length < len ? length : len - 2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting MaximumAccessibleValue - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting MaximumAccessibleValue - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting MaximumAccessibleValue", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting MaximumAccessibleValue - call to CallVoidMethod()", FALSE); @@ -4544,9 +4512,7 @@ AccessBridgeJavaEntryPoints::getMinimumAccessibleValueFromContext(jobject access wcsncpy(value, stringBytes, len); length = jniEnv->GetStringLength(js); value[length < len ? length : len - 2] = (wchar_t) 0; - EXCEPTION_CHECK("Getting MinimumAccessibleValue - call to GetStringLength()", FALSE); - jniEnv->ReleaseStringChars(js, stringBytes); - EXCEPTION_CHECK("Getting MinimumAccessibleValue - call to ReleaseStringChars()", FALSE); + EXCEPTION_CHECK_WITH_RELEASE("Getting MinimumAccessibleValue", FALSE, js, stringBytes); jniEnv->CallVoidMethod(accessBridgeObject, decrementReferenceMethod, js); EXCEPTION_CHECK("Getting MinimumAccessibleValue - call to CallVoidMethod()", FALSE); diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java index d6a91a7a9c04b..87cd10b400f10 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java @@ -221,35 +221,60 @@ static String[] exceptionToString(Throwable o, boolean toString, boolean stackTr */ static final Map options = new HashMap<>(); + /** + * Sentinel help value to denote options that are not printed by -XX:+JVMCIPrintProperties. + * Javadoc is used instead to document these options. + */ + private static final String[] NO_HELP = null; + /** * A list of all supported JVMCI options. */ public enum Option { // @formatter:off - Compiler(String.class, null, "Selects the system compiler. This must match the getCompilerName() value returned " + - "by a jdk.vm.ci.runtime.JVMCICompilerFactory provider. " + - "An empty string or the value \"null\" selects a compiler " + - "that will raise an exception upon receiving a compilation request."), - // Note: The following one is not used (see InitTimer.ENABLED). It is added here - // so that -XX:+JVMCIPrintProperties shows the option. - InitTimer(Boolean.class, false, "Specifies if initialization timing is enabled."), - CodeSerializationTypeInfo(Boolean.class, false, "Prepend the size and label of each element to the stream when " + - "serializing HotSpotCompiledCode to verify both ends of the protocol agree on the format. " + - "Defaults to true in non-product builds."), - DumpSerializedCode(String.class, null, "Dump serialized code during code installation for code whose simple " + - "name (a stub) or fully qualified name (an nmethod) contains this option's value as a substring."), - ForceTranslateFailure(String.class, null, "Forces HotSpotJVMCIRuntime.translate to throw an exception in the context " + - "of the peer runtime. The value is a filter that can restrict the forced failure to matching translated " + - "objects. See HotSpotJVMCIRuntime.postTranslation for more details. This option exists solely to test " + - "correct handling of translation failures."), - PrintConfig(Boolean.class, false, "Prints VM configuration available via JVMCI."), - AuditHandles(Boolean.class, false, "Record stack trace along with scoped foreign object reference wrappers " + - "to debug issue with a wrapper being used after its scope has closed."), - TraceMethodDataFilter(String.class, null, - "Enables tracing of profiling info when read by JVMCI.", - "Empty value: trace all methods", - "Non-empty value: trace methods whose fully qualified name contains the value."), - UseProfilingInformation(Boolean.class, true, ""); + Compiler(String.class, null, + "Selects the system compiler. This must match the getCompilerName() value", + "returned by a jdk.vm.ci.runtime.JVMCICompilerFactory provider. ", + "An empty string or the value \"null\" selects a compiler ", + "that raises an exception upon receiving a compilation request."), + + PrintConfig(Boolean.class, false, "Prints VM values (e.g. flags, constants, field offsets etc) exposed to JVMCI."), + + InitTimer(Boolean.class, false, NO_HELP), + + /** + * Prepends the size and label of each element to the stream when serializing {@link HotSpotCompiledCode} + * to verify both ends of the protocol agree on the format. Defaults to true in non-product builds. + */ + CodeSerializationTypeInfo(Boolean.class, false, NO_HELP), + + /** + * Dumps serialized code during code installation for code whose qualified form (e.g. + * {@code java.lang.String.hashCode()}) contains this option's value as a substring. + */ + DumpSerializedCode(String.class, null, NO_HELP), + + /** + * Forces {@link #translate} to throw an exception in the context of the peer runtime for + * translated objects that match this value. See {@link #postTranslation} for more details. + * This option exists solely to test correct handling of translation failures. + */ + ForceTranslateFailure(String.class, null, NO_HELP), + + /** + * Captures a stack trace along with scoped foreign object reference wrappers + * to debug an issue with a wrapper being used after its scope has closed. + */ + AuditHandles(Boolean.class, false, NO_HELP), + + /** + * Enables tracing of profiling info when read by JVMCI. + * Empty value: trace all methods + * Non-empty value: trace methods whose fully qualified name contains the value + */ + TraceMethodDataFilter(String.class, null, NO_HELP), + + UseProfilingInformation(Boolean.class, true, NO_HELP); // @formatter:on /** @@ -343,6 +368,9 @@ public static void printProperties(PrintStream out) { out.println("[JVMCI properties]"); Option[] values = values(); for (Option option : values) { + if (option.helpLines == null) { + continue; + } Object value = option.getValue(); if (value instanceof String) { value = '"' + String.valueOf(value) + '"'; @@ -362,6 +390,7 @@ public static void printProperties(PrintStream out) { for (String line : option.helpLines) { out.printf("%" + PROPERTY_HELP_INDENT + "s%s%n", "", line); } + out.println(); } } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java index 4b54150e5bb88..29267803009c1 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. * 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,12 +35,14 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import jdk.jfr.AnnotationElement; import jdk.jfr.Event; import jdk.jfr.EventType; +import jdk.jfr.Name; import jdk.jfr.Period; import jdk.jfr.StackTrace; import jdk.jfr.Threshold; @@ -54,8 +56,8 @@ public final class MetadataRepository { private static final MetadataRepository instance = new MetadataRepository(); - private final List nativeEventTypes = new ArrayList<>(150); - private final List nativeControls = new ArrayList(nativeEventTypes.size()); + private final Map nativeEventTypes = LinkedHashMap.newHashMap(150); + private final Map nativeControls = LinkedHashMap.newHashMap(150); private final SettingsManager settingsManager = new SettingsManager(); private Constructor cachedEventConfigurationConstructor; private boolean staleMetadata = true; @@ -83,8 +85,9 @@ private void initializeJVMEventTypes() { PeriodicEvents.addJVMEvent(pEventType); } } - nativeControls.add(new EventControl(pEventType)); - nativeEventTypes.add(eventType); + String name = eventType.getName(); + nativeControls.put(name, new EventControl(pEventType)); + nativeEventTypes.put(name,eventType); } } } @@ -101,7 +104,7 @@ public synchronized List getRegisteredEventTypes() { eventTypes.add(ec.getEventType()); } } - for (EventType t : nativeEventTypes) { + for (EventType t : nativeEventTypes.values()) { if (PrivateAccess.getInstance().isVisible(t)) { eventTypes.add(t); } @@ -200,6 +203,32 @@ private EventConfiguration makeConfiguration(Class getEventControls() { List> eventClasses = JVM.getAllEventClasses(); ArrayList controls = new ArrayList<>(eventClasses.size() + nativeControls.size()); - controls.addAll(nativeControls); + controls.addAll(nativeControls.values()); for (Class clazz : eventClasses) { EventConfiguration eh = JVMSupport.getConfiguration(clazz); if (eh != null) { diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java index 277b28505e6a4..bc949b8c7ff9d 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -222,6 +222,10 @@ public boolean isDefinedByJVM() { return id < JVM.RESERVED_CLASS_ID_LIMIT; } + public void setFields(List fields) { + this.fields = List.copyOf(fields); + } + public void add(ValueDescriptor valueDescriptor) { Objects.requireNonNull(valueDescriptor); fields.add(valueDescriptor); diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java index 4663ead6838a5..19c83b3dc1c2b 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -322,7 +322,7 @@ private static void addUserFields(Class clazz, Type type, List sanitizeNullFreeStringMap(Map return map; } + public static boolean compareLists(List a, List b, Comparator c) { + int size = a.size(); + if (size != b.size()) { + return false; + } + for (int i = 0; i < size; i++) { + if (c.compare(a.get(i), b.get(i)) != 0) { + return false; + } + } + return true; + } + public static List sanitizeNullFreeList(List elements, Class clazz) { List sanitized = new ArrayList<>(elements.size()); for (T element : elements) { diff --git a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java index 4e4a013db409b..d6de659eea4ec 100644 --- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java +++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java @@ -24,7 +24,7 @@ /* * @test TestBasicLogOutput * @bug 8203370 - * @summary Ensure -XX:-JVMCIPrintProperties can be enabled and successfully prints expected output to stdout. + * @summary Ensure -XX:+JVMCIPrintProperties successfully prints expected output to stdout. * @requires vm.flagless * @requires vm.jvmci * @library /test/lib @@ -49,9 +49,7 @@ static void test(String enableFlag) throws Exception { OutputAnalyzer output = new OutputAnalyzer(pb.start()); output.shouldContain("[JVMCI properties]"); // expected message output.shouldContain("jvmci.Compiler := \"null\""); // expected message - output.shouldContain("jvmci.InitTimer = false"); // expected message output.shouldContain("jvmci.PrintConfig = false"); // expected message - output.shouldContain("jvmci.TraceMethodDataFilter = null"); // expected message output.shouldHaveExitValue(0); } } diff --git a/test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java b/test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java new file mode 100644 index 0000000000000..3516e62e46f34 --- /dev/null +++ b/test/hotspot/jtreg/compiler/locks/TestLocksInOSR.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. + * 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 8322743 + * @summary EA incorrectly marks locks for elimination for escaped object which comes from Interpreter in OSR compilation. + * @run main/othervm -XX:-TieredCompilation -Xcomp -XX:CompileCommand=compileonly,TestLocksInOSR*::* -XX:CompileCommand=quiet TestLocksInOSR + * @run main TestLocksInOSR + */ + +public class TestLocksInOSR { + + public static void main(String[] args) throws Exception { + // Triggers assert(this->held_monitor_count() == this->jni_monitor_count()) failed: held monitor count should be equal to jni: 1 != 0 + test1(); + + // Triggers assert(current->held_monitor_count() == 0) failed: Should not be possible + test2(); + } + + static void test1() throws Exception { + Thread writeThread = new Thread(new Runnable() { + @Override + public void run() { + for (int i = 0; i < 2; ++i) { + synchronized (new Object()) { + // Trigger OSR compilation + for (int j = 0; j < 100_000; ++j) { + // We still have safepoint left in code + } + } + } + } + }); + writeThread.start(); + writeThread.join(); + } + + static void test2() { + for (int i = 0; i < 2; ++i) { + synchronized (new Object()) { + // Trigger OSR compilation + for (int j = 0; j < 100_000; ++j) { + // We still have safepoint left in code + } + } + } + } +} diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java b/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java index 306ab44d18dfc..d2ca4c9ff554a 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2022 SAP SE. All rights reserved. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 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 @@ -68,7 +68,7 @@ public static File openHsErrFileFromOutput(OutputAnalyzer output) { * @throws RuntimeException, {@link IOException} */ public static void checkHsErrFileContent(File f, Pattern[] patterns, boolean verbose) throws IOException { - checkHsErrFileContent(f, patterns, null, true, verbose); + checkHsErrFileContent(f, patterns, null, true, verbose, false); } /** @@ -80,11 +80,43 @@ public static void checkHsErrFileContent(File f, Pattern[] patterns, boolean ver * Order is irrelevant. * @param checkEndMarker If true, we check for the final "END" in an hs-err file; if it is missing it indicates * that hs-err file printing did not complete successfully. - * @param verbose If true, the content of the hs-err file is printed while matching. If false, only important - * information are printed. + * @param verbose If true, the content of the hs-err file is printed while matching. If false, only the matched patterns + * are printed. * @throws RuntimeException, {@link IOException} */ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pattern[] negativePatterns, boolean checkEndMarker, boolean verbose) throws IOException { + checkHsErrFileContent(f, positivePatterns, negativePatterns, checkEndMarker, verbose, false); + } + + /** + * Given an open hs-err file, read it line by line and check for existence of a set of patterns. Will fail + * if patterns are missing, or if the END marker is missing. + * @param f Input file + * @param patterns An array of patterns that need to match, in that order + * @param verbose If true, the content of the hs-err file is printed while matching. If false, only the matched patterns + * are printed. + * @param printHserrOnError If true, the content of the hs-err file is printed in case of a failing check + * @throws RuntimeException, {@link IOException} + */ + public static void checkHsErrFileContent(File f, Pattern[] patterns, boolean verbose, boolean printHserrOnError) throws IOException { + checkHsErrFileContent(f, patterns, null, true, verbose, printHserrOnError); + } + + /** + * Given an open hs-err file, read it line by line and check for various conditions. + * @param f input file + * @param positivePatterns Optional array of patterns that need to appear, in given order, in the file. Missing + * patterns cause the test to fail. + * @param negativePatterns Optional array of patterns that must not appear in the file; test fails if they do. + * Order is irrelevant. + * @param checkEndMarker If true, we check for the final "END" in an hs-err file; if it is missing it indicates + * that hs-err file printing did not complete successfully. + * @param verbose If true, the content of the hs-err file is printed while matching. If false, only the matched patterns + * are printed. + * @param printHserrOnError If true, the content of the hs-err file is printed in case of a failing check + * @throws RuntimeException, {@link IOException} + */ + public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pattern[] negativePatterns, boolean checkEndMarker, boolean verbose, boolean printHserrOnError) throws IOException { try ( FileInputStream fis = new FileInputStream(f); BufferedReader br = new BufferedReader(new InputStreamReader(fis)); @@ -123,6 +155,9 @@ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pat System.out.println(line); } System.out.println("^^^ Forbidden pattern found at line " + lineNo + ": " + negativePattern + "^^^"); + if (printHserrOnError) { + printHsErrFile(f); + } throw new RuntimeException("Forbidden pattern found at line " + lineNo + ": " + negativePattern); } } @@ -132,13 +167,33 @@ public static void checkHsErrFileContent(File f, Pattern[] positivePatterns, Pat } // If the current pattern is not null then it didn't match if (currentPositivePattern != null) { + if (printHserrOnError) { + printHsErrFile(f); + } throw new RuntimeException("hs-err file incomplete (first missing pattern: " + currentPositivePattern.pattern() + ")"); } if (checkEndMarker && !lastLine.equals("END.")) { + if (printHserrOnError) { + printHsErrFile(f); + } throw new RuntimeException("hs-err file incomplete (missing END marker.)"); } System.out.println("hs-err file " + f.getAbsolutePath() + " scanned successfully."); } } + private static void printHsErrFile(File f) throws IOException { + try ( + FileInputStream fis = new FileInputStream(f); + BufferedReader br = new BufferedReader(new InputStreamReader(fis)); + ) { + String line; + System.out.println("------------------------ hs-err file ------------------------"); + while ((line = br.readLine()) != null) { + System.out.println(line); + } + System.out.println("-------------------------------------------------------------"); + } + } + } diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java index 012d5a5c16d84..5b28e2a1d8b23 100644 --- a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java +++ b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2014, 2022 SAP SE. All rights reserved. - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024 SAP SE. All rights reserved. + * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -122,7 +122,7 @@ public static void main(String[] args) throws Exception { } Pattern[] pattern = patternlist.toArray(new Pattern[] {}); - HsErrFileUtils.checkHsErrFileContent(hs_err_file, pattern, false); + HsErrFileUtils.checkHsErrFileContent(hs_err_file, pattern, false, true); System.out.println("OK."); diff --git a/test/hotspot/jtreg/runtime/Thread/ThreadCountLimit.java b/test/hotspot/jtreg/runtime/Thread/ThreadCountLimit.java index 1afd6c1898f61..20d93cbfdbe3a 100644 --- a/test/hotspot/jtreg/runtime/Thread/ThreadCountLimit.java +++ b/test/hotspot/jtreg/runtime/Thread/ThreadCountLimit.java @@ -26,6 +26,7 @@ * @summary Stress test that reaches the process limit for thread count, or time limit. * @requires os.family != "aix" * @key stress + * @library /test/lib * @run main/othervm -Xmx1g ThreadCountLimit */ @@ -34,12 +35,17 @@ * @summary Stress test that reaches the process limit for thread count, or time limit. * @requires os.family == "aix" * @key stress + * @library /test/lib * @run main/othervm -Xmx1g -XX:MaxExpectedDataSegmentSize=16g ThreadCountLimit */ import java.util.concurrent.CountDownLatch; import java.util.ArrayList; +import jdk.test.lib.Platform; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + public class ThreadCountLimit { static final int TIME_LIMIT_MS = 5000; // Create as many threads as possible in 5 sec @@ -61,21 +67,42 @@ public void run() { } } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { + if (args.length == 0) { + // Called from the driver process so exec a new JVM on Linux. + if (Platform.isLinux()) { + // On Linux this test sometimes hits the limit for the maximum number of memory mappings, + // which leads to various other failure modes. Run this test with a limit on how many + // threads the process is allowed to create, so we hit that limit first. + + final String ULIMIT_CMD = "ulimit -u 4096"; + ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(ThreadCountLimit.class.getName()); + String javaCmd = ProcessTools.getCommandLine(pb); + // Relaunch the test with args.length > 0, and the ulimit set + ProcessTools.executeCommand("bash", "-c", ULIMIT_CMD + " && " + javaCmd + " dummy") + .shouldHaveExitValue(0); + } else { + // Not Linux so run directly. + test(); + } + } else { + // This is the exec'd process so run directly. + test(); + } + } + + static void test() { CountDownLatch startSignal = new CountDownLatch(1); ArrayList workers = new ArrayList(); - boolean reachedTimeLimit = false; boolean reachedNativeOOM = false; - int countAtTimeLimit = -1; - int countAtNativeOOM = -1; // This is dangerous loop: it depletes system resources, // so doing additional things there that may end up allocating // Java/native memory risks failing the VM prematurely. // Avoid doing unnecessary calls, printouts, etc. - int count = 1; + int count = 0; long start = System.currentTimeMillis(); try { while (true) { @@ -86,16 +113,15 @@ public static void main(String[] args) { long end = System.currentTimeMillis(); if ((end - start) > TIME_LIMIT_MS) { - reachedTimeLimit = true; - countAtTimeLimit = count; + // Windows always gets here, but we also get here if + // ulimit is set high enough. break; } } } catch (OutOfMemoryError e) { if (e.getMessage().contains("unable to create native thread")) { - // Linux, macOS path + // Linux, macOS path if we hit ulimit reachedNativeOOM = true; - countAtNativeOOM = count; } else { throw e; } @@ -113,13 +139,12 @@ public static void main(String[] args) { // Now that all threads have joined, we are away from dangerous // VM state and have enough memory to perform any other things. - if (reachedTimeLimit) { - // Windows path or a system with very large ulimit - System.out.println("INFO: reached the time limit " + TIME_LIMIT_MS + - " ms, with " + countAtTimeLimit + " threads created"); - } else if (reachedNativeOOM) { - System.out.println("INFO: reached this process thread count limit with " + - countAtNativeOOM + " threads created"); + if (reachedNativeOOM) { + System.out.println("INFO: reached this process thread count limit with " + + count + " threads created"); + } else { + System.out.println("INFO: reached the time limit " + TIME_LIMIT_MS + + " ms, with " + count + " threads created"); } } } diff --git a/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp b/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp index f13ba00aa414b..5e8e026dbbaca 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp @@ -23,7 +23,7 @@ #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" static jvmtiEnv* jvmti = nullptr; diff --git a/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp index 042edbc679226..b8d83eb50853f 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp index 24c36444ac23b..28bfaaa03bd6f 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp index 9ae5005ee6c11..79ab3dd0ad8ef 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp index 61d41a338352b..7e12be32d217f 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp index 2f4917c13f94a..9f6c4f941de04 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp @@ -27,7 +27,7 @@ #include "jni_md.h" #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp index 8766b2047a963..f8d8af90e9eda 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp @@ -27,7 +27,7 @@ #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp index 607b1d2792feb..934ccaf4e3caf 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp index ebb086adcaa42..0910053dfe274 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp index f7d74e6f2bfe5..8c600ed61e6b9 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp index cad086cb7efdb..2b34dc48e93bf 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp index c733fb1cbc7fb..240f38a818607 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp index 769a26c9c7dd4..6529adaceacfb 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp index 2239294c52ce5..e699d90671da3 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp index 26da8fedefb1b..0e8f5c0417e15 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp index 23e3c5f22d9d9..a2c211823915d 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp index 04eb17d6d4c02..8da891b277975 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp index 21e8f4e7e06c7..61c9a91184bab 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp @@ -26,7 +26,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp index b5dec3180292f..8bed8ac6ecb1e 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp index 43202de0ad7fe..4895771a92e81 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp index c6980f1048472..079b5ec302378 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp index d7d24a3f4e6df..54e4e6ea680c2 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp index 77ea808dc2321..4dbb9f71969db 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp @@ -26,8 +26,8 @@ #include #include -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp index c46ccac69337c..207ceeb6ac33f 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp @@ -24,8 +24,8 @@ #include #include #include -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp index b85fa20ca1660..6e3b86b941f87 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp @@ -24,8 +24,8 @@ #include #include #include -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp index 013dbd66d817b..8f66851a0848e 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp @@ -24,8 +24,8 @@ #include #include #include -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp index c0f7261b38f10..09d3ec41334e9 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp index 747952d4a1068..1a8806f0bb94a 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp index d637f7dc7135b..5fd58a3a43b23 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp index 871028423efac..49645af752841 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp index 7c4d6ef2ea7f2..87da7a6bf2236 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp @@ -1,6 +1,5 @@ /* - * Copyright (c) 200 - * git 3, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * 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 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp index f5437de1f3d11..984454dfbaff7 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp index 51ac700efadc4..ddc1e8f73e508 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp index b39276eeb006a..69e76d6d92e6c 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp index 2ffc67d3d8ec6..48f9da3785e20 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp @@ -25,8 +25,8 @@ #include #include #include -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp index 2ebaf2d9f0f6f..abf2e0e2bc33d 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp index 1ab67b6460378..061d6cf376a61 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp index 6373f8df19cab..560a1c77ee227 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp index 46006b00ad4a1..82c0ac8b54a8c 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp index 1231a9e1ce1fb..1dd9713ce34b9 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp index f9188a371ff9a..b51cb079ae941 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp index 0b4286991f7c9..7b860ab4d22e8 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp index b72c7b87ab123..4747ad3c69242 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp index b763d0433ee27..e7791751442c3 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp index b12b322bba4f2..9e98b584a31f6 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp index bdac7128c3b8f..b8b65cc754614 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp index 6ab0c45670426..7bb8bd861bc22 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp index b63e84d0c49ef..ebc957deab262 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp index ee2dc9d285926..903a76d4acf3a 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" #define MAX_FRAME_COUNT 80 diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp index 639b40d483947..037448a642877 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" #define MAX_FRAME_COUNT 80 diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp b/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp index 1c09fac92ba1b..a8faa71970d0e 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" /* constant names */ diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp index 442913b4ea2a1..611711a0f7e1b 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp @@ -25,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp index e3d95e113a031..992fb9a96cc47 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp index 65a2211a00443..39190270a3036 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp index c9dd399138a4d..ced257caef24e 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp index 89855a8d66e40..5922ee0400c27 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp index 53e9378fc8dc8..4fd96984a7b03 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp index eea96df83f70a..3e7b2fa950d11 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2023, Datadog, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -24,7 +25,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp index 17e721a151ea7..d58c952fe84a5 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp index 51c6f5dc4c409..78224f7f12e26 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp index 0cdbb7d027173..3a7bb8b1f06a4 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp index 19c6eb3967ef3..094fc6a64c780 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp index f0f17d50b170b..7b687b03ea9ef 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp index baa5f8e90d90e..b7f383ed232e7 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp index c3f6ad667b1c1..2543d1ceaf225 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" #include "../get_stack_trace.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp index e040b88ba8812..1695071929de8 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp index 4d54648a73fd1..41f9b2a8d6626 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp index 588b2268f6d33..3f12a04e82df7 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp index 36a632ff32c6d..817ae62cc8b85 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp index 3fd9b535de47b..fef814a0a7dbc 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp index d3b2f5745b576..37d52e43d077b 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp index 665c1a4da933e..83ced2ded6a42 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp index 42c4a4579fe26..cc1708340a6e0 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp index 5d622b926db80..91a0dc79175cc 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp index 300a479d4cef5..053023529cdc8 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp index 9ab8e053a518c..0f8316f3c74d5 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp index 30fb104beff2c..70cfb81f10f54 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp index 2ccc96c25961f..8982b95b514fb 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" #include diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp index 0fa0f065ae835..ff332ae454cb7 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * 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 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp index aa9f3bbd52aaa..0e647672c2162 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp index 1840b6ccac765..9b8ab8b7af29b 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp index 9bafe3bd5d0e4..60a3f17fbb014 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp index e8ac3886461e6..7a9af14f47823 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp index 81cc1368ad819..c647fcfb46973 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp index 3034e9e1475eb..9946364deeef5 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * 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 @@ #include #include -#include +#include #include #include diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp index 4407c5d074dd1..e659bd304f8ea 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp index 20b2edb1e9d7c..46cce443f4d94 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp index 4de5ebe1e8988..e6ee99eb23f6c 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * 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 @@ #include #include -#include +#include #include static jvmtiEnv *jvmti = nullptr; diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp index 6be49bfb4569c..8208e9bb1b421 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp index fb6b0bab58766..78e1422337721 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp index 82c51dfed7583..ec808cfc0589d 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp index d50d1ab4b8be5..91f5e6fecc2a0 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp @@ -22,7 +22,7 @@ */ #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp index 327b7d1cb2a62..4001296e96734 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp index 1e7c49af7a97e..1903e2563922e 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp index 74a1a3efc0d5c..a7d61b90e51fa 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" static jvmtiEnv *jvmti = nullptr; diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp index ade0e7fb67c10..36f70a971a0c9 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp index 9854008c14284..f05e619e0bd7d 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp index 97cae4f0f0c3a..68066c04575ac 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp index 4aef71c873771..e53484b575b7c 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" -#include "jvmti_common.h" -#include "jvmti_thread.h" +#include "jvmti_common.hpp" +#include "jvmti_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp index 3edb2871cc28b..918f547375b84 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" static jvmtiEnv* jvmti = nullptr; static const jint MAX_FRAME_COUNT = 32; diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp index c07b0924cfe62..10dfdfda34724 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" // set by Agent_OnLoad static jvmtiEnv* jvmti = nullptr; diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp index 9ecece684abe3..b09565f886af9 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp index 24b678eb18e92..afd06e66b32cc 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp index c05404658fe32..af0861ee03187 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "jni.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp index d5254293ab125..30382a87ee9b7 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp index ac4da3a76a759..278f449950326 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp index 701797bcfc24b..9433a4dcfaf31 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp index 5b299a46f4812..eb5ea872b916b 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp index 744e75ac29f8f..9e613d5b0f942 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp index 262712dfb0c53..711edaff9d33f 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp index 44b931c0ff9c4..bcaa1d605f7d5 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp +++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" jrawMonitorID monitor; jrawMonitorID monitor_completed; diff --git a/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp b/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp index 28afafda3a71b..a5b2b268ff15f 100644 --- a/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp +++ b/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp @@ -23,7 +23,7 @@ #include #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp index 5d819851e4b4e..a4c5eafd87f7f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp index d2c5f13cd34e0..5209cfd393d2d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp index 257511c60f375..f8e5b20c18e05 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp index 66bbc6a990acb..f2d3586ee6b36 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp index e7e6452603fb2..799a34d26d0d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp index bd94696a05c49..711ceda69cc8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp index 5ca00c75a5a05..b15f99e15d5eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp index ac26876e642b8..bfbb0048ae218 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp index 54219da3c87ef..68701a3365b86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp @@ -23,7 +23,7 @@ #include "jvmti.h" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp index 2a54325a06b49..27970b4d8ca0e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp @@ -23,7 +23,7 @@ #include "jvmti.h" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp index 48641848a81de..9500c40b74735 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp index a9a7ff072c8fd..068aab82e45c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "ExceptionCheckingJniEnv.hpp" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp index 8c98faca1cd08..638189059a2c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp index bd14beb64e5e1..d3b809707fdaa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp index f64b04a584b84..6df1e963fad6a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp index 00d0a2136dfb4..202cbd3f7bca4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp index dca2fafa6ce0d..5fcecea31d371 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp index aba296f123e17..64e5a4ae9a460 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp index 1e0afaf8a5f01..3f76856bb228a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp index 06d120b09c9b1..1054cc239afb3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp index afbdc2362c0e3..c4aad94da9ae8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp index e1d8e169f1c5c..77af92fecb80d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "ExceptionCheckingJniEnv.hpp" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp index 2b786563c2291..fb6cb99a5551b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "ExceptionCheckingJniEnv.hpp" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp index a3c0687774978..a81f6d7f65c84 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp index 7bffa508ebef9..f6ac93548801c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp index 5ce7b2d3da182..52d86335c1133 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp index 797bb765bb6ce..cabc1c43b6333 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp index 926e4f7075f93..db4b44f675119 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp index 9901cfa12a636..4682f1c40889e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp index 9535d3b3a32b1..5a486492799b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp index 79319560a5cff..8843c19d3388b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp index 0f98fd83c5e33..f0ce8965cdab1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp index e25fd5ae9de5d..3834e868a7bf6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp index fdb98860ff9ce..4b5c9e7d56f74 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp index 535b2327d326a..e9cc956557b3e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #define ON_UNLOAD_MARKER "attach050.on_unload" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp index f94f22b0dd7a4..0c1fc89de0114 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp index acdb9ca8554f7..49faf6b32b6db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp index 102ed9f2fa4ec..510eddb4b1d50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp index db68fe5966ad0..96ca8df0d17ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp index e90c5d55c7353..1c0152913d0ac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp index 86546abbf47aa..81b0a68267eac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp index ec7d197d5c700..2870eec7f499a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp index 1a0560a0bdda0..9d2a20d3eb713 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp index 434adaef20b86..fd0de631d3b67 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp index 8d869cd1b6ae2..4115a078c3a1b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp index cd151419af96e..21328b3be6d25 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp index 29bf4235a83f2..bd13e4ea6d57f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp index 7de7c31af7aee..8433c0cf36642 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp index 0002c8fbe35da..c3c70ee070d1b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp index ea87cba16526d..c3a91f338b7f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp index 888f61780ed8c..c155a06075f45 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp index 11d61d9529a87..e35eed1d1e7a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp index 61392981238d8..66e49496316ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp @@ -26,9 +26,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp index 56ae37574c63a..28766be6202b3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp @@ -26,9 +26,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp index 266bc453c7676..d3f37f0c65a89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp index ec6507b3bc024..a0089d51297c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp index b66aca80ea23a..bce556cbac852 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp @@ -27,10 +27,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp index b8e99da573d75..1d6e7a571dbcb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp index d0be4d73019e9..f065e61f086b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp index b4b12b10407fe..0a96421133acc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp index 0545fc7039b4e..61e002b9af7db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp index d2423fe3301c7..8b73fd6d6e5e5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp index 884e83ba8a04e..3a57006677bbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp index edbc92f419832..5c5a6a50b99fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp index 9ca8cc34fc7a2..6ea09a5cfdae2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp @@ -23,8 +23,8 @@ #include #include #include "jvmti.h" -#include -#include "JVMTITools.h" +#include +#include "JVMTITools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp index a69ec032161d3..e4c8dc2a3759e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp index e50350acedac4..1df20dcdecf03 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp index d8e8bfc3e0d18..970e4ff57c138 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp @@ -27,9 +27,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp index a9b4dead1e359..9e4d2d7f0f003 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp @@ -27,9 +27,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp index e612df344791c..792c326a96a8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp @@ -27,9 +27,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp index e562b8b72bb00..13de99039af9f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp index 2534ffa80cf44..3c0afdfb62d60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp @@ -24,7 +24,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp index f2e89cc81d2b6..e957529cc0289 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp index eabda28089b5a..5b24e64edcc5a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp index 474c55016cf34..9743c8f762d6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp index 081c792197e28..4dfb24d514034 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp index c2ce7fe19f857..7167631a5e433 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp index 148a2dcccdb0e..a81afef827597 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp index f55958517cb2c..fa03fb1b34f93 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp index d8c8f2b358d77..a41634ea25d11 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp index de920467f8323..e1b17bf64206b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp index 0b14d24ac7a6b..3cd333843308c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp index 287783525ef2b..90ece1bd2cefd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp index 7eb18c8da2bb9..f46e0bb13da5f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp index 785a7679c8900..43961c06bd122 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp index 8dfabd9c7ad6c..938c50a560661 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp index 83d38c0cde401..50e6207e57fa7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp index 6fbb6d3796045..e4327bdb890f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp index c6eb039972b5e..b0f1add000b52 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp index 88a4446a0b980..79e5d144d0d42 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp index 0496d0abcc83c..21334b3801b35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp index 7341e49aa5674..3716402cc10b7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp index c8c00f4a7a334..de562a2a2b999 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp index 233bad3418bda..cd698d4af9e20 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp index 3d12ad670d038..ceb349091aa90 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp index 6139cc546ca1c..2c60d39dc18af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp index f698634b82c0b..246823d67ea56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp index ff099aacac291..ba6b1a1974656 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp index 01f3a5c394448..666fa3e0db091 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp index 3a1066bb7441c..4958e015c3a75 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp index e93d85df63fc3..7e2d7d6f8f419 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp index 826a516e45fc2..cbb40a0df06e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp index 32fcc2ce0c203..cad70dfbd13c7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp @@ -26,8 +26,8 @@ #include #include #include "agent_common.hpp" -#include -#include "JVMTITools.h" +#include +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp index d6ba854ee16a9..b4735fe338c60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp index c8e81c2901693..d06c4a05339fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp index df020dd5b9566..6b52d237e76d9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp @@ -22,9 +22,9 @@ */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp index fb3f956a62877..e071724a97bfd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp index 9be1826fd8c56..b6fc95128d6b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp index 6e5ec876b3be4..385dbd2335428 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp index 9c31e486d1ba6..77b926f1383ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp index b41f512021625..cc967123c5cf1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp index 5d1120689f335..2ef792ba9a11b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp index 18465cc28f364..672a62b89464b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp index 3006880307bda..9a6fcf21e6588 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp index c6c7fc07ac574..0f035f3a84cae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp index cd245ce3f06e5..66945b246f8c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp index c919db0378626..e778581353ce3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp index b41a2908f7701..37e286d44938d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp index c3b2bbff3ae29..2193e5dc972f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp index 79ea2c4c09b8c..3502af000abe2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp index dd5411979e016..54612f3cb73b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp @@ -22,9 +22,9 @@ */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp index 8a65252fb4e36..cc320129a9896 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp @@ -29,7 +29,7 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" #include "native_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp index dabe15e4c2227..3d06018f5563f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp index 76d4f3454c6d0..b2a03a4a629bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp index 86851c63a1642..9592167e1cd3f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp index 3a8df96017afc..340d206a62c81 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp index 58cd7942bb883..43804aaffd578 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp index 5a678f31b4be0..813f15e4c3a55 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp index d0bc2e86440dc..c5ec07035f83c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp index 81ec0592821c6..672404c23b186 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp index 9eed04fac1861..8f4750437bd32 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp index 11a7734e77e5f..649f065ffa5a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp index b8892b42fa2f9..74d54ad0b5bd5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp index e714b0f944ed5..5b45b23b808e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp @@ -26,9 +26,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp index d3b8f364cf985..5c1de0b9b0e49 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp @@ -26,9 +26,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp index 8834d19950f0e..a716af1a686a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp index fcfde0cd4e49a..6d8aa8baccf13 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp index 42b0ed7d0e2d9..490d63ce6dc9c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp index 868107ff88706..837ef437bb82d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp index 15a54e906ba4e..833edd6e75ac1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp index 782e36b2f4d26..2dbb504ed1298 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp index 5637c579d9aa1..8572908762b82 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp index 81211b43e3bea..c5545532e4413 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp index 9d4cfe6a7618b..08191498d9329 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp index 194c28e6f6945..5d28fd33a8677 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp index 1385d46657984..e64e7a8007b73 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp index 2735f0ada71cc..885b354ce2544 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp index 45aa35c667992..b4540700c682d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp index dc062bc5b4f8a..c92d2802296d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp index e1dc46c8a4d90..6375403aa95d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp index 85b71b20585bb..eaf5c9668dc89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp index 721b426be6797..252e3e9a93436 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp index 7cd36918e562b..a18c3d8a76e74 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp index dd1d354e43b53..d1cd112943037 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp index 1496bc7910da5..c01b9d694389c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp index 5ee86d9c3866b..3837e255809b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp index d486e1d141368..5f7ada614e861 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp index d1c9557cbd168..d1c7566b6afbe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp @@ -22,9 +22,9 @@ */ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp index 0d51f44f2b1dc..d1d8443b921d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp @@ -22,9 +22,9 @@ */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp index 64c866b92088e..daddc8a20a4eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp index 354e50bc141cf..58b8a0195ef76 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp index 6599bf20bc347..033313e17ebb2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp index 314098d028d19..5763103ac18f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp index 02301c7199526..bdaeed82f6d90 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp index 2229193e5fabf..b5c387546ea5f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp index a7323e32292f3..2f7cbe7a56d4b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp index 387712096989a..da45f7748d2b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp index 793f48de414e3..fa51345a148d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp index 8e8a5e99c6dac..652e04171ffdc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp index af448621abbb1..885bb264551fa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp index 766526aa33dfa..e74f57b3b46d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp index 903b115279bab..aa1757f0e3e56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp index f930bf52c54c7..938ae04ceb17b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp index c63821397b923..a7d741c4263bd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp index ea01150c0a166..6e823d230aa56 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp index e51402902469f..c578a8df9cddf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp index f272e46c7f2e9..7ea27fdee6f89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp index 098b52e56195f..79254fcfe542a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp index f77aa5f86c60c..3f50ec721ccc2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp index 40ac8d8e76ee3..9d53767b3ac36 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp index f74230b02cb5e..624fbdd079106 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp index eba1d765b889c..2a0ab2e71f595 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp index 84d1ac9656584..78ac1fa445ac8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp index cfcd357494239..f413d63bd769b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp index ac5cf26ac1ec5..9f9affc6722f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp index 36cd52f7d9a29..c29d495c1f80d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp @@ -24,9 +24,9 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp index f10cdc8be50e0..7976427a24ad5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp index 6ed9d0b1d1408..8cee41638d2b0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp index 1f8107c2bc0d7..5babeef578777 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp index 6adc02ee24f09..2ffd6ca0e9a04 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp index 236c1bd4d2ce0..6287e5846a25f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp index d1652883251a5..c014249ed4dd0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp index 72693d57bc458..500d16405e67a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp index 3ed9ab714c8e0..6c8dd65b0d16c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp index ddac43299c6a9..0d7aeb1f4c308 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp index a803ae21f6850..e30eb3a0ab312 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp index 6866aed4e1162..ae2c3106344f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp index 7c3ee2aa16d78..dc2a5c3a0ba76 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp index 5c7687422e45c..975e677bd1d2d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp index 37cbd1f1e703c..6e92cfc8a22df 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp index 3c0d39b7c3ebd..d3858cece5135 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp index 4b27c06522fee..d0fda690c1440 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp index dfdeeb0f6b9dc..5655bca5ffcf5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp index 2932b30ea06d0..3639386f737cd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp index 8f7a49e2093df..9f0600104ced9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp index 2fb127ec7f817..1ab2a4c3ba71d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp index 5db17bbefb5f5..5c77f2f52dbae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp index a7c14847c9248..b77258c773a62 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp index 8e4a64c550529..23da29f1867da 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp index c727dbf39f6e7..c025d8cbb8027 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp index 94ac9c3a928b9..935b64104cb52 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp index 27197a3851dee..7ed00c2580ff5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp index 6208a1ad2a1bf..3b75957914746 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp index ce883701a36af..ccdd97a431ae5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp index ecb4044dabb35..ff90ec1b0badb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp index d16ce2a8402d6..5e74b8b607fee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp index 52a0bd1f18370..727b1046245e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp index c40edc647fb75..236094b501599 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp index 00816ce7e16db..d091687f4921b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp index 5a11a7f1b5217..9b9d14603a778 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp index c49934795f9fe..30956305257eb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp index dd019e5b92541..7df6157b375c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp index b155ae5ee0a86..334937d3d04fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp index c1db6f2d110da..3ab2c7511877a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp index 0e9eb749ca3fe..4115c60d228a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp index 8fae6f47a5cdd..37e3af0c68915 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp index dbb2c0ed3cdcb..eec81b91cb118 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp index 1930030ed1f08..333cd0298c44f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp index 5e08ff0162411..d389b12398772 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp index a3f577526a386..22a1a22737746 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp @@ -27,10 +27,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp index 114a610bbb33a..462feb7b41669 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp @@ -27,10 +27,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp index 38d8242fa7dc8..9b8381e9dcb73 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp index 0e0da876c432c..401a53d8026de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp index bdfad4808d760..7d9726a2dbf7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp index 400927f0a2796..642324f87b4fb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" -#include "jvmti_common.h" +#include "JVMTITools.hpp" +#include "jvmti_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp index 0a067071f0e9e..a4143f14e2a43 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include -#include "JVMTITools.h" +#include +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp index c00e5b7e55db8..154e70e3c164d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp index 55764f61739e0..a2e9716a51387 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp index e1e8aae15209a..209cd2be05e8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp index cc68e67e1aa2f..faa4318f140a1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp index 2068d1869ee23..b9a8b431037b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp index ee761aafe12ff..0a61c485a6592 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp index f0e8c91211b68..4f02bc3fa5867 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp index 1be27f432ae81..3744dd9d43647 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp index 138eae8cd490c..4ebdbf2eb925d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp index 364cbfe60b0ad..8fd60c1312118 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp index c5cd25185ae24..50f4eeb447751 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp index 00d5d55675ad9..12da226126f20 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp index 5ada5c195bb57..70f1f8f2db10a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp index 253049d638553..fd056d74efa61 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp index fa51be46dbd35..e727177607ebe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp index eca766f29e90e..f5a5ff41f05cd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp index 26475eb47a784..65258a6811b47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp index 2ca2a2043a393..822fd63dfb66a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp index 4c4d9001b37ba..0415de825f905 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp index 05b1576eb6662..7da2cd4254557 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp index 30cfeae544e1b..01f5810b3a7c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp index e20d7f8dac375..4cce57edcf810 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp index 6c2481f5c65a0..05237468940de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp index ed7e3cc2cdaec..37a206965e183 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp index ed6b16379ef0e..e81e7266d2321 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp index 91d46a1c18cda..76f2738212323 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp index 02e24a5f2750a..b09490f3fa643 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp index 9c142b28ea19b..0d407dee86c5b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp index 98f506bc46efe..54f3d45678499 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp index 08712cef641c0..e709de40e0df6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp index f4965cb55c9cc..d45bea4d043b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp @@ -24,9 +24,9 @@ #include #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp index 0bc8942c7e511..c19fd9113eb2e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp @@ -24,9 +24,9 @@ #include #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp index 77d36e05fe817..86af7ae9a5899 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp index 15bf054e20c54..57f12dc83fcc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp index 262c50d3ea706..565b3a02f0080 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp index bd7274c35c281..8c03608f480ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp index 50dbc52e3dd6a..a8abe779bba39 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp index 0863ac1e41a52..ed6a20429f5ea 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp index 61749ca62ce7c..45d6bb234afcf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp index 5ad518703c60b..36396b4c2cfc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp index a676b9441332a..e38de4903f308 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp index cf936f71a0329..7a47e55699cee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp index 7a076bc3dd67f..0682eaea6c53e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp index 898100512106e..77908ed149974 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp index f3fc7f4b3e3fc..044f23c623531 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp index f904e7b278dab..d8ca1cbf4ea9c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp index 5388dfd68bd07..5f431995812dc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp index 0fd0fe07dd1dd..233818a21da39 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp index 242f2c5003d85..93aa706a9cd76 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp index 96f54156016a5..d9bb42e875668 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp index b67124fadf273..becd61705c66f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp index 78bc6e5dbcc20..a008e284bfdb3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp index 9bdefdd07a870..91a61032a7746 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp index 6a601f97f23c0..451480cb7f040 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" -#include "jni_tools.h" +#include "JVMTITools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp index 8072b360fa589..934e483da1de8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp @@ -28,10 +28,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" #include "native_thread.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp index 30f9aa6f6474a..d2b4b720c55de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp @@ -28,10 +28,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" #include "native_thread.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp index 91a3c8a571488..35505044ef188 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp @@ -28,10 +28,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" #include "native_thread.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp index 4acbf125cc9a5..af250e1e40a00 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp index 394c2c60d1a90..34cb1e8615c9a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp index 5f47cd01b954d..8ed84ee549e94 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp index 63fce380e23b0..43cfad13c6437 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #include "agent_common.hpp" #define PASSED 0 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp index 86f20a8cfc7bf..435232d367cf1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp index 947e4fa8db66c..7bc34d71bdc5f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp index b75ce98d039d7..3a2374199d948 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp index 9438fc45be641..0461cc52f85af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp index 65e46b4f0dede..c5801d24e79f2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp @@ -25,8 +25,8 @@ #include #include #include "agent_common.hpp" -#include -#include "JVMTITools.h" +#include +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp index 72408ffaeb1ea..cda8481533dbd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp @@ -26,8 +26,8 @@ #include #include #include "agent_common.hpp" -#include -#include "JVMTITools.h" +#include +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp index 0ed219b0ad391..6d400b7df2978 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp @@ -26,8 +26,8 @@ #include #include #include "agent_common.hpp" -#include -#include "JVMTITools.h" +#include +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp index a354f0d8a9d7f..60248189773b2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp index 574b873d07d23..8c0ea9be4a064 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp index 1a2db084ff121..61d1729e542a0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp index a5672997c5030..835ae6d9ec085 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp index e678a85bb8056..117bc4f12e544 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp index 07d64f0beeaf6..ece5a09fea456 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp index 3256f1fbac4d5..1cd65eee9cda4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp index 47208a1e90c84..db43f5675ff8d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp index 328f0689b8be0..6244dec42e55f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp index ba252ee1bc8b4..f870c0a0deb6d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp index eeb27146ac69d..e907967a2fad3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp index 06a0cc4cff73a..1f7e06b04a719 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp index 909d72160b8d2..f35f623e66bd1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp index 3b38cc613d360..daf2ffdc6fbff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp index 955a0aa9759ca..fd54a60fe5ab3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp index c672c74285ee1..ec1e3d2127691 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp index e6c59c75a0646..57286ce78a02b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp index c2e4247a075f1..557412d70511b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp index e89c1d863cfb9..f77a95c81d07e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp index b5c1e94467267..c6f7bc9ddb107 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp index 43339333c46bb..7222d2a73c6d2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp index 1ebd4b716f815..defe0959f1640 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp index 1f55e593b1449..28851bc683809 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp index 93ca7c9ddb3a9..02ed16ce34708 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp index b35ceba30fd66..5bfcbe73a4e38 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp index d5c6d480168f6..af545b823b4d2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp index cf095d556e848..8a18391a713a6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp index 7caea17a87a54..18191588a47fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp index 97e3ccef0ae8c..2fdb6e3193f8e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp @@ -29,7 +29,7 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" #include "native_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp index e566e1f2e2cfa..6d296ec531f80 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp index fa51baa5f9c36..8193058eba76d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp index d1fb791ff42b6..1a7b412061c65 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp index 91720a49896a0..793f22ec40fc7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp index 9442c03be873a..37598107c455c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp index 2d2cbbc3d1f95..61420296b65f7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp @@ -25,10 +25,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp index a667badf60347..2749d15d07037 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp @@ -25,10 +25,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp index e491f439367ee..75b4fe2affdff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ #include #include -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp index 1af7de39bb86d..eef3388696e33 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp index 73fe3e52e3e88..856e4208ee106 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp index add34f000e96b..e5929d5152a7a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp index 995c7c46a7500..83e28a9b1bac1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp index e8be6f316a310..c59b256bb1ad7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp index 867903f8d5dec..375378687e36c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp index 12d64b55a65b9..5582151a25707 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp index 9393cbddfa158..9d134e0a3c3db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp @@ -22,9 +22,9 @@ */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp index e757611384d3e..16d88f7b891c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp index 1f3b64724c367..487b1b2f01231 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp index c6068682942ae..e340c488d6283 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp index 0027d2dd2f3e7..01145556a9549 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp index f4b5d30751bb8..bd3226739f758 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp index fc71cd8b2f817..4a5817c25de55 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp index 2f7f69f9123d7..2868fbf543966 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp index 3b581a966716f..9f692a799ac8c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp index d4fc26dea45db..4e22da84a5d52 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp index 427e107dc3244..b0795077bd2b1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp @@ -27,10 +27,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp index 541144c454624..11f3f63751e98 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp index d24cf193d157f..e50e1ff537bc9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp index 163e4d40cd000..e9eaf32a6bc79 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp index 7e36fb72bb63f..dd983b0e918ab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp index dab0d59e47516..b596cdda2d37d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp index 2c56f5f642395..4d233dcab4fbb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp index b02a3269b87c6..3378d8368860f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp index 9f61e8857ffce..d720267675cf3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp index 64c4660160ddd..d44092febdd24 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp index 1cda6ecdd5607..9986c6b191aec 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp index 38cd09ba78b40..aa429f46bafbe 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp @@ -26,10 +26,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp index 3d74fa547cb2d..cfa75bb2f3de3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp @@ -26,9 +26,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp index e2141b0f58cbd..b47b4c6a76e66 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp index b55e20c7894fb..2f5e46f7ec7af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp @@ -27,10 +27,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp index bdd53e1837813..6b3df432d5e64 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp @@ -25,8 +25,8 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp index aa9ce5eaa0eba..71b8b62e9da25 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp @@ -25,8 +25,8 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp index 07ee6e76074da..ea558bc0cd4e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp index 049a9e65cee83..403c199c8d53c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp index ee6b8772a58ca..dddc47377caf0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp index d9d5ee8b1f2ae..e681eeaab9b80 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp index c40934a0c7801..17733d4ba54be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp @@ -25,8 +25,8 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp index a52aa847985a8..7845cac208607 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp index e3cd8b665d5cf..c45392500e5a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp index e96b34d137d9d..02d50b4819cd5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp index 48716fa95c005..570c12f70736b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp index 2e56ba954e267..ae806ed9cb78f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp index 43c816766843d..2bd741729022e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp index 65f24b3f63cbb..6c6e1b9d7e22c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp index 0dd52d8b193b7..8348698b2bbfc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp index 97444e7fd2256..eb843879ceb78 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp index cecc241a1ba6f..507012417c5d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp index 5c3ad40d1dbc3..d3843d9fbfaf2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp index 5d0c3b148ffdb..c72f4ecacd341 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp index 8fbd33e0d701e..7edbd56f44460 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp index 701c63e31113b..5abbc391dbb3f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp index adc36f958cde8..a1c2d71289220 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp index 4f4b712164fd9..40728346f183a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp index 3182e7f571ad4..f43dae8772fe5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp index f544f313772ca..380a551624337 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp index 3690b7f06f912..5e55adfa63d65 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp index 5034bffae00e8..0eea0f25f8f2d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp index a212fe4a479bd..72148eafcc08b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp index d39cfe885f8fd..f9f5516fd96e7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp index 2c4aac9742a6c..67cd9ddd9761f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp index aa27937496601..a720b90c1f233 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp index a6312dda8ab56..39779183c0401 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp index e2d2598b71754..ff7d346d237a1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp index d9f85f9620b85..11c74e3a9e2c4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp index 5b92f93cea39e..80117ea70fd91 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp index b60f302cca46f..9680d01847ab0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp index f69c15276ebb9..cfc70e44e9613 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp @@ -25,9 +25,9 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp index 9aea4163380cd..7a65d9f04531f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp @@ -25,9 +25,9 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp index 08c09ab17e2ae..06bdd4c66b0f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp @@ -25,9 +25,9 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp index 913a37fba4d23..947d6b9b178a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp index 574410aa9aa10..88fb29e9c175c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp index 80b1522d93ca0..d852ec2df2cf6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp index 9f26e4e59b784..1a502487fba7c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp index 5510e29e6f8ae..1c6ccd985206e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp index 6d747f378bd55..a288a75a5edcb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp index f185e39b02211..4d4b73b12a638 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp index 2b89909c1e093..1e52bd762c5d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp index 228d82a00e8f3..a1cb6acec4f8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp @@ -25,9 +25,9 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp index 08c898a83cf43..24873548a07e3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp @@ -25,9 +25,9 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp index 6d0d2c67ce805..402ffd638efad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp @@ -25,9 +25,9 @@ #include "jvmti.h" #include "agent_common.hpp" #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp index edbbf37b1a567..a7244db34418e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp @@ -25,9 +25,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" #include "nsk_list.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp index 3a67969199ed6..191bdcde96096 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp index 6e074572d6d44..aa4563349c012 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp index 47ddac0778137..c1616e864edc5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp index 04a06839b7570..d2f3a2fde3cad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp @@ -24,9 +24,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp index 8d5acc3508bf5..86d5f5de9f747 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp @@ -25,9 +25,9 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" #include "nsk_list.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp index 29715cfa43a13..e9325b6342c4f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp index 9828e1eaf103c..f8549ba4c87d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp index dc16e3e7f6311..2a0116d3e55e1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp index 9fb579b8c093b..55c5fb89816bf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp index 01b60923c1fa7..3d84b69adca58 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp index efe58cf62f906..db242bd71229e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp index 05a1cda01c2fa..54b73e891b054 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp index 34ee8dc6d37df..4a5de9ea92ee9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" #include -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp index c4341c689a760..1dc0396299a7e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp @@ -24,8 +24,8 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp index c7e10f6f8fea9..f83a51fa33f4b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp @@ -24,9 +24,9 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "JVMTITools.h" -#include "jni_tools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp index 652a12f1b0e20..ee5110638262f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp index b2a2ee5e193a4..62033fde30b4a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp index c515a96022fc3..6c6caa033c343 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp @@ -27,10 +27,10 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" #include "native_thread.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp index 2be9d32adc06d..e3f15e233fb27 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp @@ -24,8 +24,8 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /* hs202t001: 1. Set breakpoints in several methods when Object.wait(), diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp index 681e8bb2912d5..f081ff0f030bc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp @@ -25,8 +25,8 @@ #include "agent_common.hpp" #include #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /* hs202t002: diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp index 81c2c75902a5e..467d6cf01cbc1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp @@ -25,8 +25,8 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /* README ****** diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp index 8bfdb52947d62..d263186114ee8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp @@ -25,8 +25,8 @@ #include "agent_common.hpp" #include #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /* T002: diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp index 2a5247c443723..7c59a16a53593 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp @@ -26,9 +26,9 @@ #include "agent_common.hpp" #include #include -#include "jvmti_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" /* hs203T003: 1. Set FieldAccessWatch, FieldModificatoinWatch for a field. diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp index 768f8f04b7d19..a2023f7f546c1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp @@ -26,9 +26,9 @@ #include "agent_common.hpp" #include #include -#include "jvmti_tools.h" -#include "JVMTITools.h" -#include "jni_tools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" +#include "jni_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS203/hs203t004/MyThread" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp index 3084cebfc3df4..3b8be254638e8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp @@ -25,8 +25,8 @@ #include "agent_common.hpp" #include #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /* *1. Enable event ClassPrepare. *2. Upon occurrence of ClassPrepare, set a breakpoint in class static diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp index 67e089572f47b..46f5f784bddb5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp @@ -26,9 +26,9 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp index c4f00877c0b07..1db6093dde7a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp @@ -25,8 +25,8 @@ #include "agent_common.hpp" #include #include -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /* 1. Enable event ClassPrepare. diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp index 4018f41594bb6..3a93a57f2243a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp @@ -25,8 +25,8 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t001/MyClass" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp index ddcd2baabd16a..135993fa0cf18 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp @@ -28,8 +28,8 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" -#include "jni_tools.h" +#include "jvmti_tools.hpp" +#include "jni_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t002/MyClass" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp index fc5aafdb3d8f7..785b53157d7e3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t003/MyClass" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp index e6f863497da00..59c27c244b036 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t004/MyClass" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp index d8847b27009cb..ff3bbce6a1557 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp index d00def9b2ba6c..67a37e4b27f25 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp index 91739e8ff588f..173f97cd410b8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp index b1ac4467c9b9c..3f9f8cc5c8f6b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp index ad02fce9e72a5..e9ab190b9f95e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS302/hs302t004r/MyClass" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp index 87d81ae74e449..2e794561cb76c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp index d1c1a025e9f75..885c2bf291087 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp index 4de6976d2c8b0..036bedcf9ee47 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS302/hs302t007r/MyClass" #define CLASS_NAME "Lnsk/jvmti/scenarios/hotswap/HS302/hs302t007r/MyClass;" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp index 3e23cf7ba9265..d30b767cddcbd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp index 3d19429f21901..18c51111f4232 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { #define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS302/hs302t009r/MyClass" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp index b491692909ad2..cab1f02215ef1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp index fcb438194fd01..bd3756b149360 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp index 964cdff2a0258..b384834f022cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp @@ -24,7 +24,7 @@ #include #include "agent_common.hpp" #include -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp index b6479f44c622c..018b1c7d7534c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" -#include "nsk_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp index 853c44c5e090d..927aa19974bc6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp @@ -28,7 +28,7 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp index 2cbca0d623df6..297a94aca8ec1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp @@ -29,7 +29,7 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp index 5679f0988d64a..bab6880c5c014 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp @@ -29,7 +29,7 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp index 8e62b3d247cd7..94cf69dab5150 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp @@ -29,7 +29,7 @@ #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp index 337f0148310a5..550a29158bf4c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" #include "native_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp index e0fb28cba609b..83a32bb2e4cca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp @@ -29,9 +29,9 @@ #include #include "agent_common.hpp" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" #include "native_thread.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp index ef9bf83c999b7..01fd4b40564ad 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp index 6e0c854a7b1a4..cc77d601568c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp index fe03af1019952..b4c638460f5d7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp index 8b22aafec9ae4..fbe59eb4ba758 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp index fcfedcc7e72ac..a09722b7b40a2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp index e41e93480c58d..d75b0da0f0cfd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp index 626f0ed66fbaf..d9cedfaa4fdbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp index 5936b57c75e2b..9b60f2a125822 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp index ce4c180980e1f..52459a7994fc7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp index 602fb4f251b2b..7f716d009ce85 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp index c39f53eac43f6..cf4a492372d43 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp index ec4fcc562ed6a..5345b56cba593 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp index 4cbf1f75f038d..45d968d4c7edb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp index 817cf517fcd75..1f4d927eff5f5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp index a4a2965841993..75edd25bcbd9e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp index 6239ed7d52080..a58f6b4142217 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp index 7912d69f506b4..1d64b011f6c4b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp index 848201dcd307c..0f8a27bd50ed3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp index a20cba6757e2d..97a71e18c407a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp index 7e9eb9e5f6ac2..b2b75ec12db08 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp index 9bd9c987070b8..d20b710a9429f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp index 381046c0f3df5..8b0b1d7da03fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp index b33421ef0e1a1..d5e3316b846cc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp index b9d9f2ee31931..0ac0b4f3ec021 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp index 484b687ee3424..cd1ac4209e646 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp index 488f0d891ec42..2bb125adb1b79 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp index 96c9fc36c9ff7..8db5995868e06 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp index 3e5bdf5ab28d9..66d16ceeb47cb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp index 757b44162d295..ace612850aa60 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp index d937a3ec9eb0b..1573873a9ff35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp index 5bd1addd5fcef..2c6a186656e61 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp index 52fc30cfd7445..3fca05a0c902f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp index 1f574b9ee9d37..6df71ba2da93f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp index e637f87858488..02945011bedd9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp index 4ad797aac232e..9479471a95a72 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp index c21c87c91b886..45f156675fbac 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" #define PASSED 0 #define STATUS_FAILED 2 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp index f481d4270bff1..40db16504b644 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp index 8593c4a8134b4..cb98f6998914f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp index 0036869e8cdf6..5bc99822347c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp index 3fb2ec897066c..e727438b67a9a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp index 9ac6413e3926f..25648754de495 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp index 439390bf636cb..7068025eef012 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp index eaab8e807812d..d9f1e6faf27fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp index f22f7175c1ad2..0445c1992981d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp index 6b4d3e3596a14..0f7298ff7df0d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp index c97ae1a11f65f..410c77ebd263e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp index 404d43bc1c1a0..caadaf2946028 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp index 36a45499ec25d..3c297299f6a6c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp index 14191b8fb4813..b4a0f2e924cef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp index cb71f4591802c..a84073a595bef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp index fee9803fbc108..cc2811d520dc3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp index 96c53b203e453..7210f4aef2e69 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp index 1b331e68a8a5b..0f92263796c98 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp @@ -23,9 +23,9 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "jvmti_tools.h" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp index 974e5ecc51cdc..ff431aa2203e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp @@ -25,8 +25,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp index 5730b83d18a85..6366b430776c9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp index f6d28a95b596e..cb0385ee6535b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp @@ -24,8 +24,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp index 9e1d672eb34cb..e73534de8b6b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp @@ -24,8 +24,8 @@ #include #include #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "jvmti_FollowRefObjects.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp index 7045039968905..333ddcccf831a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp @@ -23,8 +23,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "jvmti_FollowRefObjects.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp index 824247d8ff1b2..54485fb809ae2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp @@ -24,8 +24,8 @@ #include #include #include "agent_common.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "jvmti_FollowRefObjects.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp index 2c849c3376d69..47b9618d19c88 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp index 94ae952aa6b50..9a0ce3d85508b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp index 8be8483a1cdfe..feb51d5fc407d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp index 7f6bf7bfc4870..170d6839bef09 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp @@ -24,9 +24,9 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp index 7b615acb8681f..6faf82f9ed90e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp @@ -26,7 +26,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp index d1b5d1f21d226..6ebb50026a34a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp index a85e30bc10adc..4919d27e9e7c7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp index cb0464b9bba22..c1f0443186f20 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp @@ -24,7 +24,7 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp index 617f94696ba93..997e6c667e60a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp index f9c4fbb406540..d54f2d838d6e6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp @@ -28,7 +28,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp index 17dbc710818a6..684444de335ff 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp @@ -24,9 +24,9 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp index 75428b875a028..b2d92e6a44484 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp @@ -24,9 +24,9 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp index 7c7a93f45d2ec..f0a3ae3739c95 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp index 7c1d5e1ba452a..3fb998ebade67 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp index 1d4dd96fb111a..1dc9202a73123 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp @@ -25,7 +25,7 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp index 5454563c443cc..a0b807e7d1d5a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp @@ -25,7 +25,7 @@ #include #include #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp index 22d0c0717be59..0772a387a3218 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp @@ -25,9 +25,9 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp index 4a0265c8c9388..b850edd75b07e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp @@ -25,9 +25,9 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" -#include "JVMTITools.h" +#include "JVMTITools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp index 8aacce1a3993e..8743b6c0ec5bb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp @@ -33,7 +33,7 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" +#include "jni_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp index e6db341b3f9ee..6491f3e668625 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp @@ -37,7 +37,7 @@ #include "jvmti.h" #include "agent_common.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp index 3e46cc2536801..1f3f3a019bf0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp @@ -23,7 +23,7 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp index e5fbc02b46d80..90fd4df97e6c7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp index 5c9a22e24649c..c45fee989f702 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp @@ -21,7 +21,7 @@ * questions. */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp index 604b0620c5b9b..0b208187d9788 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp @@ -21,7 +21,7 @@ * questions. */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp index 6926c8f712e54..5c7a335194324 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp @@ -23,7 +23,7 @@ #include #include -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp index 59395c6fcf6ac..9c33f5c7797b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp @@ -34,10 +34,10 @@ #include #include -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp index b3b076b2ef76e..7f622c24f75c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.h b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.hpp similarity index 91% rename from test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.h rename to test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.hpp index 335720c01b63d..f56b0eba757af 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.h +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * 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,12 +20,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -#ifndef NSK_SHARE_AOD_H -#define NSK_SHARE_AOD_H +#ifndef NSK_SHARE_AOD_HPP +#define NSK_SHARE_AOD_HPP #include -#include -#include +#include +#include extern "C" { @@ -76,4 +76,4 @@ JNIEnv* nsk_aod_createJNIEnv(JavaVM* vm); } -#endif /* END OF NSK_SHARE_AOD_H */ +#endif /* END OF NSK_SHARE_AOD_HPP */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp index 2ad70dfe076fb..5b3978fe7684f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp index 1feb98d9ef5cc..fa11c9e79c90c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp index 9c6231a0a1602..28967200f94e8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp index 773ffc533a118..2c42700e27efa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp index e24138792fb6b..1ee47059d6140 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp index b863984f9ac57..e0efd81f8401d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp index dae07c708db84..265a7333ae313 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp index 2b03591a7098f..bbc4cb2406488 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp index a8049b2bea9b4..df3c98f7e31db 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp index 4bbbef6e204ed..d141f6d854471 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp @@ -25,7 +25,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp index 127322728a53f..005954d0fbc43 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp index 0fb552a8b0354..9478e72eb436f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp index f4c35b20d90e0..6d1986f533ef1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp @@ -24,7 +24,7 @@ #include #include #include "ExceptionCheckingJniEnv.hpp" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp index f85bbeeda1872..5988e55ad7986 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,7 +21,7 @@ * questions. */ #include "jni.h" -#include "nsk_tools.h" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp index ca3e5dfff742d..65f087dbcd661 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp @@ -27,7 +27,7 @@ #include #include "ExceptionCheckingJniEnv.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" namespace { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp index 50b59a157e9f1..21285d328255f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp @@ -22,7 +22,7 @@ */ #include "jni.h" #include -#include "nsk_tools.h" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README index 0da5b5704394c..ab76d94ab92b7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README @@ -1,4 +1,4 @@ -Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. 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,8 +25,8 @@ This directory contains source files of testbase_nsk JNI framework, which provides support for JNI tests and accessing JNI environment. Source files: - jni_tools.h - jni_tools.c + jni_tools.hpp + jni_tools.cpp Naming conventions: macroses: NSK_JNI_* @@ -34,7 +34,7 @@ which provides support for JNI tests and accessing JNI environment. --------------------------------------------------------------------------------- -jni_tools.h +jni_tools.hpp Provides functions and macroses for invocation of JNI functions and checking JNI errors and pending exceptions: diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp index 2f5a5ff3bc058..c6059e18a4975 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp @@ -40,8 +40,8 @@ /*************************************************************/ -#include "nsk_tools.h" -#include "jni_tools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" /*************************************************************/ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.hpp similarity index 97% rename from test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h rename to test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.hpp index 07153e9cdd44f..f8f74d152adef 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * 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,11 +30,11 @@ /*************************************************************/ -#include "nsk_tools.h" +#include "nsk_tools.hpp" /*************************************************************/ -#include "jvmti_common.h" +#include "jvmti_common.hpp" /* printf format specifier for jlong */ #ifdef _WIN32 diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp index 56466d9a651fa..bc20d23041a83 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp @@ -24,8 +24,8 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp index 64df36a6102e7..2cf7d1f44ca35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp @@ -24,8 +24,8 @@ #include #include #include "jvmti.h" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "agent_common.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp index cbf680175e7cc..ee61ed71232e5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp @@ -23,8 +23,8 @@ #include #include -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "Injector.hpp" /* ========================================================================== */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp index 16a02dfc2a4b3..e80d70d4f232c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * 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,5 +23,5 @@ #include #include -#include "JVMTITools.h" +#include "JVMTITools.hpp" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.hpp similarity index 82% rename from test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h rename to test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.hpp index e51d9ab91c1db..b38cb64a36ee1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,11 +21,11 @@ * questions. */ -#ifndef _NSK_SHARE_JVMTI_JVMTITOOLS_H_ -#define _NSK_SHARE_JVMTI_JVMTITOOLS_H_ +#ifndef _NSK_SHARE_JVMTI_JVMTITOOLS_HPP_ +#define _NSK_SHARE_JVMTI_JVMTITOOLS_HPP_ #include "jvmti.h" -#include "jvmti_common.h" +#include "jvmti_common.hpp" -#endif /* _NSK_SHARE_JVMTI_JVMTITOOLS_H_ */ +#endif /* _NSK_SHARE_JVMTI_JVMTITOOLS_HPP_ */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README index 52e7ca3d31cb1..bc8a50afea693 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README @@ -25,13 +25,13 @@ This directory contains source files of testbase_nsk JVMTI framework, which provides support for JVMTI tests and accessing JVMTI environment. Source files: - jvmti_tools.h - jvmti_tools.c - agent_tools.c + jvmti_tools.hpp + jvmti_tools.cpp + agent_tools.cpp Injector.hpp Injector.cpp - JVMTITools.h - JVMTITools.c + JVMTITools.hpp + JVMTITools.cpp Naming conventions: macroses: NSK_JVMTI_* @@ -39,7 +39,7 @@ which provides support for JVMTI tests and accessing JVMTI environment. --------------------------------------------------------------------------------- -jvmti_tools.h +jvmti_tools.hpp Provides functions and macroses for invocation of JVMTI functions and checking JVMTI errors: @@ -135,7 +135,7 @@ or with saving error code: --------------------------------------------------------------------------------- -JVMTITools.h +JVMTITools.hpp Provides set of functions which convert JVMTI binary data to a null-terminated character string: diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp index 35b162dd26c3b..f313b6450dedb 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp @@ -24,7 +24,7 @@ #define NSK_JVMTI_AGENT_COMMON_DEFINED #include "jvmti.h" -#include "../jvmti_tools.h" +#include "../jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp index 0f4dc828d8beb..0b43e5ac7828d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp @@ -25,8 +25,8 @@ #include #include "native_thread.hpp" -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp index 9e34051da3430..d6d090d01b3e4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp @@ -23,9 +23,9 @@ #ifndef NSK_SHARE_JVMTI_AOD_HPP #define NSK_SHARE_JVMTI_AOD_HPP -#include +#include #include -#include +#include extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp index fdc94900d8868..b47be9bb74acc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp @@ -24,8 +24,8 @@ #include #include #include -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "Injector.hpp" #include "agent_common.hpp" diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp index d9e5c494474fb..497fd4f913256 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp @@ -23,8 +23,8 @@ #include #include -#include "jni_tools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" #include "jvmti_FollowRefObjects.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp index e07c453fd0e33..83ac3855b45f3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp @@ -33,10 +33,10 @@ /*************************************************************/ -#include "nsk_tools.h" -#include "jni_tools.h" -#include "jvmti_tools.h" -#include "JVMTITools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "jvmti_tools.hpp" +#include "JVMTITools.hpp" /*************************************************************/ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.hpp similarity index 94% rename from test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.h rename to test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.hpp index 31eac28615801..4a3d3e7bf4f6a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.h +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * 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,9 +30,9 @@ /*************************************************************/ -#include "nsk_tools.h" -#include "jni_tools.h" -#include "JVMTITools.h" +#include "nsk_tools.hpp" +#include "jni_tools.hpp" +#include "JVMTITools.hpp" extern "C" { @@ -81,7 +81,7 @@ int nsk_jvmti_parseOptions(const char options[]); /** * Creates JVMTI environment for the JVMTI test. - * If something fails, complains an error and returns NULL. + * If something fails, complains an error and returns null. */ jvmtiEnv* nsk_jvmti_createJVMTIEnv(JavaVM* jvm, void* reserved); @@ -102,19 +102,19 @@ int nsk_jvmti_init_MA(jvmtiEventCallbacks* callbacks); /** * Returns thread object associated with agent thread.. - * If something fails, complains an error and returns NULL. + * If something fails, complains an error and returns null. */ jthread nsk_jvmti_getAgentThread(); /** * Returns JNI environment constructed for agent thread. - * If something fails, complains an error and returns NULL. + * If something fails, complains an error and returns null. */ JNIEnv* nsk_jvmti_getAgentJNIEnv(); /** * Returns JVMTI environment constructed for agent. - * If something fails, complains an error and returns NULL. + * If something fails, complains an error and returns null. */ jvmtiEnv* nsk_jvmti_getAgentJVMTIEnv(); @@ -170,14 +170,14 @@ jint nsk_jvmti_getStatus(); /** * Finds first class with given signatire among loaded classes. - * If no class found or something fails, complains an error and returns NULL. + * If no class found or something fails, complains an error and returns null. * On success creates and returns global reference to the found class. */ jclass nsk_jvmti_classBySignature(const char signature[]); /** * Finds first thread with given name among alive threads. - * If no thread found or something fails, complains an error and returns NULL. + * If no thread found or something fails, complains an error and returns null. * On success creates and returns global reference to the found thread. */ jthread nsk_jvmti_threadByName(const char name[]); @@ -223,7 +223,7 @@ jlocation nsk_jvmti_clearLineBreakpoint(jclass cls, jmethodID method, int line); /********************* Events management *********************/ /** - * Enables or disables all events of given list for given thread or NULL. + * Enables or disables all events of given list for given thread or null. * If something fails, complains an error and returns 0 (NSK_FALSE). */ int nsk_jvmti_enableEvents(jvmtiEventMode enable, int size, @@ -258,14 +258,14 @@ int nsk_jvmti_disableNotification(jvmtiEnv *jvmti, jvmtiEvent event, jthread thr /******************** Access test options ********************/ /** - * Returns value of given option name; or NULL if no such option found. - * If search name is NULL then complains an error and returns NULL. + * Returns value of given option name; or null if no such option found. + * If search name is null then complains an error and returns null. */ const char* nsk_jvmti_findOptionValue(const char name[]); /** * Returns string value of given option; or defaultValue if no such option found. - * If options is specified but has empty value then complains an error and returns NULL. + * If options is specified but has empty value then complains an error and returns null. */ const char* nsk_jvmti_findOptionStringValue(const char name[], const char* defaultValue); @@ -282,13 +282,13 @@ int nsk_jvmti_getOptionsCount(); /** * Returns name of i-th parsed option. - * If no such option then complains an error and returns NULL. + * If no such option then complains an error and returns null. */ const char* nsk_jvmti_getOptionName(int i); /** * Returns value of i-th parsed option. - * If no such option then complains an error and returns NULL. + * If no such option then complains an error and returns null. */ const char* nsk_jvmti_getOptionValue(int i); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp index a82f4cca5fa5b..f54e15ff6cfa1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,7 +21,7 @@ * questions. */ #include "jni.h" -#include "nsk_tools.h" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp index 4bb08c1aad3c4..908a5cc56c76a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,7 +21,7 @@ * questions. */ #include "jni.h" -#include "nsk_tools.h" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README index f6c18e86e8fe4..42467aa009dfa 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README @@ -25,8 +25,8 @@ This directory contains source files of testbase_nsk native framework, which provides support for native tests. Source files: - nsk_tools.h - nsk_tools.c + nsk_tools.hpp + nsk_tools.cpp Naming conventions: macroses: NSK_* @@ -54,7 +54,7 @@ provides support for lists of various objects --------------------------------------------------------------------------------- -nsk_tools.h +nsk_tools.hpp Provides functions and macroses for the most usefull actions: diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp index 068c92bf80706..736ddafdfaf00 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp @@ -25,7 +25,7 @@ #include #include #include "nsk_list.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp index 3ba69427fd65b..5d41ac31131c2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp @@ -31,7 +31,7 @@ /*************************************************************/ -#include "nsk_tools.h" +#include "nsk_tools.hpp" /*************************************************************/ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp similarity index 98% rename from test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h rename to test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp index 12760fd458cdb..6b262617c5c22 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -160,7 +160,7 @@ void nsk_printHexBytes(const char indent[], int columns, /*************************************************************/ /** - * Returns str or "" if str is NULL; useful for printing strings. + * Returns str or "" if str is null; useful for printing strings. */ const char* nsk_null_string(const char* str); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties b/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties deleted file mode 100644 index 8b51b2a911560..0000000000000 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/stack/TEST.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 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. -# - -exclusiveAccess.dirs=. diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp index 9a03b990df79f..5cc6efdb7a806 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp @@ -22,7 +22,7 @@ */ #include -#include "jni_tools.h" +#include "jni_tools.hpp" #ifndef _IS_NSK_STRACE_DEFINED_ #define _IS_NSK_STRACE_DEFINED_ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp index 96cde50ce744a..1539727d8fdd5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp @@ -23,7 +23,7 @@ #include #include "nsk_strace.hpp" -#include "nsk_tools.h" +#include "nsk_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp index 46791f3a8f14f..60c0111d2d417 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp @@ -26,8 +26,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" #include "mlvmJvmtiUtils.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp index ad36948903865..413450892a5a0 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp @@ -26,8 +26,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" #include "mlvmJvmtiUtils.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp index 27dfa84dead99..7c1f8622e444a 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp @@ -25,7 +25,7 @@ #include #include #include "jni.h" -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp index 71573cc2cc1b2..7f3b149df723f 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp @@ -26,8 +26,8 @@ #include #include "jvmti.h" #include "agent_common.hpp" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" #include "mlvmJvmtiUtils.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp index eac0d3fe601f0..530de16c2d4bd 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp +++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp @@ -25,10 +25,10 @@ #include #include -#include "jni_tools.h" -#include "nsk_tools.h" -#include "JVMTITools.h" -#include "jvmti_tools.h" +#include "jni_tools.hpp" +#include "nsk_tools.hpp" +#include "JVMTITools.hpp" +#include "jvmti_tools.hpp" extern "C" { diff --git a/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp b/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp index c97e7017f4c94..c69025fe4c2c3 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp +++ b/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp @@ -31,7 +31,7 @@ #include #include #endif /* _WIN32 */ -#include "jni_tools.h" +#include "jni_tools.hpp" extern "C" { diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 9ae69adacf171..9aa6449ead6ef 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -689,6 +689,7 @@ javax/swing/JComboBox/TestComboBoxComponentRendering.java 8309734 linux-all # This test fails on macOS 14 javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all +javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 8316151 macosx-all ############################################################################ diff --git a/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java b/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java index e61f8b45f7778..70c6cad411a36 100644 --- a/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java +++ b/test/jdk/com/sun/crypto/provider/KeyProtector/IterationCount.java @@ -52,9 +52,6 @@ public class IterationCount { private static final String clientStr = "CLIENT"; - private static final String javaBinPath = - System.getProperty("java.home", ".") + File.separator + "bin" + - File.separator + "java"; public static void main(String[] args) throws Throwable { if (args[0].equals("HOST")) { @@ -78,22 +75,14 @@ public static void main(String[] args) throws Throwable { System.out.println("TEST PASS - OK"); } - private static List getBasicCommand() { - List cmd = new ArrayList<>(); - cmd.add(javaBinPath); - cmd.add("-cp"); - cmd.add(System.getProperty("test.classes", ".")); - return cmd; - } - private static void executeCommand(List cmd, String expectedCount) throws Throwable { cmd.add("--add-opens=java.base/com.sun.crypto.provider=ALL-UNNAMED"); cmd.add(IterationCount.class.getName()); cmd.add(clientStr); cmd.add(expectedCount); - OutputAnalyzer out = ProcessTools.executeCommand( - cmd.toArray(new String[cmd.size()])); + ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(cmd); + OutputAnalyzer out = ProcessTools.executeCommand(pb); out.shouldHaveExitValue(0); } @@ -102,7 +91,7 @@ private static void testSystem(String expectedCount, String setValue) System.out.println("Test setting " + (setValue != null ? setValue : "nothing") + " as a System property"); - List cmd = getBasicCommand(); + List cmd = new ArrayList<>(); if (setValue != null) { cmd.add("-Djdk.jceks.iterationCount=" + setValue); } @@ -112,7 +101,7 @@ private static void testSystem(String expectedCount, String setValue) private static void testSecurity(String expectedCount, String setValue) throws Throwable { - testSecurity(expectedCount, setValue, getBasicCommand()); + testSecurity(expectedCount, setValue, new ArrayList<>()); } private static void testSecurity(String expectedCount, String setValue, @@ -140,15 +129,14 @@ private static void testSystemOverridesSecurity() throws Throwable { " the Security one"); String systemValue = Integer.toString(30000); System.out.println("System value: " + systemValue); - List cmd = getBasicCommand(); + List cmd = new ArrayList<>(); cmd.add("-Djdk.jceks.iterationCount=" + systemValue); testSecurity(systemValue, Integer.toString(40000), cmd); } private static void writeJavaSecurityProp(String javaSecurityPath, String setValue) throws IOException { - try (FileOutputStream fos = new FileOutputStream( - new File(javaSecurityPath))) { + try (FileOutputStream fos = new FileOutputStream(javaSecurityPath)) { fos.write(("jdk.jceks.iterationCount=" + setValue).getBytes()); } } diff --git a/test/jdk/com/sun/tools/attach/BasicTests.java b/test/jdk/com/sun/tools/attach/BasicTests.java index 833d7022ce893..4dc7065630fad 100644 --- a/test/jdk/com/sun/tools/attach/BasicTests.java +++ b/test/jdk/com/sun/tools/attach/BasicTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -171,6 +171,7 @@ public static void main(String args[]) throws Exception { System.out.println(" - Test: Load an agent that does not exist"); try { vm.loadAgent("SilverBullet.jar"); + throw new RuntimeException("AgentLoadException not thrown as expected!"); } catch (AgentLoadException x) { System.out.println(" - AgentLoadException thrown as expected!"); } diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java index b7a0f58a2f837..f8bd913dab29e 100644 --- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java +++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java @@ -47,6 +47,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -639,7 +640,8 @@ private void updateTime(final long leftTime) { long hours = leftTime / 3_600_000; long minutes = (leftTime - hours * 3_600_000) / 60_000; long seconds = (leftTime - hours * 3_600_000 - minutes * 60_000) / 1_000; - label.setText(String.format("Test timeout: %02d:%02d:%02d", + label.setText(String.format(Locale.ENGLISH, + "Test timeout: %02d:%02d:%02d", hours, minutes, seconds)); } diff --git a/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp b/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp index cc8469cc68f53..0bead40409813 100644 --- a/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp +++ b/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp @@ -22,7 +22,7 @@ */ #include "jni.h" -#include "testlib_threads.h" +#include "testlib_threads.hpp" void call(void* ctxt) { JavaVM* jvm = (JavaVM*) ctxt; diff --git a/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp b/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp index 7056d702209ef..4591d7a506ae3 100644 --- a/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp +++ b/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp @@ -22,7 +22,7 @@ */ #include "jni.h" -#include "testlib_threads.h" +#include "testlib_threads.hpp" typedef struct { JavaVM* jvm; diff --git a/test/jdk/java/foreign/libAsyncInvokers.cpp b/test/jdk/java/foreign/libAsyncInvokers.cpp index e7d48cbfbcafd..a2ac3b07a587e 100644 --- a/test/jdk/java/foreign/libAsyncInvokers.cpp +++ b/test/jdk/java/foreign/libAsyncInvokers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,7 +21,7 @@ * questions. */ -#include "testlib_threads.h" +#include "testlib_threads.hpp" #include "shared.h" diff --git a/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp b/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp index 607588cd56c03..fff6f80239daf 100644 --- a/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp +++ b/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp @@ -22,7 +22,7 @@ */ #include "jni.h" -#include "testlib_threads.h" +#include "testlib_threads.hpp" struct Context { JavaVM* jvm; diff --git a/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp b/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp index 568cd8402d7b8..5461966d05527 100644 --- a/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp +++ b/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,7 +21,7 @@ * questions. */ -#include "testlib_threads.h" +#include "testlib_threads.hpp" #ifdef _WIN64 #define EXPORT __declspec(dllexport) diff --git a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java index 250e84763db7d..d4f197eb09b9a 100644 --- a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java +++ b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * 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 @@ import java.util.*; public class SecureDS { - static boolean supportsLinks; + static boolean supportsSymbolicLinks; public static void main(String[] args) throws IOException { Path dir = TestUtil.createTemporaryDirectory(); @@ -52,7 +52,7 @@ public static void main(String[] args) throws IOException { return; } - supportsLinks = TestUtil.supportsLinks(dir); + supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(dir); // run tests doBasicTests(dir); @@ -76,11 +76,11 @@ static void doBasicTests(Path dir) throws IOException { createDirectory(dir1.resolve(dirEntry)); // myfilelink -> myfile Path link1Entry = Paths.get("myfilelink"); - if (supportsLinks) + if (supportsSymbolicLinks) createSymbolicLink(dir1.resolve(link1Entry), fileEntry); // mydirlink -> mydir Path link2Entry = Paths.get("mydirlink"); - if (supportsLinks) + if (supportsSymbolicLinks) createSymbolicLink(dir1.resolve(link2Entry), dirEntry); // open directory and then move it so that it is no longer accessible @@ -92,7 +92,7 @@ static void doBasicTests(Path dir) throws IOException { // Test: iterate over all entries int count = 0; for (Path entry: stream) { count++; } - assertTrue(count == (supportsLinks ? 4 : 2)); + assertTrue(count == (supportsSymbolicLinks ? 4 : 2)); // Test: getFileAttributeView to access directory's attributes assertTrue(stream @@ -117,7 +117,7 @@ static void doBasicTests(Path dir) throws IOException { .getFileAttributeView(dirEntry, BasicFileAttributeView.class, NOFOLLOW_LINKS) .readAttributes() .isDirectory()); - if (supportsLinks) { + if (supportsSymbolicLinks) { assertTrue(stream .getFileAttributeView(link1Entry, BasicFileAttributeView.class) .readAttributes() @@ -139,7 +139,7 @@ static void doBasicTests(Path dir) throws IOException { // Test: newByteChannel Set opts = Collections.emptySet(); stream.newByteChannel(fileEntry, opts).close(); - if (supportsLinks) { + if (supportsSymbolicLinks) { stream.newByteChannel(link1Entry, opts).close(); try { Set mixed = new HashSet<>(); @@ -153,7 +153,7 @@ static void doBasicTests(Path dir) throws IOException { // Test: newDirectoryStream stream.newDirectoryStream(dirEntry).close(); stream.newDirectoryStream(dirEntry, LinkOption.NOFOLLOW_LINKS).close(); - if (supportsLinks) { + if (supportsSymbolicLinks) { stream.newDirectoryStream(link2Entry).close(); try { stream.newDirectoryStream(link2Entry, LinkOption.NOFOLLOW_LINKS) @@ -163,7 +163,7 @@ static void doBasicTests(Path dir) throws IOException { } // Test: delete - if (supportsLinks) { + if (supportsSymbolicLinks) { stream.deleteFile(link1Entry); stream.deleteFile(link2Entry); } @@ -186,7 +186,7 @@ static void doMoveTests(Path dir) throws IOException { Path dirEntry = Paths.get("mydir"); createDirectory(dir1.resolve(dirEntry)); Path linkEntry = Paths.get("mylink"); - if (supportsLinks) + if (supportsSymbolicLinks) createSymbolicLink(dir1.resolve(linkEntry), Paths.get("missing")); // target name @@ -211,7 +211,7 @@ static void doMoveTests(Path dir) throws IOException { stream2.deleteDirectory(target); // Test: move dir1/mylink -> dir2/newfile - if (supportsLinks) { + if (supportsSymbolicLinks) { stream1.move(linkEntry, stream2, target); assertTrue(isSymbolicLink(dir2.resolve(target))); stream2.deleteFile(target); diff --git a/test/jdk/java/nio/file/Files/CheckPermissions.java b/test/jdk/java/nio/file/Files/CheckPermissions.java index 5a8ff7f8b6714..397ace359f73b 100644 --- a/test/jdk/java/nio/file/Files/CheckPermissions.java +++ b/test/jdk/java/nio/file/Files/CheckPermissions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -251,7 +251,7 @@ public static void main(String[] args) throws IOException { delete(target); } - if (TestUtil.supportsLinks(testdir)) { + if (TestUtil.supportsSymbolicLinks(testdir)) { Path link = testdir.resolve("link1234"); createSymbolicLink(link, file); try { @@ -297,7 +297,7 @@ public static void main(String[] args) throws IOException { // -- createSymbolicLink -- - if (TestUtil.supportsLinks(testdir)) { + if (TestUtil.supportsSymbolicLinks(testdir)) { prepare(); Path link = testdir.resolve("link1234"); createSymbolicLink(link, file); @@ -311,7 +311,7 @@ public static void main(String[] args) throws IOException { // -- createLink -- - if (TestUtil.supportsLinks(testdir)) { + if (TestUtil.supportsHardLinks(testdir)) { prepare(); Path link = testdir.resolve("entry234"); createLink(link, file); diff --git a/test/jdk/java/nio/file/Files/CopyAndMove.java b/test/jdk/java/nio/file/Files/CopyAndMove.java index 4f1acf4dcc33b..f8bc9f997b75c 100644 --- a/test/jdk/java/nio/file/Files/CopyAndMove.java +++ b/test/jdk/java/nio/file/Files/CopyAndMove.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -70,8 +70,8 @@ public static void main(String[] args) throws Exception { FileStore fileStore1 = getFileStore(dir1); printDirInfo("dir1", dir1, fileStore1); testPosixAttributes = fileStore1.supportsFileAttributeView("posix"); - testCopyFileToFile(dir1, dir1, TestUtil.supportsLinks(dir1)); - testMove(dir1, dir1, TestUtil.supportsLinks(dir1)); + testCopyFileToFile(dir1, dir1, TestUtil.supportsSymbolicLinks(dir1)); + testMove(dir1, dir1, TestUtil.supportsSymbolicLinks(dir1)); // Use test.dir to define second directory if possible as it might // be a different volume/file system and so improve test coverage. @@ -87,8 +87,8 @@ public static void main(String[] args) throws Exception { try { testPosixAttributes = fileStore2.supportsFileAttributeView("posix"); - testCopyFileToFile(dir2, dir2, TestUtil.supportsLinks(dir2)); - testMove(dir2, dir2, TestUtil.supportsLinks(dir2)); + testCopyFileToFile(dir2, dir2, TestUtil.supportsSymbolicLinks(dir2)); + testMove(dir2, dir2, TestUtil.supportsSymbolicLinks(dir2)); } finally { TestUtil.removeAll(dir2); } @@ -101,7 +101,7 @@ public static void main(String[] args) throws Exception { dir2 = TestUtil.createTemporaryDirectory(testDir); } boolean testSymbolicLinks = - TestUtil.supportsLinks(dir1) && TestUtil.supportsLinks(dir2); + TestUtil.supportsSymbolicLinks(dir1) && TestUtil.supportsSymbolicLinks(dir2); testPosixAttributes = fileStore1.supportsFileAttributeView("posix") && fileStore2.supportsFileAttributeView("posix"); testCopyFileToFile(dir1, dir2, testSymbolicLinks); @@ -309,7 +309,7 @@ static void moveAndVerify(Path source, Path target, CopyOption... options) /** * Tests all possible ways to invoke move */ - static void testMove(Path dir1, Path dir2, boolean supportsLinks) + static void testMove(Path dir1, Path dir2, boolean supportsSymbolicLinks) throws IOException { Path source, target, entry; @@ -531,7 +531,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move symbolic link to file, target does not exist */ - if (supportsLinks) { + if (supportsSymbolicLinks) { Path tmp = createSourceFile(dir1); source = dir1.resolve("link"); createSymbolicLink(source, tmp); @@ -544,7 +544,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move symbolic link to directory, target does not exist */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -555,7 +555,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move broken symbolic link, target does not exists */ - if (supportsLinks) { + if (supportsSymbolicLinks) { Path tmp = Paths.get("doesnotexist"); source = dir1.resolve("link"); createSymbolicLink(source, tmp); @@ -567,7 +567,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move symbolic link, target exists */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -584,7 +584,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Move regular file, target exists */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -596,7 +596,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: move symbolic link, target exists and is empty directory */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -608,7 +608,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test: symbolic link, target exists and is non-empty directory */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir2); target = getTargetFile(dir2); @@ -628,7 +628,7 @@ static void testMove(Path dir1, Path dir2, boolean supportsLinks) /** * Test atomic move of symbolic link (same file store) */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("link"); createSymbolicLink(source, dir1); target = getTargetFile(dir2); @@ -743,7 +743,7 @@ static void copyAndVerify(Path source, Path target, CopyOption... options) /** * Tests all possible ways to invoke copy to copy a file to a file */ - static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) + static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsSymbolicLinks) throws IOException { Path source, target, link, entry; @@ -947,7 +947,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Follow link */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = createSourceFile(dir1); link = dir1.resolve("link"); createSymbolicLink(link, source.getFileName()); @@ -960,7 +960,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy link (to file) */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = createSourceFile(dir1); link = dir1.resolve("link"); createSymbolicLink(link, source); @@ -973,7 +973,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy link (to directory) */ - if (supportsLinks) { + if (supportsSymbolicLinks) { source = dir1.resolve("mydir"); createDirectory(source); link = dir1.resolve("link"); @@ -987,7 +987,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy broken link */ - if (supportsLinks) { + if (supportsSymbolicLinks) { assertTrue(notExists(source)); link = dir1.resolve("link"); createSymbolicLink(link, source); @@ -999,7 +999,7 @@ static void testCopyFileToFile(Path dir1, Path dir2, boolean supportsLinks) /** * Test: Copy link to UNC (Windows only) */ - if (supportsLinks && Platform.isWindows()) { + if (supportsSymbolicLinks && Platform.isWindows()) { Path unc = Paths.get("\\\\rialto\\share\\file"); link = dir1.resolve("link"); createSymbolicLink(link, unc); @@ -1066,7 +1066,7 @@ static void testCopyInputStreamToFile() throws IOException { } Path tmpdir = createTempDirectory("blah"); try { - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { Path link = createSymbolicLink(tmpdir.resolve("link"), tmpdir.resolve("target")); try { diff --git a/test/jdk/java/nio/file/Files/CopyInterference.java b/test/jdk/java/nio/file/Files/CopyInterference.java index 310d3e382cadb..e3b62398bac36 100644 --- a/test/jdk/java/nio/file/Files/CopyInterference.java +++ b/test/jdk/java/nio/file/Files/CopyInterference.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -114,7 +114,7 @@ private static Stream pathAndOptionsProvider() new CopyOption[] {REPLACE_EXISTING}); list.add(args); - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { // symbolic link, followed Path link = dir.resolve("link"); Files.createSymbolicLink(link, sourceFile); diff --git a/test/jdk/java/nio/file/Files/CreateDirectories.java b/test/jdk/java/nio/file/Files/CreateDirectories.java index e3204192cdcbd..fc5a5025955d0 100644 --- a/test/jdk/java/nio/file/Files/CreateDirectories.java +++ b/test/jdk/java/nio/file/Files/CreateDirectories.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 +46,7 @@ public class CreateDirectories { public void testSymlinkDir() throws Exception { // create a temp dir as the "root" in which we will run our tests. final Path top = TestUtil.createTemporaryDirectory(); - if (!TestUtil.supportsLinks(top)) { + if (!TestUtil.supportsSymbolicLinks(top)) { System.out.println("Skipping tests since symbolic links isn't " + "supported under directory "+ top); throw new SkipException("Symbolic links not supported"); diff --git a/test/jdk/java/nio/file/Files/DeleteOnClose.java b/test/jdk/java/nio/file/Files/DeleteOnClose.java index f5fab1c5be221..238bb1f87a6a4 100644 --- a/test/jdk/java/nio/file/Files/DeleteOnClose.java +++ b/test/jdk/java/nio/file/Files/DeleteOnClose.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -82,7 +82,7 @@ public static void runTest(Path path) throws Exception { Path dir = Files.createTempDirectory("blah"); try { // check that DELETE_ON_CLOSE fails when file is a sym link - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { file = dir.resolve("foo"); Files.createFile(file); Path link = dir.resolve("link"); diff --git a/test/jdk/java/nio/file/Files/Misc.java b/test/jdk/java/nio/file/Files/Misc.java index 1d3df155675d2..024b518141bbd 100644 --- a/test/jdk/java/nio/file/Files/Misc.java +++ b/test/jdk/java/nio/file/Files/Misc.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -156,7 +156,7 @@ static void testIsSameFile(Path tmpdir) throws IOException { /** * Test: Symbolic links */ - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { createSymbolicLink(thatFile, thisFile); try { assertTrue(isSameFile(thisFile, thatFile)); @@ -198,7 +198,7 @@ static void testFileTypeMethods(Path tmpdir) throws IOException { assertTrue(!isDirectory(file, NOFOLLOW_LINKS)); assertTrue(!isSymbolicLink(file)); - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { Path link = tmpdir.resolve("link"); createSymbolicLink(link, tmpdir); @@ -222,6 +222,10 @@ static void testFileTypeMethods(Path tmpdir) throws IOException { } finally { delete(link); } + } + + if (TestUtil.supportsHardLinks(tmpdir)) { + Path link = tmpdir.resolve("hardlink"); createLink(link, file); try { @@ -234,7 +238,6 @@ static void testFileTypeMethods(Path tmpdir) throws IOException { delete(link); } } - } finally { delete(file); } @@ -273,7 +276,7 @@ static void testAccessMethods(Path tmpdir) throws IOException { } // sym link exists - if (TestUtil.supportsLinks(tmpdir)) { + if (TestUtil.supportsSymbolicLinks(tmpdir)) { Path link = tmpdir.resolve("link"); createSymbolicLink(link, file); diff --git a/test/jdk/java/nio/file/Files/SBC.java b/test/jdk/java/nio/file/Files/SBC.java index 8f470b8d9ed01..7aa04b184627a 100644 --- a/test/jdk/java/nio/file/Files/SBC.java +++ b/test/jdk/java/nio/file/Files/SBC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * 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,12 +39,12 @@ public class SBC { - static boolean supportsLinks; + static boolean supportsSymbolicLinks; public static void main(String[] args) throws Exception { Path dir = TestUtil.createTemporaryDirectory(); try { - supportsLinks = TestUtil.supportsLinks(dir); + supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(dir); // open options createTests(dir); @@ -84,7 +84,7 @@ static void createTests(Path dir) throws Exception { Files.newByteChannel(file, CREATE, WRITE).close(); // create file where existing file is a sym link - if (supportsLinks) { + if (supportsSymbolicLinks) { Path link = Files.createSymbolicLink(dir.resolve("link"), file); try { // file already exists @@ -121,7 +121,7 @@ static void createTests(Path dir) throws Exception { } catch (FileAlreadyExistsException x) { } // create should fail - if (supportsLinks) { + if (supportsSymbolicLinks) { Path link = dir.resolve("link"); Path target = dir.resolve("thisDoesNotExist"); Files.createSymbolicLink(link, target); @@ -224,7 +224,7 @@ static void truncateExistingTests(Path dir) throws Exception { // test NOFOLLOW_LINKS option static void noFollowLinksTests(Path dir) throws Exception { - if (!supportsLinks) + if (!supportsSymbolicLinks) return; Path file = Files.createFile(dir.resolve("foo")); try { diff --git a/test/jdk/java/nio/file/Files/SetLastModifiedTime.java b/test/jdk/java/nio/file/Files/SetLastModifiedTime.java index 98f77d4c8d844..d06b78b29227c 100644 --- a/test/jdk/java/nio/file/Files/SetLastModifiedTime.java +++ b/test/jdk/java/nio/file/Files/SetLastModifiedTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -87,7 +87,7 @@ public void testDirectory() throws Exception { @Test public void testSymbolicLink() throws Exception { - if (TestUtil.supportsLinks(testDir)) { + if (TestUtil.supportsSymbolicLinks(testDir)) { Path target = Files.createFile(testDir.resolve("target")); Path link = testDir.resolve("link"); Files.createSymbolicLink(link, target); diff --git a/test/jdk/java/nio/file/Files/StreamTest.java b/test/jdk/java/nio/file/Files/StreamTest.java index c21faf9662720..cc4aa1b1e5cae 100644 --- a/test/jdk/java/nio/file/Files/StreamTest.java +++ b/test/jdk/java/nio/file/Files/StreamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,7 +72,7 @@ public class StreamTest { * - linkFile(./file) */ static Path testFolder; - static boolean supportsLinks; + static boolean supportsSymbolicLinks; static Path[] level1; static Path[] all; static Path[] all_folowLinks; @@ -80,7 +80,7 @@ public class StreamTest { @BeforeClass void setupTestFolder() throws IOException { testFolder = TestUtil.createTemporaryDirectory(); - supportsLinks = TestUtil.supportsLinks(testFolder); + supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(testFolder); TreeSet set = new TreeSet<>(); // Level 1 @@ -96,7 +96,7 @@ void setupTestFolder() throws IOException { set.add(file); set.add(dir); set.add(dir2); - if (supportsLinks) { + if (supportsSymbolicLinks) { Path tmp = testFolder.resolve("linkDir"); Files.createSymbolicLink(tmp, dir); set.add(tmp); @@ -113,7 +113,7 @@ void setupTestFolder() throws IOException { tmp = dir.resolve("f1"); Files.createFile(tmp); set.add(tmp); - if (supportsLinks) { + if (supportsSymbolicLinks) { tmp = dir.resolve("lnDir2"); Files.createSymbolicLink(tmp, dir2); set.add(tmp); @@ -123,7 +123,7 @@ void setupTestFolder() throws IOException { all = set.toArray(new Path[0]); // Follow links - if (supportsLinks) { + if (supportsSymbolicLinks) { tmp = testFolder.resolve("linkDir"); set.add(tmp.resolve("d1")); set.add(tmp.resolve("f1")); @@ -212,7 +212,7 @@ private void validateFileSystemLoopException(Path start, Path... causes) { } public void testWalkFollowLinkLoop() { - if (!supportsLinks) { + if (!supportsSymbolicLinks) { return; } @@ -513,7 +513,7 @@ public void testSecurityException() throws IOException { Path triggerLink = null; Path linkTriggerDir = null; Path linkTriggerFile = null; - if (supportsLinks) { + if (supportsSymbolicLinks) { Path dir = testFolder.resolve("dir"); triggerLink = Files.createSymbolicLink(dir.resolve("SecurityException"), empty); linkTriggerDir = Files.createSymbolicLink(dir.resolve("lnDirSE"), triggerDir); @@ -539,7 +539,7 @@ public void testSecurityException() throws IOException { assertEqualsNoOrder(result, new String[] { "dir2", "SecurityException", "fileInSE", "file" }); } - if (supportsLinks) { + if (supportsSymbolicLinks) { try (Stream s = Files.list(fakeRoot.resolve("dir"))) { String[] result = s.map(path -> path.getFileName().toString()) .toArray(String[]::new); @@ -562,7 +562,7 @@ public void testSecurityException() throws IOException { assertEqualsNoOrder(result, new String[] { "dir2", "file" }); } - if (supportsLinks) { + if (supportsSymbolicLinks) { // not following links try (Stream s = Files.walk(fakeRoot.resolve("dir"))) { String[] result = s.map(path -> path.getFileName().toString()) @@ -639,7 +639,7 @@ public void testSecurityException() throws IOException { if (fs != null) { fs.close(); } - if (supportsLinks) { + if (supportsSymbolicLinks) { Files.delete(triggerLink); Files.delete(linkTriggerDir); Files.delete(linkTriggerFile); diff --git a/test/jdk/java/nio/file/Files/SubstDrive.java b/test/jdk/java/nio/file/Files/SubstDrive.java index 88bf1948926fa..94fdeadcef367 100644 --- a/test/jdk/java/nio/file/Files/SubstDrive.java +++ b/test/jdk/java/nio/file/Files/SubstDrive.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Microsoft Corporation. All rights reserved. + * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -276,7 +277,7 @@ public void testMoveAndCopySubstDrive() throws IOException { */ @Test public void testGetResolvedSymlinkAttribute() throws IOException { - if (!TestUtil.supportsLinks(TEST_TEMP_DIRECTORY)) { + if (!TestUtil.supportsSymbolicLinks(TEST_TEMP_DIRECTORY)) { return; } @@ -308,7 +309,7 @@ public void testGetResolvedSymlinkAttribute() throws IOException { */ @Test public void testSubstWithSymlinkedDirectory() throws IOException { - if (!TestUtil.supportsLinks(TEST_TEMP_DIRECTORY)) { + if (!TestUtil.supportsSymbolicLinks(TEST_TEMP_DIRECTORY)) { return; } @@ -350,7 +351,7 @@ public void testSubstWithSymlinkedDirectory() throws IOException { */ @Test public void testMoveAndCopyFilesToSymlinkedDrive() throws IOException { - if (!TestUtil.supportsLinks(TEST_TEMP_DIRECTORY)) { + if (!TestUtil.supportsSymbolicLinks(TEST_TEMP_DIRECTORY)) { return; } diff --git a/test/jdk/java/nio/file/Files/SymlinkTime.java b/test/jdk/java/nio/file/Files/SymlinkTime.java index 89590cfdb3cfd..5d654b0fad423 100644 --- a/test/jdk/java/nio/file/Files/SymlinkTime.java +++ b/test/jdk/java/nio/file/Files/SymlinkTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 +41,7 @@ public class SymlinkTime { public static void main(String[] args) throws IOException { Path dir = TestUtil.createTemporaryDirectory(); - if (!TestUtil.supportsLinks(dir)) { + if (!TestUtil.supportsSymbolicLinks(dir)) { System.out.println("Links not supported: skipping test"); return; } diff --git a/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java b/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java index 98bc2866e7a71..9f9be7ad1e04c 100644 --- a/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java +++ b/test/jdk/java/nio/file/Files/walkFileTree/CreateFileTree.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 @@ public class CreateFileTree { private static final Random rand = new Random(); - private static boolean supportsLinks(Path dir) { + private static boolean supportsSymbolicLinks(Path dir) { Path link = dir.resolve("testlink"); Path target = dir.resolve("testtarget"); try { @@ -77,7 +77,7 @@ static Path create() throws IOException { } // create a few sym links in the file tree so as to create cycles - if (supportsLinks(top)) { + if (supportsSymbolicLinks(top)) { int links = 1 + rand.nextInt(5); for (int i=0; i doesNotExist.toRealPath(NOFOLLOW_LINKS)); } - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") @Test public void shouldResolveLinks() throws IOException { Path resolvedFile = FILE; @@ -110,7 +110,7 @@ public void shouldResolveLinks() throws IOException { } @Test - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") public void shouldNotResolveLinks() throws IOException { Files.createSymbolicLink(LINK, FILE.toAbsolutePath()); assertEquals(LINK.toRealPath(NOFOLLOW_LINKS).getFileName(), @@ -143,7 +143,7 @@ public void eliminateDotsNoFollow() throws IOException { } @Test - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") public void noCollapseDots1() throws IOException { Path subPath = DIR.resolve(Path.of("dir", "subdir")); Path sub = Files.createDirectories(subPath); @@ -163,7 +163,7 @@ public void noCollapseDots1() throws IOException { } @Test - @EnabledIf("supportsLinks") + @EnabledIf("supportsSymbolicLinks") public void noCollapseDots2() throws IOException { Path subPath = DIR.resolve(Path.of("dir", "subdir")); Path sub = Files.createDirectories(subPath); diff --git a/test/jdk/java/nio/file/TestUtil.java b/test/jdk/java/nio/file/TestUtil.java index 66cf21bfb35ee..26c06f1dae363 100644 --- a/test/jdk/java/nio/file/TestUtil.java +++ b/test/jdk/java/nio/file/TestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -102,7 +102,7 @@ static Path createDirectoryWithLongPath(Path dir) /** * Returns true if symbolic links are supported */ - static boolean supportsLinks(Path dir) { + static boolean supportsSymbolicLinks(Path dir) { Path link = dir.resolve("testlink"); Path target = dir.resolve("testtarget"); try { @@ -115,4 +115,21 @@ static boolean supportsLinks(Path dir) { return false; } } + + /** + * Returns true if hard links are supported + */ + static boolean supportsHardLinks(Path dir) { + Path link = dir.resolve("testlink"); + Path target = dir.resolve("testtarget"); + try { + Files.createLink(link, target); + Files.delete(link); + return true; + } catch (UnsupportedOperationException x) { + return false; + } catch (IOException x) { + return false; + } + } } diff --git a/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java index b00ceb56d25e6..0412401dc584a 100644 --- a/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java +++ b/test/jdk/java/nio/file/attribute/DosFileAttributeView/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 +79,7 @@ static void readWriteTests(Path dir) throws IOException { testAttributes(Files.getFileAttributeView(file, DosFileAttributeView.class)); // Following tests use a symbolic link so skip if not supported - if (!TestUtil.supportsLinks(dir)) + if (!TestUtil.supportsSymbolicLinks(dir)) return; Path link = dir.resolve("link"); diff --git a/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java index 6626a289dce2d..765af12559503 100644 --- a/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java +++ b/test/jdk/java/nio/file/attribute/PosixFileAttributeView/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -167,7 +167,7 @@ static void permissionTests(Path dir) Files.delete(file); } - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { // create link (to file that doesn't exist) and test reading of // permissions Path link = dir.resolve("link"); diff --git a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java index 00ab4670ba6d6..da46e401365ae 100644 --- a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java +++ b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -299,7 +299,7 @@ public static void main(String[] args) throws IOException { } // test access to user defined attributes of sym link - if (TestUtil.supportsLinks(dir)) { + if (TestUtil.supportsSymbolicLinks(dir)) { Path target = dir.resolve("doesnotexist"); Path link = dir.resolve("link"); Files.createSymbolicLink(link, target); diff --git a/test/jdk/java/security/Security/ConfigFileTest.java b/test/jdk/java/security/Security/ConfigFileTest.java index fe022fc45ce19..b9264b937ec74 100644 --- a/test/jdk/java/security/Security/ConfigFileTest.java +++ b/test/jdk/java/security/Security/ConfigFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,6 +21,7 @@ * questions. */ +import jdk.test.lib.Utils; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; @@ -30,7 +31,9 @@ import java.security.Provider; import java.security.Security; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Optional; /* @@ -50,6 +53,9 @@ public class ConfigFileTest { private static boolean overrideDetected = false; + private static Path COPY_JDK_DIR = Path.of("./jdk-8155246-tmpdir"); + private static Path COPIED_JAVA = COPY_JDK_DIR.resolve("bin", "java"); + public static void main(String[] args) throws Exception { Path copyJdkDir = Path.of("./jdk-8155246-tmpdir"); Path copiedJava = Optional.of( @@ -72,29 +78,29 @@ public static void main(String[] args) throws Exception { String extraPropsFile = Path.of(System.getProperty("test.src"), "override.props").toString(); // sanity test -XshowSettings:security option - exerciseShowSettingsSecurity(copiedJava.toString(), "-cp", System.getProperty("test.classes"), - "-Djava.security.debug=all", "-XshowSettings:security", "ConfigFileTest", "runner"); + exerciseShowSettingsSecurity(buildCommand("-cp", System.getProperty("test.classes"), + "-Djava.security.debug=all", "-XshowSettings:security", "ConfigFileTest", "runner")); // exercise some debug flags while we're here // regular JDK install - should expect success exerciseSecurity(0, "java", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), - "-Djava.security.debug=all", "-Djavax.net.debug=all", "ConfigFileTest", "runner"); + buildCommand("-cp", System.getProperty("test.classes"), + "-Djava.security.debug=all", "-Djavax.net.debug=all", "ConfigFileTest", "runner")); // given an overriding security conf file that doesn't exist, we shouldn't // overwrite the properties from original/master security conf file exerciseSecurity(0, "SUN version", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", "-Djava.security.properties==file:///" + extraPropsFile + "badFileName", - "ConfigFileTest", "runner"); + "ConfigFileTest", "runner")); // test JDK launch with customized properties file exerciseSecurity(0, "NumProviders: 6", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", "-Djava.security.properties==file:///" + extraPropsFile, - "ConfigFileTest", "runner"); + "ConfigFileTest", "runner")); // delete the master conf file Files.delete(Path.of(copyJdkDir.toString(), "conf", @@ -102,16 +108,16 @@ public static void main(String[] args) throws Exception { // launch JDK without java.security file being present or specified exerciseSecurity(1, "Error loading java.security file", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", - "ConfigFileTest", "runner"); + "ConfigFileTest", "runner")); // test the override functionality also. Should not be allowed since // "security.overridePropertiesFile=true" Security property is missing. exerciseSecurity(1, "Error loading java.security file", - copiedJava.toString(), "-cp", System.getProperty("test.classes"), + buildCommand("-cp", System.getProperty("test.classes"), "-Djava.security.debug=all", "-Djavax.net.debug=all", - "-Djava.security.properties==file:///" + extraPropsFile, "ConfigFileTest", "runner"); + "-Djava.security.properties==file:///" + extraPropsFile, "ConfigFileTest", "runner")); if (!overrideDetected) { throw new RuntimeException("Override scenario not seen"); @@ -119,8 +125,14 @@ public static void main(String[] args) throws Exception { } } - private static void exerciseSecurity(int exitCode, String output, String... args) throws Exception { - ProcessBuilder process = new ProcessBuilder(args); + private static ProcessBuilder buildCommand(String... command) { + ArrayList args = new ArrayList<>(); + args.add(COPIED_JAVA.toString()); + Collections.addAll(args, Utils.prependTestJavaOpts(command)); + return new ProcessBuilder(args); + } + + private static void exerciseSecurity(int exitCode, String output, ProcessBuilder process) throws Exception { OutputAnalyzer oa = ProcessTools.executeProcess(process); oa.shouldHaveExitValue(exitCode) .shouldContain(output); @@ -141,8 +153,7 @@ private static void exerciseSecurity(int exitCode, String output, String... args } // exercise the -XshowSettings:security launcher - private static void exerciseShowSettingsSecurity(String... args) throws Exception { - ProcessBuilder process = new ProcessBuilder(args); + private static void exerciseShowSettingsSecurity(ProcessBuilder process) throws Exception { OutputAnalyzer oa = ProcessTools.executeProcess(process); oa.shouldHaveExitValue(0) .shouldContain("Security properties:") diff --git a/test/jdk/sun/security/provider/KeyStore/DKSTest.java b/test/jdk/sun/security/provider/KeyStore/DKSTest.java index 1d1943ec7295c..9c35a1c1dd9c0 100644 --- a/test/jdk/sun/security/provider/KeyStore/DKSTest.java +++ b/test/jdk/sun/security/provider/KeyStore/DKSTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved. * 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,7 +80,7 @@ public class DKSTest { public static void main(String[] args) throws Exception { if (args.length == 0) { // Environment variable and system properties referred in domains.cfg used by this Test. - ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(List.of( + ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(List.of( "-Dtest.src=" + TEST_SRC , "-Duser.dir=" + USER_DIR, "DKSTest", "run")); pb.environment().putAll(System.getenv()); pb.environment().put("KEYSTORE_PWD", "test12"); diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_common.h b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp similarity index 94% rename from test/lib/jdk/test/lib/jvmti/jvmti_common.h rename to test/lib/jdk/test/lib/jvmti/jvmti_common.hpp index 6a0bcf2533108..9fdd4cf4cb8ad 100644 --- a/test/lib/jdk/test/lib/jvmti/jvmti_common.h +++ b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,8 +21,8 @@ * questions. */ -#ifndef JVMTI_COMMON_H -#define JVMTI_COMMON_H +#ifndef JVMTI_COMMON_HPP +#define JVMTI_COMMON_HPP #include #include @@ -60,8 +60,8 @@ const char* TranslateState(jint flags); const char* TranslateError(jvmtiError err); -static jvmtiExtensionFunction GetVirtualThread_func = NULL; -static jvmtiExtensionFunction GetCarrierThread_func = NULL; +static jvmtiExtensionFunction GetVirtualThread_func = nullptr; +static jvmtiExtensionFunction GetCarrierThread_func = nullptr; /** * Convert the digits of the given value argument to a null-terminated @@ -203,15 +203,15 @@ deallocate(jvmtiEnv *jvmti, JNIEnv* jni, void* ptr) { static char* get_method_class_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) { - jclass klass = NULL; - char* cname = NULL; - char* result = NULL; + jclass klass = nullptr; + char* cname = nullptr; + char* result = nullptr; jvmtiError err; err = jvmti->GetMethodDeclaringClass(method, &klass); check_jvmti_status(jni, err, "get_method_class_name: error in JVMTI GetMethodDeclaringClass"); - err = jvmti->GetClassSignature(klass, &cname, NULL); + err = jvmti->GetClassSignature(klass, &cname, nullptr); check_jvmti_status(jni, err, "get_method_class_name: error in JVMTI GetClassSignature"); size_t len = strlen(cname) - 2; // get rid of leading 'L' and trailing ';' @@ -228,14 +228,14 @@ get_method_class_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) { static void print_method(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method, jint depth) { - char* cname = NULL; - char* mname = NULL; - char* msign = NULL; + char* cname = nullptr; + char* mname = nullptr; + char* msign = nullptr; jvmtiError err; cname = get_method_class_name(jvmti, jni, method); - err = jvmti->GetMethodName(method, &mname, &msign, NULL); + err = jvmti->GetMethodName(method, &mname, &msign, nullptr); check_jvmti_status(jni, err, "print_method: error in JVMTI GetMethodName"); LOG("%2d: %s: %s%s\n", depth, cname, mname, msign); @@ -297,14 +297,14 @@ get_thread_name(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) { memset(&thr_info, 0, sizeof(thr_info)); err = jvmti->GetThreadInfo(thread, &thr_info); if (err == JVMTI_ERROR_WRONG_PHASE || err == JVMTI_ERROR_THREAD_NOT_ALIVE) { - return NULL; // VM or target thread completed its work + return nullptr; // VM or target thread completed its work } check_jvmti_status(jni, err, "get_thread_name: error in JVMTI GetThreadInfo call"); static const char* UNNAMED_STR = ""; static size_t UNNAMED_LEN = strlen(UNNAMED_STR); char* tname = thr_info.name; - if (tname == NULL) { + if (tname == nullptr) { err = jvmti->Allocate((jlong)(UNNAMED_LEN + 1), (unsigned char**)&tname); check_jvmti_status(jni, err, "get_method_class_name: error in JVMTI Allocate"); strncpy(tname, UNNAMED_STR, UNNAMED_LEN); @@ -315,10 +315,10 @@ get_thread_name(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) { static char* get_method_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) { - char* mname = NULL; + char* mname = nullptr; jvmtiError err; - err = jvmti->GetMethodName(method, &mname, NULL, NULL); + err = jvmti->GetMethodName(method, &mname, nullptr, nullptr); check_jvmti_status(jni, err, "get_method_name: error in JVMTI GetMethodName call"); return mname; @@ -326,7 +326,7 @@ get_method_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) { static jclass find_class(jvmtiEnv *jvmti, JNIEnv *jni, jobject loader, const char* cname) { - jclass *classes = NULL; + jclass *classes = nullptr; jint count = 0; jvmtiError err; @@ -335,10 +335,10 @@ find_class(jvmtiEnv *jvmti, JNIEnv *jni, jobject loader, const char* cname) { // Find the jmethodID of the specified method while (--count >= 0) { - char* name = NULL; + char* name = nullptr; jclass klass = classes[count]; - err = jvmti->GetClassSignature(klass, &name, NULL); + err = jvmti->GetClassSignature(klass, &name, nullptr); check_jvmti_status(jni, err, "find_class: error in JVMTI GetClassSignature call"); bool found = (strcmp(name, cname) == 0); @@ -347,13 +347,13 @@ find_class(jvmtiEnv *jvmti, JNIEnv *jni, jobject loader, const char* cname) { return klass; } } - return NULL; + return nullptr; } static jmethodID find_method(jvmtiEnv *jvmti, JNIEnv *jni, jclass klass, const char* mname) { - jmethodID *methods = NULL; - jmethodID method = NULL; + jmethodID *methods = nullptr; + jmethodID method = nullptr; jint count = 0; jvmtiError err; @@ -362,11 +362,11 @@ find_method(jvmtiEnv *jvmti, JNIEnv *jni, jclass klass, const char* mname) { // Find the jmethodID of the specified method while (--count >= 0) { - char* name = NULL; + char* name = nullptr; jmethodID meth = methods[count]; - err = jvmti->GetMethodName(meth, &name, NULL, NULL); + err = jvmti->GetMethodName(meth, &name, nullptr, nullptr); check_jvmti_status(jni, err, "find_method: error in JVMTI GetMethodName call"); bool found = (strcmp(name, mname) == 0); @@ -387,7 +387,7 @@ print_current_stack_trace(jvmtiEnv *jvmti, JNIEnv* jni) { jvmtiFrameInfo frames[MAX_FRAME_COUNT_PRINT_STACK_TRACE]; jint count = 0; - jvmtiError err = jvmti->GetStackTrace(NULL, 0, MAX_FRAME_COUNT_PRINT_STACK_TRACE, frames, &count); + jvmtiError err = jvmti->GetStackTrace(nullptr, 0, MAX_FRAME_COUNT_PRINT_STACK_TRACE, frames, &count); check_jvmti_status(jni, err, "print_stack_trace: error in JVMTI GetStackTrace"); LOG("JVMTI Stack Trace for current thread: frame count: %d\n", count); @@ -759,19 +759,19 @@ isThreadExpected(jvmtiEnv *jvmti, jthread thread) { } jthread find_thread_by_name(jvmtiEnv* jvmti, JNIEnv* jni, const char name[]) { - jthread* threads = NULL; + jthread* threads = nullptr; jint count = 0; - jthread found_thread = NULL; + jthread found_thread = nullptr; - if (name == NULL) { - return NULL; + if (name == nullptr) { + return nullptr; } check_jvmti_status(jni, jvmti->GetAllThreads(&count, &threads), ""); for (int i = 0; i < count; i++) { jvmtiThreadInfo info = get_thread_info(jvmti, jni, threads[i]); - if (info.name != NULL && strcmp(name, info.name) == 0) { + if (info.name != nullptr && strcmp(name, info.name) == 0) { found_thread = threads[i]; break; } @@ -793,22 +793,22 @@ static const jvmtiEvent static jvmtiExtensionFunction find_ext_function(jvmtiEnv* jvmti, JNIEnv* jni, const char* fname) { jint extCount = 0; - jvmtiExtensionFunctionInfo* extList = NULL; + jvmtiExtensionFunctionInfo* extList = nullptr; jvmtiError err = jvmti->GetExtensionFunctions(&extCount, &extList); check_jvmti_status(jni, err, "jvmti_common find_ext_function: Error in JVMTI GetExtensionFunctions"); for (int i = 0; i < extCount; i++) { - if (strstr(extList[i].id, (char*)fname) != NULL) { + if (strstr(extList[i].id, (char*)fname) != nullptr) { return extList[i].func; } } - return NULL; + return nullptr; } static jvmtiError GetVirtualThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread, jthread* vthread_ptr) { - if (GetVirtualThread_func == NULL) { // lazily initialize function pointer + if (GetVirtualThread_func == nullptr) { // lazily initialize function pointer GetVirtualThread_func = find_ext_function(jvmti, jni, "GetVirtualThread"); } jvmtiError err = (*GetVirtualThread_func)(jvmti, cthread, vthread_ptr); @@ -818,7 +818,7 @@ GetVirtualThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread, jthread* vthread static jvmtiError GetCarrierThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread, jthread* cthread_ptr) { - if (GetCarrierThread_func == NULL) { // lazily initialize function pointer + if (GetCarrierThread_func == nullptr) { // lazily initialize function pointer GetCarrierThread_func = find_ext_function(jvmti, jni, "GetCarrierThread"); } jvmtiError err = (*GetCarrierThread_func)(jvmti, vthread, cthread_ptr); @@ -828,7 +828,7 @@ GetCarrierThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread, jthread* cthread static jthread get_virtual_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread) { - jthread vthread = NULL; + jthread vthread = nullptr; jvmtiError err = GetVirtualThread(jvmti, jni, cthread, &vthread); check_jvmti_status(jni, err, "jvmti_common get_virtual_thread: Error in JVMTI extension GetVirtualThread"); return vthread; @@ -836,7 +836,7 @@ get_virtual_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread) { static jthread get_carrier_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread) { - jthread cthread = NULL; + jthread cthread = nullptr; jvmtiError err = GetCarrierThread(jvmti, jni, vthread, &cthread); check_jvmti_status(jni, err, "jvmti_common get_carrier_thread: Error in JVMTI extension GetCarrierThread"); @@ -846,26 +846,26 @@ get_carrier_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread) { static jvmtiExtensionEventInfo* find_ext_event(jvmtiEnv* jvmti, const char* ename) { jint extCount = 0; - jvmtiExtensionEventInfo* extList = NULL; + jvmtiExtensionEventInfo* extList = nullptr; jvmtiError err = jvmti->GetExtensionEvents(&extCount, &extList); if (err != JVMTI_ERROR_NONE) { LOG("jvmti_common find_ext_event: Error in JVMTI GetExtensionFunctions: %s(%d)\n",TranslateError(err), err); - return NULL; + return nullptr; } for (int i = 0; i < extCount; i++) { - if (strstr(extList[i].id, (char*)ename) != NULL) { + if (strstr(extList[i].id, (char*)ename) != nullptr) { return &extList[i]; } } - return NULL; + return nullptr; } static jvmtiError set_ext_event_callback(jvmtiEnv* jvmti, const char* ename, jvmtiExtensionEvent callback) { jvmtiExtensionEventInfo* info = find_ext_event(jvmti, ename); - if (info == NULL) { + if (info == nullptr) { LOG("jvmti_common set_ext_event_callback: Extension event was not found: %s\n", ename); return JVMTI_ERROR_NOT_AVAILABLE; } diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_thread.h b/test/lib/jdk/test/lib/jvmti/jvmti_thread.hpp similarity index 90% rename from test/lib/jdk/test/lib/jvmti/jvmti_thread.h rename to test/lib/jdk/test/lib/jvmti/jvmti_thread.hpp index ed27eb521d453..9d1c612bed415 100644 --- a/test/lib/jdk/test/lib/jvmti/jvmti_thread.h +++ b/test/lib/jdk/test/lib/jvmti/jvmti_thread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,8 +21,8 @@ * questions. */ -#ifndef JVMTI_THREAD_H -#define JVMTI_THREAD_H +#ifndef JVMTI_THREAD_HPP +#define JVMTI_THREAD_HPP #include #include @@ -55,14 +55,14 @@ extern "C" { #define STATUS_PASSED 0 #define STATUS_FAILED 2 -static jvmtiEnv* agent_jvmti_env = NULL; -static JNIEnv* agent_jni_env = NULL; +static jvmtiEnv* agent_jvmti_env = nullptr; +static JNIEnv* agent_jni_env = nullptr; static volatile int current_agent_status = STATUS_PASSED; -static jthread jvmti_agent_thread = NULL; -static jvmtiStartFunction agent_thread_proc = NULL; -static void* agent_thread_arg = NULL; +static jthread jvmti_agent_thread = nullptr; +static jvmtiStartFunction agent_thread_proc = nullptr; +static void* agent_thread_arg = nullptr; void set_agent_fail_status() { current_agent_status = STATUS_FAILED; @@ -185,7 +185,7 @@ static void JNICALL agent_thread_wrapper(jvmtiEnv* jvmti_env, JNIEnv* agentJNI, { /* gelete global ref for agent thread */ agentJNI->DeleteGlobalRef(jvmti_agent_thread); - jvmti_agent_thread = NULL; + jvmti_agent_thread = nullptr; } } @@ -198,37 +198,37 @@ static jthread start_agent_thread_wrapper(JNIEnv *jni_env, jvmtiEnv* jvmti_env) const char* THREAD_CTOR_NAME = ""; const char* THREAD_CTOR_SIGNATURE = "(Ljava/lang/String;)V"; - jobject threadName = NULL; - jclass threadClass = NULL; - jmethodID threadCtor = NULL; - jobject threadObject = NULL; - jobject threadGlobalRef = NULL; + jobject threadName = nullptr; + jclass threadClass = nullptr; + jmethodID threadCtor = nullptr; + jobject threadObject = nullptr; + jobject threadGlobalRef = nullptr; jvmtiError err; threadClass = jni_env->FindClass(THREAD_CLASS_NAME); - if (threadClass == NULL) { - return NULL; + if (threadClass == nullptr) { + return nullptr; } threadCtor = jni_env->GetMethodID(threadClass, THREAD_CTOR_NAME, THREAD_CTOR_SIGNATURE); - if (threadCtor == NULL) { - return NULL; + if (threadCtor == nullptr) { + return nullptr; } threadName = jni_env->NewStringUTF(THREAD_NAME); - if (threadName == NULL) { - return NULL; + if (threadName == nullptr) { + return nullptr; } threadObject = jni_env->NewObject(threadClass, threadCtor, threadName); - if (threadObject == NULL) { - return NULL; + if (threadObject == nullptr) { + return nullptr; } threadGlobalRef = jni_env->NewGlobalRef(threadObject); - if (threadGlobalRef == NULL) { + if (threadGlobalRef == nullptr) { jni_env->DeleteLocalRef(threadObject); - return NULL; + return nullptr; } jvmti_agent_thread = (jthread)threadGlobalRef; @@ -236,7 +236,7 @@ static jthread start_agent_thread_wrapper(JNIEnv *jni_env, jvmtiEnv* jvmti_env) if (err != JVMTI_ERROR_NONE) { jni_env->DeleteGlobalRef(threadGlobalRef); jni_env->DeleteLocalRef(threadObject); - return NULL; + return nullptr; } return jvmti_agent_thread; } @@ -245,9 +245,9 @@ static jthread start_agent_thread_wrapper(JNIEnv *jni_env, jvmtiEnv* jvmti_env) static jthread run_agent_thread(JNIEnv *jni_env, jvmtiEnv* jvmti_env) { /* start agent thread wrapper */ jthread thread = start_agent_thread_wrapper(jni_env, jvmti_env); - if (thread == NULL) { + if (thread == nullptr) { set_agent_fail_status(); - return NULL; + return nullptr; } return thread; @@ -265,7 +265,7 @@ static jint sync_debuggee_status(JNIEnv* jni_env, jvmtiEnv* jvmti_env, jint debu /* we don't enter if-stmt in second call */ if (agent_data.thread_state == NEW) { - if (run_agent_thread(jni_env, jvmti_env) == NULL) { + if (run_agent_thread(jni_env, jvmti_env) == nullptr) { return result; } diff --git a/test/lib/native/testlib_threads.h b/test/lib/native/testlib_threads.hpp similarity index 88% rename from test/lib/native/testlib_threads.h rename to test/lib/native/testlib_threads.hpp index 575a5a3c15fc5..3a7b18eccf6e0 100644 --- a/test/lib/native/testlib_threads.h +++ b/test/lib/native/testlib_threads.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,8 +21,8 @@ * questions. */ -#ifndef TEST_LIB_NATIVE_THREAD_H -#define TEST_LIB_NATIVE_THREAD_H +#ifndef TEST_LIB_NATIVE_THREAD_HPP +#define TEST_LIB_NATIVE_THREAD_HPP // Header only library for using threads in tests @@ -70,8 +70,8 @@ void run_in_new_thread_and_join(PROCEDURE proc, void* context) { helper.proc = proc; helper.context = context; #ifdef _WIN32 - HANDLE thread = CreateThread(NULL, 0, procedure, &helper, 0, NULL); - if (thread == NULL) { + HANDLE thread = CreateThread(nullptr, 0, procedure, &helper, 0, nullptr); + if (thread == nullptr) { fatal("failed to create thread", GetLastError()); } if (WaitForSingleObject(thread, INFINITE) != WAIT_OBJECT_0) { @@ -90,7 +90,7 @@ void run_in_new_thread_and_join(PROCEDURE proc, void* context) { fatal("failed to create thread", result); } pthread_attr_destroy(&attr); - result = pthread_join(thread, NULL); + result = pthread_join(thread, nullptr); if (result != 0) { fatal("failed to join thread", result); } @@ -99,4 +99,4 @@ void run_in_new_thread_and_join(PROCEDURE proc, void* context) { } -#endif // TEST_LIB_NATIVE_THREAD_H +#endif // TEST_LIB_NATIVE_THREAD_HPP