8190980: Develop test cases and collect test pass rate
Develop tests covering all the test cases described in the test plan and achieve 100% pass rate for JEP 316: Heap Allocation on Alternative Memory Devices Reviewed-by: sangheki, tschatzl
This commit is contained in:
parent
3fc999a1fe
commit
66c00b4184
test/hotspot/jtreg/gc
78
test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
Normal file
78
test/hotspot/jtreg/gc/TestAllocateHeapAtError.java
Normal file
@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/* @test TestAllocateHeapAtError.java
|
||||
* @key gc
|
||||
* @summary Test to check correct handling of non-existent directory passed to AllocateHeapAt option
|
||||
* @library /test/lib
|
||||
* @modules java.base/jdk.internal.misc
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import jdk.test.lib.JDKToolFinder;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.UUID;
|
||||
|
||||
public class TestAllocateHeapAtError {
|
||||
public static void main(String args[]) throws Exception {
|
||||
ArrayList<String> vmOpts = new ArrayList();
|
||||
|
||||
String testVmOptsStr = System.getProperty("test.java.opts");
|
||||
if (!testVmOptsStr.isEmpty()) {
|
||||
String[] testVmOpts = testVmOptsStr.split(" ");
|
||||
Collections.addAll(vmOpts, testVmOpts);
|
||||
}
|
||||
String test_dir = System.getProperty("test.dir", ".");
|
||||
|
||||
File f = null;
|
||||
do {
|
||||
f = new File(test_dir, UUID.randomUUID().toString());
|
||||
} while(f.exists());
|
||||
|
||||
Collections.addAll(vmOpts, new String[] {"-XX:AllocateHeapAt=" + f.getName(),
|
||||
"-Xlog:gc+heap=info",
|
||||
"-Xmx32m",
|
||||
"-Xms32m",
|
||||
"-version"});
|
||||
|
||||
System.out.print("Testing:\n" + JDKToolFinder.getJDKTool("java"));
|
||||
for (int i = 0; i < vmOpts.size(); i += 1) {
|
||||
System.out.print(" " + vmOpts.get(i));
|
||||
}
|
||||
System.out.println();
|
||||
|
||||
ProcessBuilder pb =
|
||||
ProcessTools.createJavaProcessBuilder(vmOpts.toArray(new String[vmOpts.size()]));
|
||||
OutputAnalyzer output = new OutputAnalyzer(pb.start());
|
||||
|
||||
System.out.println("Output:\n" + output.getOutput());
|
||||
|
||||
output.shouldContain("Could not create file for Heap");
|
||||
output.shouldContain("Error occurred during initialization of VM");
|
||||
output.shouldNotHaveExitValue(0);
|
||||
}
|
||||
}
|
||||
|
91
test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
Normal file
91
test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
Normal file
@ -0,0 +1,91 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/* @test TestAllocateHeapAtMultiple.java
|
||||
* @key gc
|
||||
* @summary Test to check allocation of Java Heap with AllocateHeapAt option. Has multiple sub-tests to cover different code paths.
|
||||
* @library /test/lib
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* @requires vm.bits == "64"
|
||||
*/
|
||||
|
||||
import jdk.test.lib.JDKToolFinder;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
||||
public class TestAllocateHeapAtMultiple {
|
||||
public static void main(String args[]) throws Exception {
|
||||
ArrayList<String> vmOpts = new ArrayList();
|
||||
String[] testVmOpts = null;
|
||||
|
||||
String test_dir = System.getProperty("test.dir", ".");
|
||||
|
||||
String testVmOptsStr = System.getProperty("test.java.opts");
|
||||
if (!testVmOptsStr.isEmpty()) {
|
||||
testVmOpts = testVmOptsStr.split(" ");
|
||||
}
|
||||
|
||||
// Extra options for each of the sub-tests
|
||||
String[] extraOptsList = new String[] {
|
||||
"-Xmx32m -Xms32m -XX:+UseCompressedOops", // 1. With compressedoops enabled.
|
||||
"-Xmx32m -Xms32m -XX:-UseCompressedOops", // 2. With compressedoops disabled.
|
||||
"-Xmx32m -Xms32m -XX:HeapBaseMinAddress=3g", // 3. With user specified HeapBaseMinAddress.
|
||||
"-Xmx4g -Xms4g", // 4. With larger heap size (UnscaledNarrowOop not possible).
|
||||
"-Xmx4g -Xms4g -XX:+UseLargePages", // 5. Set UseLargePages.
|
||||
"-Xmx4g -Xms4g -XX:+UseNUMA" // 6. Set UseNUMA.
|
||||
};
|
||||
|
||||
for(String extraOpts : extraOptsList) {
|
||||
vmOpts.clear();
|
||||
if(testVmOpts != null) {
|
||||
Collections.addAll(vmOpts, testVmOpts);
|
||||
}
|
||||
// Add extra options specific to the sub-test.
|
||||
String[] extraOptsArray = extraOpts.split(" ");
|
||||
if(extraOptsArray != null) {
|
||||
Collections.addAll(vmOpts, extraOptsArray);
|
||||
}
|
||||
// Add common options
|
||||
Collections.addAll(vmOpts, new String[] {"-XX:AllocateHeapAt=" + test_dir,
|
||||
"-Xlog:gc+heap=info",
|
||||
"-version"});
|
||||
|
||||
System.out.print("Testing:\n" + JDKToolFinder.getJDKTool("java"));
|
||||
for (int i = 0; i < vmOpts.size(); i += 1) {
|
||||
System.out.print(" " + vmOpts.get(i));
|
||||
}
|
||||
System.out.println();
|
||||
|
||||
ProcessBuilder pb =
|
||||
ProcessTools.createJavaProcessBuilder(vmOpts.toArray(new String[vmOpts.size()]));
|
||||
OutputAnalyzer output = new OutputAnalyzer(pb.start());
|
||||
|
||||
System.out.println("Output:\n" + output.getOutput());
|
||||
|
||||
output.shouldContain("Successfully allocated Java heap at location");
|
||||
output.shouldHaveExitValue(0);
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,40 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2017, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
/*
|
||||
* @test TestGCBasherWithAllocateHeapAt
|
||||
* @key gc
|
||||
* @key stress
|
||||
* @requires vm.gc.G1
|
||||
* @requires vm.flavor == "server" & !vm.emulatedClient
|
||||
* @summary Stress Java heap allocation with AllocateHeapAt flag using GC basher.
|
||||
* @run main/othervm/timeout=500 -Xlog:gc*=info -Xmx256m -server -XX:+UseG1GC -XX:AllocateHeapAt=. TestGCBasherWithAllocateHeapAt 120000
|
||||
*/
|
||||
public class TestGCBasherWithAllocateHeapAt {
|
||||
public static void main(String[] args) throws IOException {
|
||||
TestGCBasher.main(args);
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user