Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/Makefile	Tue May 13 16:14:54 2014 +0100
     1.2 +++ b/test/Makefile	Tue May 13 15:34:13 2014 -0600
     1.3 @@ -186,6 +186,12 @@
     1.4    JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR)
     1.5  endif
     1.6  
     1.7 +# Default verbosity setting for jtreg
     1.8 +JTREG_VERBOSE = fail,error,nopass
     1.9 +
    1.10 +# Default verbosity setting for jck
    1.11 +JCK_VERBOSE = non-pass
    1.12 +
    1.13  # Assertions: some tests show failures when assertions are enabled.
    1.14  # Since javac is typically loaded via the bootclassloader (either via TESTJAVA
    1.15  # or TESTBOOTCLASSPATH), you may need -esa to enable assertions in javac.
    1.16 @@ -256,6 +262,8 @@
    1.17  #	Version of java used to run jtreg.  Should normally be the same as TESTJAVA
    1.18  # TESTJAVA
    1.19  # 	Version of java to be tested.
    1.20 +# JTREG_VERBOSE
    1.21 +# Verbosity setting for jtreg
    1.22  # JTREG_OPTIONS
    1.23  #	Additional options for jtreg
    1.24  # JTREG_TESTDIRS
    1.25 @@ -273,7 +281,7 @@
    1.26  	JT_JAVA=$(JT_JAVA) $(JTREG) \
    1.27  	  -J-Xmx512m \
    1.28  	  -vmoption:-Xmx768m \
    1.29 -	  -a -ignore:quiet -v:fail,error,nopass \
    1.30 +	  -a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \
    1.31            -r:$(JTREG_OUTPUT_DIR)/JTreport \
    1.32            -w:$(JTREG_OUTPUT_DIR)/JTwork \
    1.33            -jdk:$(TESTJAVA) \
    1.34 @@ -312,6 +320,8 @@
    1.35  #       Default is JDK 7
    1.36  # TESTJAVA
    1.37  # 	Version of java to be tested.
    1.38 +# JCK_VERBOSE
    1.39 +#	Verbosity setting for jtjck
    1.40  # JCK_COMPILER_OPTIONS
    1.41  #	Additional options for JCK-compiler
    1.42  # JCK_COMPILER_TESTDIRS
    1.43 @@ -325,9 +335,9 @@
    1.44  	@rm -f -r $(JCK_COMPILER_OUTPUT_DIR)/work $(JCK_COMPILER_OUTPUT_DIR)/report \
    1.45  	    $(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt
    1.46  	@mkdir -p $(JCK_COMPILER_OUTPUT_DIR)
    1.47 -	$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
    1.48 +	$(JT_JAVA)/bin/java -Xmx512m \
    1.49  	    -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \
    1.50 -	    -v:non-pass \
    1.51 +	    $(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
    1.52              -r:$(JCK_COMPILER_OUTPUT_DIR)/report \
    1.53              -w:$(JCK_COMPILER_OUTPUT_DIR)/work \
    1.54              -jdk:$(TESTJAVA) \
    1.55 @@ -361,6 +371,8 @@
    1.56  #	Version of java used to run JCK.  Should normally be the same as TESTJAVA
    1.57  # TESTJAVA
    1.58  # 	Version of java to be tested.
    1.59 +# JCK_VERBOSE
    1.60 +#	Verbosity setting for jtjck
    1.61  # JCK_RUNTIME_OPTIONS
    1.62  #	Additional options for JCK-runtime
    1.63  # JCK_RUNTIME_TESTDIRS
    1.64 @@ -374,9 +386,9 @@
    1.65  	@rm -f -r $(JCK_RUNTIME_OUTPUT_DIR)/work $(JCK_RUNTIME_OUTPUT_DIR)/report \
    1.66  	    $(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt
    1.67  	@mkdir -p $(JCK_RUNTIME_OUTPUT_DIR)
    1.68 -	$(JT_JAVA)/bin/java -XX:MaxPermSize=256m -Xmx512m \
    1.69 +	$(JT_JAVA)/bin/java -Xmx512m \
    1.70  	    -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \
    1.71 -	    -v:non-pass \
    1.72 +	    $(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
    1.73              -r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
    1.74              -w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
    1.75              -jdk:$(TESTJAVA) \