equal
deleted
inserted
replaced
403 ) \ |
403 ) \ |
404 $(if $(filter make, $1), \ |
404 $(if $(filter make, $1), \ |
405 special:make:all \ |
405 special:make:all \ |
406 ) |
406 ) |
407 ) \ |
407 ) \ |
408 $(if $(filter hotspot-internal failure-handler, $1), \ |
408 $(if $(filter failure-handler, $1), \ |
409 special:$(strip $1) \ |
409 special:$(strip $1) \ |
410 ) |
410 ) |
411 endef |
411 endef |
412 |
412 |
413 ifeq ($(TEST), ) |
413 ifeq ($(TEST), ) |
777 else |
777 else |
778 $1_TEST_NAME := $$($1_FULL_TEST_NAME) |
778 $1_TEST_NAME := $$($1_FULL_TEST_NAME) |
779 $1_TEST_ARGS := |
779 $1_TEST_ARGS := |
780 endif |
780 endif |
781 |
781 |
782 ifeq ($$($1_TEST_NAME), hotspot-internal) |
782 ifeq ($$($1_TEST_NAME), failure-handler) |
783 $1_TEST_COMMAND_LINE := \ |
|
784 $$(JDK_IMAGE_DIR)/bin/java -XX:+ExecuteInternalVMTests \ |
|
785 -XX:+ShowMessageBoxOnError -version |
|
786 else ifeq ($$($1_TEST_NAME), failure-handler) |
|
787 ifeq ($(BUILD_FAILURE_HANDLER), true) |
783 ifeq ($(BUILD_FAILURE_HANDLER), true) |
788 $1_TEST_COMMAND_LINE := \ |
784 $1_TEST_COMMAND_LINE := \ |
789 ($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f \ |
785 ($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f \ |
790 BuildFailureHandler.gmk test) |
786 BuildFailureHandler.gmk test) |
791 else |
787 else |