Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8212213: All tests for splashscreen stopped worked in jdk12b13
authorserb
Fri, 19 Oct 2018 11:15:57 -0700
changeset 52264 d6c322e900b2
parent 52263 680ab6b53f6f
child 52265 297450fcab26
8212213: All tests for splashscreen stopped worked in jdk12b13 Reviewed-by: ihse, prr
src/java.base/macosx/native/libjli/java_md_macosx.m file | annotate | diff | comparison | revisions
test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java file | annotate | diff | comparison | revisions 
--- a/src/java.base/macosx/native/libjli/java_md_macosx.m	Fri Oct 19 15:26:50 2018 +0100
+++ b/src/java.base/macosx/native/libjli/java_md_macosx.m	Fri Oct 19 11:15:57 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -761,7 +761,7 @@
  * Note there is a callback on this function from the splashscreen logic,
  * this as well SetJavaVMValue() needs to be simplified.
  */
-JavaVM*
+JNIEXPORT JavaVM* JNICALL
 JLI_GetJavaVMInstance()
 {
     return jvmInstance;
--- a/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Fri Oct 19 15:26:50 2018 +0100
+++ b/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Fri Oct 19 11:15:57 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -43,7 +43,7 @@
 /**
  * @test
  * @key headful
- * @bug 8043869 8075244 8078082 8145173 8151787
+ * @bug 8043869 8075244 8078082 8145173 8151787 8212213
  * @summary Tests the HiDPI splash screen support for windows and MAC
  * @modules java.desktop/sun.java2d
  * @run main MultiResolutionSplashTest GENERATE_IMAGES
jdk-sandbox