< prev index next >

test/failure_handler/Makefile

Print this page
rev 1910 : 8146287: typos in /test/failure_handler
Reviewed-by: duke

*** 27,37 **** BUILD_DIR := $(shell pwd)/build CLASSES_DIR := ${BUILD_DIR}/classes IMAGE_DIR := ${BUILD_DIR}/image RUN_DIR := $(shell pwd)/run ! SRC_DIR := src/share/classes/ SOURCES := ${SRC_DIR}/jdk/test/failurehandler/*.java \ ${SRC_DIR}/jdk/test/failurehandler/action/*.java \ ${SRC_DIR}/jdk/test/failurehandler/jtreg/*.java \ ${SRC_DIR}/jdk/test/failurehandler/value/*.java --- 27,37 ---- BUILD_DIR := $(shell pwd)/build 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 \ ${SRC_DIR}/jdk/test/failurehandler/jtreg/*.java \ ${SRC_DIR}/jdk/test/failurehandler/value/*.java
*** 45,101 **** OS_NAME := $(shell uname -o 2>&1) 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}") SRC_DIR := $(shell cygpath -m "${SRC_DIR}") JTREG_HOME := $(shell cygpath -m "${JTREG_HOME}") CC := "cl.exe" endif all: clean test 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 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} \ ${SOURCES} ! "${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 \ -jdk:"${JAVA_HOME}" \ ${JTREG_TEST_OPTS} \ -timeout:0.1 -va -retain:all \ -noreport \ -agentvm \ -thd:"${TARGET_JAR}" \ -th:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ -od:"${TARGET_JAR}" \ -o:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ ! -w:${RUN_DIR}/JTwork -r:${RUN_DIR}/JTreport \ $(if ${JTREG_TESTS}, ${JTREG_TESTS}, test) \ && false || true debug: JTREG_TEST_OPTS += "-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005'" debug: test --- 45,105 ---- OS_NAME := $(shell uname -o 2>&1) 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}") 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 all: clean test 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 /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)" \ ! -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}" . # # 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 \ -jdk:"${JAVA_HOME}" \ ${JTREG_TEST_OPTS} \ -timeout:0.1 -va -retain:all \ -noreport \ -agentvm \ -thd:"${TARGET_JAR}" \ -th:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ -od:"${TARGET_JAR}" \ -o:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ ! -w:"${RUN_DIR}/JTwork" \ ! -r:"${RUN_DIR}/JTreport" \ $(if ${JTREG_TESTS}, ${JTREG_TESTS}, test) \ && false || true debug: JTREG_TEST_OPTS += "-J-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005'" debug: test
< prev index next >