darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2025-03-02 13:06:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8146287: typos in /test/failure_handler

Browse Source 
Reviewed-by: iignatyev, stsmirno
This commit is contained in:
Kirill Zhaldybin 2016-02-16 15:25:45 +03:00
parent 37fa7566a0
commit 4b48aaa15e
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/failure_handler/Makefile
View File

@ -29,7 +29,7 @@ BUILD_DIR := $(shell pwd)/build
CLASSES_DIR := ${BUILD_DIR}/classes CLASSES_DIR := ${BUILD_DIR}/classes
IMAGE_DIR := ${BUILD_DIR}/image IMAGE_DIR := ${BUILD_DIR}/image
RUN_DIR := $(shell pwd)/run RUN_DIR := $(shell pwd)/run
CLASSPATH := ${JTREG_HOME}/lib/jtreg.jar:${JAVA_HOME}/lib/tools.jar
SRC_DIR := src/share/classes/ SRC_DIR := src/share/classes/
SOURCES := ${SRC_DIR}/jdk/test/failurehandler/*.java \ SOURCES := ${SRC_DIR}/jdk/test/failurehandler/*.java \
${SRC_DIR}/jdk/test/failurehandler/action/*.java \ ${SRC_DIR}/jdk/test/failurehandler/action/*.java \
@ -47,9 +47,12 @@ OS_NAME := $(shell uname -o 2>&1)
ifeq ("${OS_NAME}", "Cygwin") ifeq ("${OS_NAME}", "Cygwin")
BUILD_DIR := $(shell cygpath -m "${BUILD_DIR}") BUILD_DIR := $(shell cygpath -m "${BUILD_DIR}")
CLASSES_DIR := $(shell cygpath -m "${CLASSES_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}") SRC_DIR := $(shell cygpath -m "${SRC_DIR}")
JAVA_HOME := $(shell cygpath -m "${JAVA_HOME}")
JTREG_HOME := $(shell cygpath -m "${JTREG_HOME}") JTREG_HOME := $(shell cygpath -m "${JTREG_HOME}")
CLASSPATH := $(shell cygpath -pm "${CLASSPATH}")
CC := "cl.exe" CC := "cl.exe"
endif endif
@ -57,33 +60,33 @@ all: clean test
native: require_env native: require_env
ifeq ("${OS_NAME}", "Cygwin") ifeq ("${OS_NAME}", "Cygwin")
"${CC}" src/windows/native/jdk/test/failurehandler/jtreg/*.c \ "${CC}" src/windows/native/jdk/test/failurehandler/jtreg/*.c \
-I"$(shell cygpath -w ${JAVA_HOME}/include)" \ -I"$(shell cygpath -w "${JAVA_HOME}/include")" \
-I"$(shell cygpath -w ${JAVA_HOME}/include/win32)" \ -I"$(shell cygpath -w "${JAVA_HOME}/include/win32")" \
/link /MACHINE:X64 /DLL /OUT:timeoutHandler.dll /link /DLL /OUT:timeoutHandler.dll
endif endif
check_defined = $(foreach 1,$1,$(__check_defined)) check_defined = $(foreach 1,$1,$(__check_defined))
__check_defined = $(if $(value $1),, $(error $1 is not set)) __check_defined = $(if $(value $1),, $(error $1 is not set))
classes: require_env classes: require_env
mkdir -p ${IMAGE_DIR}/bin ${IMAGE_DIR}/lib ${CLASSES_DIR} mkdir -p ${IMAGE_DIR}/bin ${IMAGE_DIR}/lib ${CLASSES_DIR}
"${JAVA_HOME}"/bin/javac -target ${JAVA_RELEASE} -source ${JAVA_RELEASE} \ "${JAVA_HOME}"/bin/javac -target ${JAVA_RELEASE} -source ${JAVA_RELEASE} \
-sourcepath $(shell pwd) \ -sourcepath "$(shell pwd)" \
-classpath ${JTREG_HOME}/lib/jtreg.jar:${JAVA_HOME}/lib/tools.jar \ -cp "${CLASSPATH}" \
-d ${CLASSES_DIR} \ -d ${CLASSES_DIR} \
${SOURCES} ${SOURCES}
"${JAVA_HOME}"/bin/jar cf ${TARGET_JAR} -C ${CLASSES_DIR} . "${JAVA_HOME}"/bin/jar cf "${TARGET_JAR}" -C "${CLASSES_DIR}" .
"${JAVA_HOME}"/bin/jar uf ${TARGET_JAR} -C ${CONF_DIR} . "${JAVA_HOME}"/bin/jar uf "${TARGET_JAR}" -C "${CONF_DIR}" .
# #
# Use JTREG_TEST_OPTS for test VM options # Use JTREG_TEST_OPTS for test VM options
# Use JTREG_TESTS for jtreg tests parameter # Use JTREG_TESTS for jtreg tests parameter
# #
test: require_env build test: require_env build
rm -rf ${RUN_DIR} rm -rf "${RUN_DIR}"
mkdir -p ${RUN_DIR} mkdir -p "${RUN_DIR}"
"${JTREG_HOME}"/bin/jtreg \ "${JTREG_HOME}"/bin/jtreg \
-jdk:"${JAVA_HOME}" \ -jdk:"${JAVA_HOME}" \
${JTREG_TEST_OPTS} \ ${JTREG_TEST_OPTS} \
-timeout:0.1 -va -retain:all \ -timeout:0.1 -va -retain:all \
@ -93,7 +96,8 @@ test: require_env build
-th:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ -th:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
-od:"${TARGET_JAR}" \ -od:"${TARGET_JAR}" \
-o:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ -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) \ $(if ${JTREG_TESTS}, ${JTREG_TESTS}, test) \
&& false || true && false || true
@ -101,11 +105,11 @@ debug: JTREG_TEST_OPTS += "-J-agentlib:jdwp=transport=dt_socket,server=y,suspend
debug: test debug: test
require_env: require_env:
$(call check_defined, JAVA_HOME) $(call check_defined, JAVA_HOME)
$(call check_defined, JTREG_HOME) $(call check_defined, JTREG_HOME)
clean: clean:
rm -rf "${BUILD_DIR}" "${RUN_DIR}" rm -rf "${BUILD_DIR}" "${RUN_DIR}"
build: classes native build: classes native

2
test/failure_handler/test/sanity/Suicide.java
View File

@ -28,7 +28,7 @@ import java.lang.management.ManagementFactory;
/* /*
* @test * @test
* @summary Suicide test * @summary Suicide test
* @run main/othervm Crash * @run main/othervm Suicide
*/ */
public class Suicide { public class Suicide {
public static void main(String[] args) { public static void main(String[] args) {