infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-03 15:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

8144536: Clean up Unified Logging test directory

Browse Source 
Consolidated two logging options' tests into one file each

Reviewed-by: dholmes, ctornqvi
This commit is contained in:
Rachel Protacio 2015-12-03 13:08:37 -05:00
parent f06c0a7041
commit 0d75e3c8cd
5 changed files with 48 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/test/runtime/logging/DefaultMethodsTest.java
View File

@ -28,7 +28,7 @@
* @library /testlibrary
* @modules java.base/sun.misc
* java.management
* @run main DefaultMethodsTest
* @run driver DefaultMethodsTest
*/
import jdk.test.lib.*;

28
hotspot/test/runtime/logging/SafepointTest.java
View File

@ -26,19 +26,18 @@
* @bug 8140348
* @summary safepoint=trace should have output from each log statement in the code
* @library /testlibrary
* @compile SafepointTestMain.java
* @modules java.base/sun.misc
* java.management
* @build SafepointTest
* @run main SafepointTest
* @run driver SafepointTest
*/
import jdk.test.lib.*;
import java.lang.ref.WeakReference;
public class SafepointTest {
public static void main(String[] args) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xlog:safepoint=trace", "SafepointTestMain");
"-Xlog:safepoint=trace", InnerClass.class.getName());
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("Safepoint synchronization initiated. (");
output.shouldContain("Entering safepoint region: ");
@ -46,4 +45,25 @@ public class SafepointTest {
output.shouldContain("_at_poll_safepoint");
output.shouldHaveExitValue(0);
}
public static class InnerClass {
public static byte[] garbage;
public static volatile WeakReference<Object> weakref;
public static void createweakref() {
Object o = new Object();
weakref = new WeakReference<>(o);
}
public static void main(String[] args) throws Exception {
// Cause several safepoints to run GC to see safepoint messages
for (int i = 0; i < 2; i++) {
createweakref();
while(weakref.get() != null) {
garbage = new byte[8192];
System.gc();
}
}
}
}
}

45
hotspot/test/runtime/logging/SafepointTestMain.java
View File

@ -1,45 +0,0 @@
/*
* Copyright (c) 2015, 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.lang.ref.WeakReference;
public class SafepointTestMain {
public static byte[] garbage;
public static volatile WeakReference<Object> weakref;
public static void createweakref() {
Object o = new Object();
weakref = new WeakReference<>(o);
}
public static void main(String[] args) throws Exception {
// Cause several safepoints to run GC to see safepoint messages
for (int i = 0; i < 2; i++) {
createweakref();
while(weakref.get() != null) {
garbage = new byte[8192];
System.gc();
}
}
}
}

26
hotspot/test/runtime/logging/VMOperationTest.java
View File

@ -26,21 +26,41 @@
* @bug 8143157
* @summary vmoperation=debug should have logging output
* @library /testlibrary
* @compile VMOperationTestMain.java
* @modules java.base/sun.misc
* java.management
* @run main VMOperationTest
* @run driver VMOperationTest
*/
import jdk.test.lib.*;
import java.lang.ref.WeakReference;
public class VMOperationTest {
public static void main(String[] args) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xlog:vmoperation=debug", "-Xmx64m", "-Xms64m", "VMOperationTestMain");
"-Xlog:vmoperation=debug", "-Xmx64m", "-Xms64m",
InternalClass.class.getName());
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("VM_Operation (");
output.shouldHaveExitValue(0);
}
public static class InternalClass {
public static byte[] garbage;
public static volatile WeakReference<Object> weakref;
public static void createweakref() {
Object o = new Object();
weakref = new WeakReference<>(o);
}
// Loop until a GC runs.
public static void main(String[] args) throws Exception {
createweakref();
while (weakref.get() != null) {
garbage = new byte[8192];
System.gc();
}
}
}
}

43
hotspot/test/runtime/logging/VMOperationTestMain.java
View File

@ -1,43 +0,0 @@
/*
* Copyright (c) 2015, 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.lang.ref.WeakReference;
public class VMOperationTestMain {
public static byte[] garbage;
public static volatile WeakReference<Object> weakref;
public static void createweakref() {
Object o = new Object();
weakref = new WeakReference<>(o);
}
// Loop until a GC runs.
public static void main(String[] args) throws Exception {
createweakref();
while (weakref.get() != null) {
garbage = new byte[8192];
System.gc();
}
}
}