changeset 51729:a3183ce753e6

8201513: nsk/jvmti/IterateThroughHeap/filter-* are broken Reviewed-by: sspitsyn, cjplummer
author amenkov
date Fri, 13 Jul 2018 10:10:51 -0700
parents 147b20e60274
children 3ddf41505d54
files test/hotspot/jtreg/ProblemList.txt test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.c
diffstat 2 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/ProblemList.txt	Fri Jul 13 14:04:59 2018 +0530
+++ b/test/hotspot/jtreg/ProblemList.txt	Fri Jul 13 10:10:51 2018 -0700
@@ -139,10 +139,6 @@
 vmTestbase/nsk/jvmti/AttachOnDemand/attach034/TestDescription.java 8042145 generic-all
 vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
 vmTestbase/nsk/jvmti/unit/heap/HeapWalkTests/TestDescription.java 8016181 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/TestDescription.java 8201513 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-class-untagged/TestDescription.java 8201513 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-class-tagged/TestDescription.java 8201513 generic-all
-vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java 8201513 generic-all
 
 vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8191869,8192647 generic-all
 
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.c	Fri Jul 13 14:04:59 2018 +0530
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.c	Fri Jul 13 10:10:51 2018 -0700
@@ -163,7 +163,7 @@
                             void* user_data) {
   int object;
   int field;
-  if(!NSK_VERIFY(!verify_tag(object_class_tag, *object_tag_ptr))) {
+  if (!NSK_VERIFY(verify_tag(object_class_tag, *object_tag_ptr))) {
     nsk_jvmti_setFailStatus();
   }
 
@@ -190,7 +190,7 @@
                              void* user_data) {
   int object;
   int field;
-  if(!NSK_VERIFY(!verify_tag(class_tag, *tag_ptr))) {
+  if (!NSK_VERIFY(verify_tag(class_tag, *tag_ptr))) {
     nsk_jvmti_setFailStatus();
   }
   for(object = 0; object < TEST_OBJECTS_COUNT; object++) {
@@ -221,7 +221,7 @@
                             void* user_data) {
   int object;
   int field;
-  if(!NSK_VERIFY(!verify_tag(class_tag, *tag_ptr))) {
+  if (!NSK_VERIFY(verify_tag(class_tag, *tag_ptr))) {
     nsk_jvmti_setFailStatus();
   }
   for(object = 0; object < TEST_OBJECTS_COUNT; object++) {
@@ -247,7 +247,7 @@
                            jlong* tag_ptr,
                            jint length,
                            void* user_data) {
-  if(!NSK_VERIFY(!verify_tag(class_tag, *tag_ptr))) {
+  if (!NSK_VERIFY(verify_tag(class_tag, *tag_ptr))) {
     NSK_COMPLAIN0("Tag values invalid for selected heap filter were passed "
                   "to jvmtiHeapIterationCallback.\n");
     NSK_COMPLAIN2("\tClass tag: 0x%lX;\n\tObject tag: 0x%lX.\n", class_tag, *tag_ptr);
@@ -293,7 +293,7 @@
 
 /**
  * Read array of test objects.
- * Tag each of these objjects, their classes, non-primitive fields and non-primitive fields classes.
+ * Tag each of these objects, their classes, non-primitive fields and non-primitive fields classes.
  */
 int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) {
   jclass debugee;
@@ -502,7 +502,7 @@
     return;
   }
 
-  NSK_DISPLAY0("Verifying that all filds were found.\n");
+  NSK_DISPLAY0("Verifying that all fields were found.\n");
   verify_objects(1);
 
   if(!NSK_VERIFY(nsk_jvmti_resumeSync())) {
@@ -520,7 +520,7 @@
     return;
   }
 
-  NSK_DISPLAY0("Verifying that all filds were found.\n");
+  NSK_DISPLAY0("Verifying that all fields were found.\n");
   verify_objects(0);
 
   /*