< prev index next >

test/langtools/Makefile

Print this page
rev 51977 : [mq]: 8211350-no-jprt

*** 10,23 **** # A langtools build just builds the langtools components of a JDK. # To test a langtools build, set TESTJAVA to the path for a recent JDK # build, and set TESTBOOTCLASSPATH to the compiled langtools classes -- # for example build/classes or dist/lib/classes.jar. - # JPRT - # JPRT may invoke this Makefile directly, as part of a langtools build, - # or indirectly, via FOREST/test/Makefile, as part of a control build. - # Get OS/ARCH specifics OSNAME = $(shell uname -s) ifeq ($(OSNAME), SunOS) SLASH_JAVA = /java PLATFORM = solaris --- 10,19 ----
*** 69,95 **** endif # Root of this test area (important to use full paths in some places) TEST_ROOT := $(shell pwd $(CYGPATH) ) - # Default bundle of all test results (passed or not) (JPRT only) - ifdef JPRT_JOB_ID - JPRT_CLEAN = clean - JPRT_ARCHIVE_BUNDLE = $(TEST_ROOT)/JPRT_ARCHIVE_BUNDLE.zip - endif - ifeq ($(PLATFORM), windows) SLASH_JAVA = J: else SLASH_JAVA = /java endif # Default JTREG to run ifndef JTREG_HOME ! ifdef JPRT_JTREG_HOME ! JTREG_HOME = $(JPRT_JTREG_HOME) ! else ifdef JT_HOME JTREG_HOME = $(JT_HOME) else JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.2/promoted/latest/ endif endif --- 65,83 ---- endif # Root of this test area (important to use full paths in some places) TEST_ROOT := $(shell pwd $(CYGPATH) ) ifeq ($(PLATFORM), windows) SLASH_JAVA = J: else SLASH_JAVA = /java endif # Default JTREG to run ifndef JTREG_HOME ! ifdef JT_HOME JTREG_HOME = $(JT_HOME) else JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.2/promoted/latest/ endif endif
*** 106,142 **** JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%) endif # Default JCK to run ifndef JCK_HOME - ifdef JPRT_JCK_HOME - JCK_HOME = $(JPRT_JCK_HOME) - else JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries - endif endif # Default JDK for JTREG and JCK # # JT_JAVA is the version of java used to run jtreg/JCK. # ifndef JT_JAVA - ifdef JPRT_JAVA_HOME - JT_JAVA = $(JPRT_JAVA_HOME) - else JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH) - endif endif # Default JDK to test ! ifdef JPRT_IMPORT_PRODUCT_HOME ! TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME) ! else ! TESTJAVA = $(SLASH_JAVA)/re/jdk/1.9.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH) ! endif ! # PRODUCT_HOME is a JPRT variable pointing to a directory containing the output from # make/Makefile # For langtools, this is a directory containing build and dist # For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image # (i.e, j2sdk-image or jdk-module-image) ifdef PRODUCT_HOME --- 94,118 ---- JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%) endif # Default JCK to run ifndef JCK_HOME JCK_HOME = $(SLASH_JAVA)/re/jck/8/promoted/latest/binaries endif # Default JDK for JTREG and JCK # # JT_JAVA is the version of java used to run jtreg/JCK. # ifndef JT_JAVA JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH) endif # Default JDK to test ! TESTJAVA = $(SLASH_JAVA)/re/jdk/1.9.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH) ! # PRODUCT_HOME is a variable pointing to a directory containing the output from # make/Makefile # For langtools, this is a directory containing build and dist # For a control build, this is build/$(PRODUCT)-$(ARCH)/XYZ-image # (i.e, j2sdk-image or jdk-module-image) ifdef PRODUCT_HOME
*** 197,212 **** ### 6924287: Jck4Jdk: Allow to configure test group size for group mode via simple command line option ### JCK_RUNTIME_OPTIONS += \ ### -jtoptions:-Ejck.env.runtime.testCompile.groupMode.groupSize=$(JCK_GROUP_SIZE) endif ! # Timeouts -- by default, increase test timeouts when running on JPRT ! ifdef JPRT_JOB_ID ! ifndef JTREG_TIMEOUT_FACTOR ! JTREG_TIMEOUT_FACTOR = 3 ! endif ! endif ifdef JTREG_TIMEOUT_FACTOR JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR) endif ifdef JCK_TIMEOUT_FACTOR --- 173,183 ---- ### 6924287: Jck4Jdk: Allow to configure test group size for group mode via simple command line option ### JCK_RUNTIME_OPTIONS += \ ### -jtoptions:-Ejck.env.runtime.testCompile.groupMode.groupSize=$(JCK_GROUP_SIZE) endif ! # Timeouts ifdef JTREG_TIMEOUT_FACTOR JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR) endif ifdef JCK_TIMEOUT_FACTOR
*** 264,294 **** JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC JTREG_OPTIONS += $(JTREG_GC_OPTION) endif # Default make rule -- warning, may take a while ! all: $(JPRT_CLEAN) jtreg-tests jck-compiler-tests jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) all-summary @echo "Testing completed successfully" ! jtreg apt javac javadoc javah javap jdeps: $(JPRT_CLEAN) jtreg-tests $(JPRT_ARCHIVE_BUNDLE) jtreg-summary @echo "Testing completed successfully" ! jck-compiler: $(JPRT_CLEAN) jck-compiler-tests $(JPRT_ARCHIVE_BUNDLE) jck-compiler-summary @echo "Testing completed successfully" ! jck-runtime: $(JPRT_CLEAN) jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) jck-runtime-summary @echo "Testing completed successfully" # a way to select tests from outside # works for targets 'jtreg', 'jck-compiler', and 'jck-runtime' ifdef TEST_SELECTION JTREG_TESTDIRS = $(TEST_SELECTION) JCK_COMPILER_TESTDIRS = $(TEST_SELECTION) JCK_RUNTIME_TESTDIRS = $(TEST_SELECTION) endif ! # for use with JPRT -testrule all: JTREG_TESTDIRS = . jtreg: JTREG_TESTDIRS ?= . apt: JTREG_TESTDIRS = tools/apt javac: JTREG_TESTDIRS = tools/javac javadoc: JTREG_TESTDIRS = tools/javadoc com/sun/javadoc --- 235,265 ---- JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC JTREG_OPTIONS += $(JTREG_GC_OPTION) endif # Default make rule -- warning, may take a while ! all: jtreg-tests jck-compiler-tests jck-runtime-tests all-summary @echo "Testing completed successfully" ! jtreg apt javac javadoc javah javap jdeps: jtreg-tests jtreg-summary @echo "Testing completed successfully" ! jck-compiler: jck-compiler-tests jck-compiler-summary @echo "Testing completed successfully" ! jck-runtime: jck-runtime-tests jck-runtime-summary @echo "Testing completed successfully" # a way to select tests from outside # works for targets 'jtreg', 'jck-compiler', and 'jck-runtime' ifdef TEST_SELECTION JTREG_TESTDIRS = $(TEST_SELECTION) JCK_COMPILER_TESTDIRS = $(TEST_SELECTION) JCK_RUNTIME_TESTDIRS = $(TEST_SELECTION) endif ! # convenience targets all: JTREG_TESTDIRS = . jtreg: JTREG_TESTDIRS ?= . apt: JTREG_TESTDIRS = tools/apt javac: JTREG_TESTDIRS = tools/javac javadoc: JTREG_TESTDIRS = tools/javadoc com/sun/javadoc
*** 474,492 **** grep -v 'Not run' | grep -v 'Passed' ; \ echo ; \ $(EXIT) 1 fi - # Bundle up the results - $(JPRT_ARCHIVE_BUNDLE): FRC - @rm -f $@ - @mkdir -p $(@D) - ( cd $(TEST_OUTPUT_DIR) && zip -q -r $@ . ) - # Cleanup clean: - rm -f $(JPRT_ARCHIVE_BUNDLE) # Used to force a target rules to run FRC: # Phony targets (e.g. these are not filenames) --- 445,456 ----
< prev index next >