aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Alex Menkov <69548902+alexmenkov@users.noreply.github.com> 2021-06-18 15:54:42 -0700
committerGravatar Alex Menkov <69548902+alexmenkov@users.noreply.github.com> 2021-06-18 15:54:42 -0700
commitd615cdbc15ecd37715b2389f76cf7fade256a8c8 (patch)
tree15e590917aa0fe7d9da02bc9c03c8bf34a59b242
parent8f2456e5b058a88730ec383d88634737849afdfb (diff)
downloadjdk-pr/4535.tar.gz
jdk-pr/4535.zip
Updated tests to allow CompiledMethodLoad/Unload event to be sent in start phasepr/4535
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp8
2 files changed, 8 insertions, 8 deletions
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 fda4fcf00a9..a75546f9bdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,13 +76,13 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size,
return;
}
- if (phase != JVMTI_PHASE_LIVE) {
+ if (phase != JVMTI_PHASE_START && phase != JVMTI_PHASE_LIVE) {
result = STATUS_FAILED;
- NSK_COMPLAIN1("TEST FAILED: CompiledMethodLoad event received during non-live phase %s\n",
+ NSK_COMPLAIN1("TEST FAILED: CompiledMethodLoad event received during wrong phase %s\n",
TranslatePhase(phase));
}
else
- NSK_DISPLAY0("CHECK PASSED: CompiledMethodLoad event received during the live phase as expected\n\n");
+ NSK_DISPLAY0("CHECK PASSED: CompiledMethodLoad event received during the start or live phase as expected\n\n");
}
/************************/
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 c5cc7e21d16..7b048a2202f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -108,13 +108,13 @@ CompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method,
return;
}
- if (phase != JVMTI_PHASE_LIVE) {
+ if (phase != JVMTI_PHASE_START && phase != JVMTI_PHASE_LIVE) {
result = STATUS_FAILED;
- NSK_COMPLAIN1("TEST FAILED: CompiledMethodUnload event received during non-live phase %s\n",
+ NSK_COMPLAIN1("TEST FAILED: CompiledMethodUnload event received during wrong phase %s\n",
TranslatePhase(phase));
}
else
- NSK_DISPLAY0("CHECK PASSED: CompiledMethodUnload event received during the live phase as expected\n\n");
+ NSK_DISPLAY0("CHECK PASSED: CompiledMethodUnload event received during the start or live phase as expected\n\n");
}
/************************/