Mercurial > hg > openjdk > jdk8u > jdk

changeset 14462:51233f24cf43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8249142: java/awt/FontClass/CreateFont/DeleteFont.sh is unstable Reviewed-by: serb
author prr
date Sat, 19 Sep 2020 17:36:12 +0000
parents 7fb344096b3b
children 9122a352fb12
files test/java/awt/FontClass/CreateFont/DeleteFont.java test/java/awt/FontClass/CreateFont/DeleteFont.sh
diffstat 2 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/awt/FontClass/CreateFont/DeleteFont.java	Thu Aug 13 16:26:17 2015 +0300
+++ b/test/java/awt/FontClass/CreateFont/DeleteFont.java	Sat Sep 19 17:36:12 2020 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2020, 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
@@ -21,8 +21,11 @@
  * questions.
  */
 
-import java.io.*;
-import java.awt.*;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.awt.Font;
 
 public class DeleteFont {
 
@@ -55,19 +58,22 @@
         if (!gotException) {
             throw new RuntimeException("No expected IOException");
         }
-        badRead(-2, Font.TRUETYPE_FONT);
-        badRead(8193, Font.TRUETYPE_FONT);
 
-        badRead(-2, Font.TYPE1_FONT);
-        badRead(8193, Font.TYPE1_FONT);
+        badRead(-2, 16, Font.TYPE1_FONT);
+        badRead(8193, 14, Font.TYPE1_FONT);
+
+        badRead(-2, 12, Font.TRUETYPE_FONT);
+        badRead(8193, 10, Font.TRUETYPE_FONT);
 
         // Make sure GC has a chance to clean up before we exit.
         System.gc(); System.gc();
+        Thread.sleep(5000);
+        System.gc(); System.gc();
     }
 
-    static void badRead(final int retval, int fontType) {
+    static void badRead(final int retval, final int multiple, int fontType) {
         int num = 2;
-        byte[] buff = new byte[16*8192]; // Multiple of 8192 is important.
+        byte[] buff = new byte[multiple*8192]; // Multiple of 8192 is important.
         for (int ct=0; ct<num; ++ct) {
             try {
                 Font.createFont(
--- a/test/java/awt/FontClass/CreateFont/DeleteFont.sh	Thu Aug 13 16:26:17 2015 +0300
+++ b/test/java/awt/FontClass/CreateFont/DeleteFont.sh	Sat Sep 19 17:36:12 2020 +0000
@@ -20,7 +20,8 @@
 # questions.
 
 # @test
-# @bug 6189812 6380357 6632886
+# @bug 6189812 6380357 6632886 8249142
+# @key intermittent
 # @summary Verify that temporary font files are deleted on exit.
 
 if [ -z "${TESTSRC}" ]; then