stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8166045: jdk/internal/misc/Unsafe tests fail due to timeout

Browse Source 
Only run the memory hungry tests on large machines

Reviewed-by: dholmes, ctornqvi
This commit is contained in:
Mikael Vidstedt 2016-09-28 08:22:54 -07:00
parent c329dba540
commit 644dc8b4e9
4 changed files with 116 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/test/jdk/internal/misc/Unsafe/CopyMemory.java
View File

@ -22,7 +22,6 @@
*/
import jdk.internal.misc.Unsafe;
import java.lang.reflect.Field;
/*
* @test
@ -40,7 +39,6 @@ public class CopyMemory extends CopyCommon {
*/
private void testPositive() {
testSmallCopy(false);
testLargeCopy(false);
}
/**

58
jdk/test/jdk/internal/misc/Unsafe/CopyMemoryLarge.java Normal file
View File

@ -0,0 +1,58 @@
/*
* Copyright (c) 2016, 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 jdk.internal.misc.Unsafe;
/*
* @test
* @summary Test Unsafe.copyMemory
* @modules java.base/jdk.internal.misc
* @requires os.maxMemory > 8G
*/
public class CopyMemoryLarge extends CopyCommon {
private CopyMemoryLarge() {
}
/**
* Run positive tests
*
* @throws RuntimeException if an error is found
*/
private void testPositive() {
testLargeCopy(false);
}
/**
* Run all tests
*
* @throws RuntimeException if an error is found
*/
private void test() {
testPositive();
}
public static void main(String[] args) {
CopyMemoryLarge cs = new CopyMemoryLarge();
cs.test();
}
}

2
jdk/test/jdk/internal/misc/Unsafe/CopySwap.java
View File

@ -22,7 +22,6 @@
*/
import jdk.internal.misc.Unsafe;
import java.lang.reflect.Field;
/*
* @test
@ -40,7 +39,6 @@ public class CopySwap extends CopyCommon {
*/
private void testPositive() {
testSmallCopy(true);
testLargeCopy(true);
}
/**

58
jdk/test/jdk/internal/misc/Unsafe/CopySwapLarge.java Normal file
View File

@ -0,0 +1,58 @@
/*
* Copyright (c) 2016, 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 jdk.internal.misc.Unsafe;
/*
* @test
* @summary Test Unsafe.copySwapMemory
* @modules java.base/jdk.internal.misc
* @requires os.maxMemory > 8G
*/
public class CopySwapLarge extends CopyCommon {
private CopySwapLarge() {
}
/**
* Run positive tests
*
* @throws RuntimeException if an error is found
*/
private void testPositive() {
testLargeCopy(true);
}
/**
* Run all tests
*
* @throws RuntimeException if an error is found
*/
private void test() {
testPositive();
}
public static void main(String[] args) {
CopySwapLarge cs = new CopySwapLarge();
cs.test();
}
}