equal
deleted
inserted
replaced
340 @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) |
340 @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) |
341 @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` |
341 @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` |
342 |
342 |
343 # Cleanup |
343 # Cleanup |
344 clean: |
344 clean: |
345 $(RM) -r $(ABS_TEST_OUTPUT_DIR) |
345 @$(RM) -r $(ABS_TEST_OUTPUT_DIR) |
346 $(RM) $(ARCHIVE_BUNDLE) |
346 @$(RM) $(ARCHIVE_BUNDLE) |
347 |
347 |
348 ################################################################ |
348 ################################################################ |
349 |
349 |
350 # jtreg tests |
350 # jtreg tests |
351 |
351 |
399 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\ |
399 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)' ) ;\ |
400 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\ |
400 ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-all' ) ;\ |
401 ($(ECHO) "#") ;\ |
401 ($(ECHO) "#") ;\ |
402 ) | $(SED) -e 's@^[\ ]*@@' \ |
402 ) | $(SED) -e 's@^[\ ]*@@' \ |
403 | $(EGREP) -v '^#' > $@.temp1 |
403 | $(EGREP) -v '^#' > $@.temp1 |
404 for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \ |
404 @for tdir in $(TESTDIRS) SOLARIS_10_SH_BUG_NO_EMPTY_FORS ; do \ |
405 ( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \ |
405 ( ( $(CAT) $@.temp1 | $(EGREP) "^$${tdir}" ) ; $(ECHO) "#" ) >> $@.temp2 ; \ |
406 done |
406 done |
407 @$(ECHO) "# at least one line" >> $@.temp2 |
407 @$(ECHO) "# at least one line" >> $@.temp2 |
408 @( $(EGREP) -v '^#' $@.temp2 ; true ) > $@ |
408 @( $(EGREP) -v '^#' $@.temp2 ; true ) > $@ |
409 @$(ECHO) "Excluding list contains `$(EXPAND) $@ | $(WC) -l` items" |
409 @$(ECHO) "Excluding list contains `$(EXPAND) $@ | $(WC) -l` items" |
429 endef |
429 endef |
430 |
430 |
431 # ------------------------------------------------------------------ |
431 # ------------------------------------------------------------------ |
432 |
432 |
433 # Batches of tests (somewhat arbitrary assigments to jdk_* targets) |
433 # Batches of tests (somewhat arbitrary assigments to jdk_* targets) |
|
434 # NOTE: These *do not* run the same tests as make/jprt.properties |
434 JDK_DEFAULT_TARGETS = |
435 JDK_DEFAULT_TARGETS = |
435 JDK_ALL_TARGETS = |
436 JDK_ALL_TARGETS = |
436 |
437 |
437 # Stable othervm testruns (minus items from PROBLEM_LIST) |
438 # Stable othervm testruns (minus items from PROBLEM_LIST) |
438 # Using agentvm has problems, and doesn't help performance as much as others. |
439 # Using agentvm has problems, and doesn't help performance as much as others. |
612 $(call RunAgentvmBatch) |
613 $(call RunAgentvmBatch) |
613 |
614 |
614 # ------------------------------------------------------------------ |
615 # ------------------------------------------------------------------ |
615 |
616 |
616 # Run default tests |
617 # Run default tests |
|
618 # note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.default.test.targets |
617 jdk_default: $(JDK_DEFAULT_TARGETS) |
619 jdk_default: $(JDK_DEFAULT_TARGETS) |
618 @$(SummaryInfo) |
620 @$(SummaryInfo) |
619 |
621 |
|
622 # Run core tests |
|
623 # please keep this in sync with jdk/make/jprt.properties :: jprt.make.rule.core.test.targets |
|
624 jdk_core: jdk_lang jdk_math jdk_util jdk_io jdk_net jdk_nio \ |
|
625 jdk_security1 jdk_security2 jdk_security3 jdk_rmi \ |
|
626 jdk_management jdk_jmx jdk_text jdk_tools jdk_jfr jdk_other |
|
627 @$(SummaryInfo) |
|
628 |
620 # Run all tests |
629 # Run all tests |
|
630 # note that this *does not* have the same meaning as jprt.properties :: jprt.make.rule.all.test.targets |
621 jdk_all: $(JDK_ALL_TARGETS) |
631 jdk_all: $(JDK_ALL_TARGETS) |
622 @$(SummaryInfo) |
632 @$(SummaryInfo) |
623 |
633 |
624 # These are all phony targets |
634 # These are all phony targets |
625 PHONY_LIST += $(JDK_ALL_TARGETS) |
635 PHONY_LIST += $(JDK_ALL_TARGETS) jdk_default jdk_core jdk_all |
626 |
636 |
627 # ------------------------------------------------------------------ |
637 # ------------------------------------------------------------------ |
628 |
638 |
629 # Default JTREG to run (win32 script works for everybody) |
639 # Default JTREG to run (win32 script works for everybody) |
630 JTREG = $(JT_HOME)/win32/bin/jtreg |
640 JTREG = $(JT_HOME)/win32/bin/jtreg |
890 |
900 |
891 # Phony targets (e.g. these are not filenames) |
901 # Phony targets (e.g. these are not filenames) |
892 .PHONY: all clean prep $(PHONY_LIST) |
902 .PHONY: all clean prep $(PHONY_LIST) |
893 |
903 |
894 ################################################################ |
904 ################################################################ |
895 |
|