RFR: JDK-8062449 Update langtools/test/Makefile to use JCK 9

[Jonathan Gibbons]

Dan,

OK by me.

-- Jon


On 10/31/2014 11:28 AM, Dan Smith wrote:
> While I'm at it, here are some trivial cleanups:
> - Silence echoing of the error-handling commands (command still runs, but make doesn't print it out)
> - Allow the 'JCK_VERBOSE' variable to request "-v" (JCK doesn't support this with an alias like "-v:summary")
>
> Jon, if you still approve, I'll push this version.
>
> —Dan
>
> # HG changeset patch
> # Parent 7b80aafb5b76c3dac97aa66f4823fc8bb6ef2365
>
> diff -r 7b80aafb5b76 test/Makefile
> --- a/test/Makefile	Thu Sep 25 14:38:29 2014 -0700
> +++ b/test/Makefile	Fri Oct 31 12:23:40 2014 -0600
> @@ -186,6 +186,10 @@
>     JTREG_OPTIONS += -timeoutFactor:$(JTREG_TIMEOUT_FACTOR)
>   endif
>   
> +ifdef JCK_TIMEOUT_FACTOR
> +  JCK_OPTIONS += -timeout:$(JCK_TIMEOUT_FACTOR)
> +endif
> +
>   # Default verbosity setting for jtreg
>   JTREG_VERBOSE = fail,error,nopass
>   
> @@ -298,7 +302,7 @@
>   endif
>   
>   jtreg-summary: FRC
> -	if [ -r $(JTREG_OUTPUT_DIR)/status.txt ]; then \
> +	@if [ -r $(JTREG_OUTPUT_DIR)/status.txt ]; then \
>   	    echo ; echo "Summary of jtreg test failures" ; \
>   	    cat $(JTREG_OUTPUT_DIR)/JTreport/text/summary.txt | \
>   		grep -v 'Not run' | grep -v 'Passed' ; \
> @@ -336,8 +340,8 @@
>   	    $(JCK_COMPILER_OUTPUT_DIR)/diff.html $(JCK_COMPILER_OUTPUT_DIR)/status.txt
>   	@mkdir -p $(JCK_COMPILER_OUTPUT_DIR)
>   	$(JT_JAVA)/bin/java -Xmx512m \
> -	    -jar $(JCK_HOME)/JCK-compiler-8/lib/jtjck.jar \
> -	    $(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
> +	    -jar $(JCK_HOME)/JCK-compiler-9/lib/jtjck.jar \
> +	    $(if $(JCK_VERBOSE),$(if $(filter $(JCK_VERBOSE),summary),-v,-v:$(JCK_VERBOSE))) \
>               -r:$(JCK_COMPILER_OUTPUT_DIR)/report \
>               -w:$(JCK_COMPILER_OUTPUT_DIR)/work \
>               -jdk:$(TESTJAVA) \
> @@ -353,7 +357,7 @@
>   endif
>   
>   jck-compiler-summary: FRC
> -	if [ -r $(JCK_COMPILER_OUTPUT_DIR)/status.txt ]; then \
> +	@if [ -r $(JCK_COMPILER_OUTPUT_DIR)/status.txt ]; then \
>   	    echo ; echo "Summary of JCK-compiler test failures" ; \
>   	    cat $(JCK_COMPILER_OUTPUT_DIR)/report/text/summary.txt | \
>   		grep -v 'Not run' | grep -v 'Passed' ; \
> @@ -387,8 +391,8 @@
>   	    $(JCK_RUNTIME_OUTPUT_DIR)/diff.html $(JCK_RUNTIME_OUTPUT_DIR)/status.txt
>   	@mkdir -p $(JCK_RUNTIME_OUTPUT_DIR)
>   	$(JT_JAVA)/bin/java -Xmx512m \
> -	    -jar $(JCK_HOME)/JCK-runtime-8/lib/jtjck.jar \
> -	    $(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
> +	    -jar $(JCK_HOME)/JCK-runtime-9/lib/jtjck.jar \
> +	    $(if $(JCK_VERBOSE),$(if $(filter $(JCK_VERBOSE),summary),-v,-v:$(JCK_VERBOSE))) \
>               -r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
>               -w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
>               -jdk:$(TESTJAVA) \
> @@ -405,7 +409,7 @@
>   endif
>   
>   jck-runtime-summary: FRC
> -	if [ -r $(JCK_RUNTIME_OUTPUT_DIR)/status.txt ]; then \
> +	@if [ -r $(JCK_RUNTIME_OUTPUT_DIR)/status.txt ]; then \
>   	    echo ; echo "Summary of JCK-runtime test failures" ; \
>   	    cat $(JCK_RUNTIME_OUTPUT_DIR)/report/text/summary.txt | \
>   		grep -v 'Not run' | grep -v 'Passed' ; \
> @@ -417,7 +421,7 @@
>   check-jck: $(JCK_HOME) $(PRODUCT_HOME)
>   
>   all-summary: FRC
> -	if [ -n "`find $(TEST_OUTPUT_DIR) -name status.txt`" ]; then
> +	@if [ -n "`find $(TEST_OUTPUT_DIR) -name status.txt`" ]; then
>   	    echo ; echo "Summary of test failures" ; \
>   	    cat `find $(TEST_OUTPUT_DIR) -name summary.txt` | \
>   		grep -v 'Not run' | grep -v 'Passed' ; \
>
>
>
>
>> On Oct 30, 2014, at 8:59 AM, Jonathan Gibbons <jonathan.gibbons at oracle.com> wrote:
>>
>> Da, Erik,
>>
>> Looks good to me.
>>
>> --- Jon
>>
>> On 10/30/2014 01:27 AM, Erik Joelsson wrote:
>>> Hello Dan,
>>>
>>> The change looks good to me. I'm not a user of these tests though so perhaps best to get a langtools reviewer to look at it too.
>>>
>>> /Erik