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
On 2014-10-29 20:41, Dan Smith wrote:
Looking for a review of the following small patch to
langtools/test/Makefile. The script is hard-coded to use JCK 8 when
running JCK tests, causing 19 failures; it should be using JCK 9. I
assume there aren't any important processes that depend on this
target (e.g., SQE automated runs) or they would have updated to JCK 9
already.
I also added a parameter to allow adjustment of the timeout factor;
two tests frequently timeout on my machine.
If it's better to handle this within the langtools team, please just
let me know and I'll do so.
—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 Wed Oct 29 13:33:50 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
@@ -336,7 +340,7 @@
$(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 \
+ -jar $(JCK_HOME)/JCK-compiler-9/lib/jtjck.jar \
$(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
-r:$(JCK_COMPILER_OUTPUT_DIR)/report \
-w:$(JCK_COMPILER_OUTPUT_DIR)/work \
@@ -387,7 +391,7 @@
$(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 \
+ -jar $(JCK_HOME)/JCK-runtime-9/lib/jtjck.jar \
$(if $(JCK_VERBOSE),-v:$(JCK_VERBOSE)) \
-r:$(JCK_RUNTIME_OUTPUT_DIR)/report \
-w:$(JCK_RUNTIME_OUTPUT_DIR)/work \
