Skip to content

Commit e2df9cd

Browse files
committed
8356226: JCov Grabber server didn't respond
Reviewed-by: erikj
1 parent 4977588 commit e2df9cd

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

make/RunTests.gmk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,12 +1343,14 @@ TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test
13431343

13441344
ifeq ($(TEST_OPTS_JCOV), true)
13451345

1346+
JCOV_VM_OPTS := -Xmx4g -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.maxGeneralEntitySizeLimit=0
1347+
13461348
jcov-do-start-grabber:
13471349
$(call MakeDir, $(JCOV_OUTPUT_DIR))
13481350
if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
13491351
$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
13501352
fi
1351-
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
1353+
$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
13521354
$(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
13531355
1>$(JCOV_GRABBER_LOG) 2>&1 &
13541356

@@ -1368,7 +1370,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
13681370

13691371
jcov-gen-report: jcov-stop-grabber
13701372
$(call LogWarn, Generating JCov report ...)
1371-
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
1373+
$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
13721374
`$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
13731375
$(JCOV_FILTERS) \
13741376
-mainReportTitle "$(JCOV_REPORT_TITLE)" \
@@ -1392,7 +1394,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
13921394
jcov-gen-diffcoverage: jcov-stop-grabber
13931395
$(call LogWarn, Generating diff coverage with changeset $(TEST_OPTS_JCOV_DIFF_CHANGESET) ... )
13941396
$(DIFF_COMMAND)
1395-
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar \
1397+
$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar \
13961398
DiffCoverage -replaceDiff "src/.*/classes/:" -all \
13971399
$(JCOV_RESULT_FILE) $(JCOV_SOURCE_DIFF) > \
13981400
$(JCOV_DIFF_COVERAGE_REPORT)

0 commit comments

Comments
 (0)