diff -r 35ca229c7f6f -r 448cd909c9e2 test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCTest.java --- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCTest.java Thu Jul 26 11:31:15 2018 -0700 +++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCTest.java Thu Jul 26 11:53:59 2018 -0700 @@ -43,13 +43,17 @@ throw new RuntimeException("Statistics should be null to begin with."); } + // Put sampling rate to 100k to ensure samples are collected. + HeapMonitor.setSamplingInterval(100 * 1024); + HeapMonitor.enableSamplingEvents(); List frameList = HeapMonitor.allocate(); - frameList.add(new Frame("main", "([Ljava/lang/String;)V", "HeapMonitorGCTest.java", 48)); + frameList.add(new Frame("main", "([Ljava/lang/String;)V", "HeapMonitorGCTest.java", 51)); Frame[] frames = frameList.toArray(new Frame[0]); - if (!HeapMonitor.obtainedEvents(frames)) { + if (!HeapMonitor.obtainedEvents(frames) + && !HeapMonitor.garbageContains(frames)) { throw new RuntimeException("No expected events were found."); }