1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8202290: AtomicAppend tests fail on macOS 10.13 ("High Sierra")

Browse Source 
Reinstate actual running of tests for macOS version >= 10.13.

Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2018-05-25 07:22:37 -07:00
parent b9a55926f3
commit 5c90486c43
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/jdk/java/io/FileOutputStream/AtomicAppend.java
View File

@ -25,9 +25,6 @@
* @test * @test
* @bug 6631352 * @bug 6631352
* @summary Check that appends are atomic * @summary Check that appends are atomic
* @library /test/lib
* @build jdk.test.lib.Platform
* @run main AtomicAppend
*/ */
import java.io.File; import java.io.File;
@ -36,8 +33,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jdk.test.lib.Platform;
public class AtomicAppend { public class AtomicAppend {
// Before the fix for // Before the fix for
// 6631352: Implement atomic append mode using FILE_APPEND_DATA (win) // 6631352: Implement atomic append mode using FILE_APPEND_DATA (win)
@ -78,15 +73,6 @@ public class AtomicAppend {
if (x == null ? y == null : x.equals(y)) pass(); if (x == null ? y == null : x.equals(y)) pass();
else fail(x + " not equal to " + y);} else fail(x + " not equal to " + y);}
public static void main(String[] args) throws Throwable { public static void main(String[] args) throws Throwable {
if (Platform.isOSX()) {
final String version = "10.13";
int ineq = Platform.compareOsVersion(version);
if (ineq >= 0) {
System.out.format("Skipping test for macOS version %s >= %s%n",
Platform.getOsVersion(), version);
return;
}
}
new AtomicAppend().instanceMain(args); new AtomicAppend().instanceMain(args);
} }
void instanceMain(String[] args) throws Throwable { void instanceMain(String[] args) throws Throwable {

14
test/jdk/java/nio/channels/FileChannel/AtomicAppend.java
View File

@ -24,9 +24,6 @@
/* /*
* @test * @test
* @summary Check that appends are atomic * @summary Check that appends are atomic
* @library /test/lib
* @build jdk.test.lib.Platform
* @run main AtomicAppend
* @key randomness * @key randomness
*/ */
@ -43,8 +40,6 @@ import java.nio.channels.FileChannel;
import java.nio.file.Files; import java.nio.file.Files;
import static java.nio.file.StandardOpenOption.*; import static java.nio.file.StandardOpenOption.*;
import jdk.test.lib.Platform;
public class AtomicAppend { public class AtomicAppend {
static final Random rand = new Random(); static final Random rand = new Random();
@ -81,15 +76,6 @@ public class AtomicAppend {
} }
public static void main(String[] args) throws Throwable { public static void main(String[] args) throws Throwable {
if (Platform.isOSX()) {
final String version = "10.13";
int ineq = Platform.compareOsVersion(version);
if (ineq >= 0) {
System.out.format("Skipping test for macOS version %s >= %s%n",
Platform.getOsVersion(), version);
return;
}
}
final int nThreads = 16; final int nThreads = 16;
final int writes = 1000; final int writes = 1000;
final File file = File.createTempFile("foo", null); final File file = File.createTempFile("foo", null);