8268131: 2 java/foreign tests timed out

Reviewed-by: dcubed
openjdk · Jun 3, 2021 · 52d8215 · 52d8215 · openjdk-notifier · Jun 3, 2021
1 parent 5405f98
commit 52d8215
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/test/jdk/java/foreign/TestDowncall.java b/test/jdk/java/foreign/TestDowncall.java
@@ -28,7 +28,7 @@
  * @modules jdk.incubator.foreign/jdk.internal.foreign
  * @build NativeTestHelper CallGeneratorHelper TestDowncall
  *
- * @run testng/othervm
+ * @run testng/othervm/timeout=240
  *   --enable-native-access=ALL-UNNAMED
  *   TestDowncall
  */

diff --git a/test/jdk/java/foreign/TestResourceScope.java b/test/jdk/java/foreign/TestResourceScope.java
@@ -127,7 +127,14 @@ public void testSharedMultiThread(Supplier<Cleaner> cleanerSupplier) {
         // if no cleaner, close - not all segments might have been added to the scope!
         // if cleaner, don't unset the scope - after all, the scope is kept alive by threads
         if (cleaner == null) {
-            scope.close();
+            while (true) {
+                try {
+                    scope.close();
+                    break;
+                } catch (IllegalStateException ise) {
+                    // scope is acquired (by add) - wait some more
+                }
+            }
         }
 
         threads.forEach(t -> {

diff --git a/test/jdk/java/foreign/TestUpcall.java b/test/jdk/java/foreign/TestUpcall.java
@@ -28,7 +28,7 @@
  * @modules jdk.incubator.foreign/jdk.internal.foreign
  * @build NativeTestHelper CallGeneratorHelper TestUpcall
  *
- * @run testng/othervm
+ * @run testng/othervm/timeout=240
  *   --enable-native-access=ALL-UNNAMED
  *   TestUpcall
  */