[11u] RFR: 8232834: RunTest sometimes fails to produce valid exitcode.txt

Severin Gehwolf sgehwolf at redhat.com
Wed Jan 8 19:10:21 UTC 2020


Hi Goetz,

On Wed, 2020-01-08 at 12:10 +0000, Lindenmaier, Goetz wrote:
> Hi,
> 
> I had to resolve this manually.
> The original change introduces brackets after each
> ExecuteWithLog statement.
> In 11, these statements look different so that the patch
> does not apply.
> 
> I checked all occurances of this statement and added
> the brackets accordingly.
> 
> http://cr.openjdk.java.net/~goetz/wr20/8232834-RunTest_fails-jdk11/01/
> https://bugs.openjdk.java.net/browse/JDK-8232834
> https://hg.openjdk.java.net/jdk/jdk/rev/f67f4674b466

This seems to have broken running tier1 tests (make run-test-tier1).
I'm getting a bash syntax error message.

>From the webrev:

+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
 	    $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
 	        -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
 	        $$($1_JTREG_BASIC_OPTIONS) \
@@ -754,7 +754,7 @@
 	        $$($1_TEST_NAME) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	)))
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt
 
@@ -828,12 +828,12 @@
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \
 	    $$($1_TEST_COMMAND_LINE) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	)))

This is different from the JDK HEAD patch. Adds one too many closing brackets.

Thanks,
Severin





More information about the jdk-updates-dev mailing list