From 91cb10d36cf28d145725321a3463964ab6036c10 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Tue, 16 Nov 2021 21:35:41 +0000 Subject: [PATCH] 8275037: Test vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java crashes with memory exhaustion on Windows --- .../jtreg/vmTestbase/nsk/sysdict/share/GenClassesBuilder.java | 3 ++- .../jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/GenClassesBuilder.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/GenClassesBuilder.java index e48ff567aacf3..6f3a2084083c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/GenClassesBuilder.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/GenClassesBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 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 @@ -71,6 +71,7 @@ private static void build(String name, String prefix, Runnable generator) { moveJavaFiles(genSrcDir, prefix); JDKToolLauncher javac = JDKToolLauncher.create("javac") + .addToolArg("-J-Xmx1G") .addToolArg("-d") .addToolArg(classesDir.toString()) .addToolArg("-cp") diff --git a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java index 043cbf8b80e9f..2b217a368c252 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/SysDictTest.java @@ -148,8 +148,8 @@ public void run() { // set name into public variable just to be sure // that class is loaded tmp = clz.getName(); - } catch (OutOfMemoryError | ClassNotFoundException e) { - // just ignore + } catch (OutOfMemoryError | ClassNotFoundException | NoClassDefFoundError e) { + // just ignore, note that CNFE and NCDFE can be caused by OOM exceptions. } catch (StackOverflowError soe) { // just ignore, chains could be too large // StackOverflowError could be in some sparcs