Skip to content
Permalink
Browse files
6606767: resexhausted00[34] fail assert(!thread->owns_locks(), "must …
…release all locks when leaving VM")

Reviewed-by: sspitsyn, cjplummer
  • Loading branch information
Alex Menkov committed Oct 21, 2020
1 parent 1191a63 commit b9186bebc34a814e411a441e7ad4af8e6e6ed04a
@@ -131,8 +131,7 @@ vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all

vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java 8253916 linux-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java 6606767 generic-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java 6606767 generic-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java 8253916 linux-all
vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@

import nsk.share.Consts;
import nsk.share.test.Stresser;
import jtreg.SkippedException;

public class resexhausted003 {

@@ -115,7 +116,7 @@ public static int run(String args[], PrintStream out) {
}

System.out.println("Can't reproduce OOME due to a limit on iterations/execution time. Test was useless.");
return Consts.TEST_PASSED;
throw new SkippedException("Test did not get an OutOfMemory error");

} catch (OutOfMemoryError e) {
// that is what we are waiting for
@@ -27,6 +27,7 @@
import jdk.test.lib.Utils;

import nsk.share.Consts;
import jtreg.SkippedException;

public class resexhausted004 {
public static int run(String args[], PrintStream out) {
@@ -35,23 +36,24 @@ public static int run(String args[], PrintStream out) {
int r;

for ( int i = 4 + selector.nextInt() & 3; i > 0; i-- ) {
switch ( selector.nextInt() % 3 ) {
try {
switch (selector.nextInt() % 3) {
case 0:
r = resexhausted001.run(args, out);
if ( r != Consts.TEST_PASSED )
return r;
break;
case 1:
r = resexhausted002.run(args, out);
if ( r != Consts.TEST_PASSED )
return r;
break;
default:
r = resexhausted003.run(args, out);
if ( r != Consts.TEST_PASSED )
return r;
break;
}
}
if (r != Consts.TEST_PASSED) {
return r;
}
} catch (SkippedException ex) {
// it's ok
}
}

return Consts.TEST_PASSED;

1 comment on commit b9186be

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on b9186be Oct 21, 2020

Please sign in to comment.