# HG changeset patch # User dcubed # Date 1460044132 25200 # Node ID 671c8a2e1ba08821b3acfda7c431878acf7f2bc2 # Parent 6072af7a98be3922f26bdce71b53bb3646cb2ac9# Parent a45ea24ba6be2b97d06a11984b0343d2d4e4633c Merge diff -r 6072af7a98be -r 671c8a2e1ba0 make/jprt.properties --- a/make/jprt.properties Wed Jul 05 21:31:37 2017 +0200 +++ b/make/jprt.properties Thu Apr 07 08:48:52 2016 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 @@ -311,13 +311,13 @@ # Platforms built for hotspot push jobs my.build.targets.hotspot= \ - solaris_sparcv9_5.11-{product|fastdebug}, \ + solaris_sparcv9_5.11-{product|fastdebug}, \ solaris_x64_5.11-{product|fastdebug}, \ linux_i586_3.8-{product|fastdebug}, \ - linux_x64_3.8-{product|fastdebug}, \ + linux_x64_3.8-{product|fastdebug}, \ macosx_x64_10.9-{product|fastdebug}, \ windows_i586_6.3-{product|fastdebug}, \ - windows_x64_6.3-{product|fastdebug}, \ + windows_x64_6.3-{product|fastdebug}, \ solaris_x64_5.11-{fastdebugOpen}, \ linux_x64_3.8-{productOpen}, \ ${my.additional.build.targets.hotspot} @@ -346,18 +346,15 @@ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1 my.test.targets.hotspot.linux.i586= \ - linux_i586_3.8-{product|fastdebug}-{c1|c2}-jvm98, \ + linux_i586_3.8-{product|fastdebug}-c2-jvm98, \ linux_i586_3.8-{product|fastdebug}-c2-jvm98_nontiered, \ - linux_i586_3.8-{product|fastdebug}-{c1|c2}-scimark, \ - linux_i586_3.8-product-c1-runThese8_Xcomp_lang, \ - linux_i586_3.8-product-c1-runThese8_Xcomp_vm, \ - linux_i586_3.8-fastdebug-c1-runThese8_Xshare, \ + linux_i586_3.8-{product|fastdebug}-c2-scimark, \ linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_lang, \ linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_vm, \ - linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ - linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ - linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ - linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_G1 + linux_i586_3.8-{product|fastdebug}-c2-GCBasher_SerialGC, \ + linux_i586_3.8-{product|fastdebug}-c2-GCBasher_ParallelGC, \ + linux_i586_3.8-{product|fastdebug}-c2-GCBasher_CMS, \ + linux_i586_3.8-{product|fastdebug}-c2-GCBasher_G1 my.test.targets.hotspot.linux.x64= \ linux_x64_3.8-{product|fastdebug}-c2-jvm98, \ @@ -378,17 +375,16 @@ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1 my.test.targets.hotspot.windows.i586= \ - windows_i586_6.3-{product|fastdebug}-{c1|c2}-jvm98, \ + windows_i586_6.3-{product|fastdebug}-c2-jvm98, \ windows_i586_6.3-{product|fastdebug}-c2-jvm98_nontiered, \ - windows_i586_6.3-{product|fastdebug}-{c1|c2}-scimark, \ - windows_i586_6.3-product-{c1|c2}-runThese8, \ - windows_i586_6.3-product-{c1|c2}-runThese8_Xcomp_lang, \ - windows_i586_6.3-product-{c1|c2}-runThese8_Xcomp_vm, \ - windows_i586_6.3-fastdebug-c1-runThese8_Xshare, \ - windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ - windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ - windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ - windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_G1 + windows_i586_6.3-{product|fastdebug}-c2-scimark, \ + windows_i586_6.3-product-c2-runThese8, \ + windows_i586_6.3-product-c2-runThese8_Xcomp_lang, \ + windows_i586_6.3-product-c2-runThese8_Xcomp_vm, \ + windows_i586_6.3-{product|fastdebug}-c2-GCBasher_SerialGC, \ + windows_i586_6.3-{product|fastdebug}-c2-GCBasher_ParallelGC, \ + windows_i586_6.3-{product|fastdebug}-c2-GCBasher_CMS, \ + windows_i586_6.3-{product|fastdebug}-c2-GCBasher_G1 my.test.targets.hotspot.windows.x64= \ windows_x64_6.3-{product|fastdebug}-c2-jvm98, \ @@ -443,22 +439,21 @@ linux_x64_3.8-fastdebug-c2-GROUP, \ macosx_x64_10.9-fastdebug-c2-GROUP, \ windows_i586_6.3-fastdebug-c2-GROUP, \ - windows_x64_6.3-fastdebug-c2-GROUP, \ - linux_i586_3.8-fastdebug-c1-GROUP, \ - windows_i586_6.3-fastdebug-c1-GROUP + windows_x64_6.3-fastdebug-c2-GROUP # Hotspot jtreg tests -my.make.rule.test.targets.hotspot.reg= \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_closed}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_gcold}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \ +my.make.rule.test.targets.hotspot.reg= \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_compiler_1}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_compiler_2}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_compiler_3}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_compiler_closed}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_gc_1}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_gc_2}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_gc_closed}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_gc_gcold}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_runtime}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_fast_serviceability}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \ ${my.additional.make.rule.test.targets.hotspot.reg} # Other Makefile based Hotspot tests diff -r 6072af7a98be -r 671c8a2e1ba0 test/failure_handler/Makefile --- a/test/failure_handler/Makefile Wed Jul 05 21:31:37 2017 +0200 +++ b/test/failure_handler/Makefile Thu Apr 07 08:48:52 2016 -0700 @@ -29,7 +29,7 @@ CLASSES_DIR := ${BUILD_DIR}/classes IMAGE_DIR := ${BUILD_DIR}/image RUN_DIR := $(shell pwd)/run - +CLASSPATH := ${JTREG_HOME}/lib/jtreg.jar:${JAVA_HOME}/lib/tools.jar SRC_DIR := src/share/classes/ SOURCES := ${SRC_DIR}/jdk/test/failurehandler/*.java \ ${SRC_DIR}/jdk/test/failurehandler/action/*.java \ @@ -47,9 +47,12 @@ ifeq ("${OS_NAME}", "Cygwin") BUILD_DIR := $(shell cygpath -m "${BUILD_DIR}") CLASSES_DIR := $(shell cygpath -m "${CLASSES_DIR}") -IMAGE_DIR := $(shell cygpath -m "${IMAGE_DIR}") RUN_DIR := $(shell cygpath -m "${RUN_DIR}") +IMAGE_DIR := $(shell cygpath -m "${IMAGE_DIR}") +RUN_DIR := $(shell cygpath -m "${RUN_DIR}") SRC_DIR := $(shell cygpath -m "${SRC_DIR}") +JAVA_HOME := $(shell cygpath -m "${JAVA_HOME}") JTREG_HOME := $(shell cygpath -m "${JTREG_HOME}") +CLASSPATH := $(shell cygpath -pm "${CLASSPATH}") CC := "cl.exe" endif @@ -57,33 +60,33 @@ native: require_env ifeq ("${OS_NAME}", "Cygwin") - "${CC}" src/windows/native/jdk/test/failurehandler/jtreg/*.c \ - -I"$(shell cygpath -w ${JAVA_HOME}/include)" \ - -I"$(shell cygpath -w ${JAVA_HOME}/include/win32)" \ - /link /MACHINE:X64 /DLL /OUT:timeoutHandler.dll + "${CC}" src/windows/native/jdk/test/failurehandler/jtreg/*.c \ + -I"$(shell cygpath -w "${JAVA_HOME}/include")" \ + -I"$(shell cygpath -w "${JAVA_HOME}/include/win32")" \ + /link /DLL /OUT:timeoutHandler.dll endif check_defined = $(foreach 1,$1,$(__check_defined)) __check_defined = $(if $(value $1),, $(error $1 is not set)) classes: require_env - mkdir -p ${IMAGE_DIR}/bin ${IMAGE_DIR}/lib ${CLASSES_DIR} - "${JAVA_HOME}"/bin/javac -target ${JAVA_RELEASE} -source ${JAVA_RELEASE} \ - -sourcepath $(shell pwd) \ - -classpath ${JTREG_HOME}/lib/jtreg.jar:${JAVA_HOME}/lib/tools.jar \ - -d ${CLASSES_DIR} \ + mkdir -p ${IMAGE_DIR}/bin ${IMAGE_DIR}/lib ${CLASSES_DIR} + "${JAVA_HOME}"/bin/javac -target ${JAVA_RELEASE} -source ${JAVA_RELEASE} \ + -sourcepath "$(shell pwd)" \ + -cp "${CLASSPATH}" \ + -d ${CLASSES_DIR} \ ${SOURCES} - "${JAVA_HOME}"/bin/jar cf ${TARGET_JAR} -C ${CLASSES_DIR} . - "${JAVA_HOME}"/bin/jar uf ${TARGET_JAR} -C ${CONF_DIR} . + "${JAVA_HOME}"/bin/jar cf "${TARGET_JAR}" -C "${CLASSES_DIR}" . + "${JAVA_HOME}"/bin/jar uf "${TARGET_JAR}" -C "${CONF_DIR}" . # # Use JTREG_TEST_OPTS for test VM options # Use JTREG_TESTS for jtreg tests parameter # test: require_env build - rm -rf ${RUN_DIR} - mkdir -p ${RUN_DIR} - "${JTREG_HOME}"/bin/jtreg \ + rm -rf "${RUN_DIR}" + mkdir -p "${RUN_DIR}" + "${JTREG_HOME}"/bin/jtreg \ -jdk:"${JAVA_HOME}" \ ${JTREG_TEST_OPTS} \ -timeout:0.1 -va -retain:all \ @@ -93,7 +96,8 @@ -th:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ -od:"${TARGET_JAR}" \ -o:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ - -w:${RUN_DIR}/JTwork -r:${RUN_DIR}/JTreport \ + -w:"${RUN_DIR}/JTwork" \ + -r:"${RUN_DIR}/JTreport" \ $(if ${JTREG_TESTS}, ${JTREG_TESTS}, test) \ && false || true @@ -101,11 +105,11 @@ debug: test require_env: - $(call check_defined, JAVA_HOME) - $(call check_defined, JTREG_HOME) + $(call check_defined, JAVA_HOME) + $(call check_defined, JTREG_HOME) clean: - rm -rf "${BUILD_DIR}" "${RUN_DIR}" + rm -rf "${BUILD_DIR}" "${RUN_DIR}" build: classes native diff -r 6072af7a98be -r 671c8a2e1ba0 test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.java --- a/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.java Wed Jul 05 21:31:37 2017 +0200 +++ b/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.java Thu Apr 07 08:48:52 2016 -0700 @@ -39,12 +39,16 @@ * process and its children. */ public class GatherProcessInfoTimeoutHandler extends TimeoutHandler { + private static final boolean HAS_NATIVE_LIBRARY; static { + boolean value = true; try { System.loadLibrary("timeoutHandler"); } catch (UnsatisfiedLinkError ignore) { // not all os need timeoutHandler native-library + value = false; } + HAS_NATIVE_LIBRARY = value; } private static final String LOG_FILENAME = "processes.log"; private static final String OUTPUT_FILENAME = "processes.html"; @@ -105,7 +109,7 @@ if (result == 0L) { /* jtreg didn't find pid, most probably we are on JDK < 9 there is no Process::getPid */ - if ("windows".equals(OS.current().family)) { + if (HAS_NATIVE_LIBRARY && "windows".equals(OS.current().family)) { try { Field field = process.getClass().getDeclaredField("handle"); boolean old = field.isAccessible(); diff -r 6072af7a98be -r 671c8a2e1ba0 test/failure_handler/test/sanity/Suicide.java --- a/test/failure_handler/test/sanity/Suicide.java Wed Jul 05 21:31:37 2017 +0200 +++ b/test/failure_handler/test/sanity/Suicide.java Thu Apr 07 08:48:52 2016 -0700 @@ -28,7 +28,7 @@ /* * @test * @summary Suicide test - * @run main/othervm Crash + * @run main/othervm Suicide */ public class Suicide { public static void main(String[] args) {