Looks good.
Thanks,
David
On 7/04/2019 6:12 pm, Mandy Chung wrote:
It needs another fix for windows build:
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -61,6 +61,7 @@
BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA)
WIN_LIB_JLI := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := $(WIN_LIB_JLI)
+ BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := jvm.lib
else
BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava
BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava
@@ -70,10 +71,9 @@
BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava
-lsocket -lnsl
endif
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
+ BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := -ljvm
endif
-BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := -ljvm
-
ifeq ($(call isTargetOs, macosx), true)
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework
JavaVM \
Mandy
On 4/7/19 10:47 AM, David Holmes wrote:
Looks good.
Thanks,
David
On 7/04/2019 9:37 am, Mandy Chung wrote:
A simple test fix. The test causes the build failure.
Thanks
Mandy
diff --git
a/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c b/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c
---
a/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c
+++
b/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c
@@ -34,6 +34,7 @@
static jmethodID mid_Field_get;
int getField(JNIEnv *env, char* declaringClass_name, char*
field_name);
+int checkAndClearIllegalAccessExceptionThrown(JNIEnv *env);
int main(int argc, char** args) {
JavaVM *jvm;
