test/Makefile

rev 4567 : 7092627: use agentvm mode instead of samevm in regtests
Reviewed-by: nobody

*** 355,373 ****
  
  # Samevm settings (default is false)
  ifndef USE_JTREG_SAMEVM
    USE_JTREG_SAMEVM=false
  endif
! # With samevm, you cannot use -javaoptions?
  ifeq ($(USE_JTREG_SAMEVM),true)
!   JTREG_SAMEVM_OPTION = -samevm
    EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
    JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
  else
    JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
  endif
  
  # Some tests annoy me and fail frequently
  PROBLEM_LIST=ProblemList.txt
  PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
  EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt
  
--- 355,377 ----
  
  # Samevm settings (default is false)
  ifndef USE_JTREG_SAMEVM
    USE_JTREG_SAMEVM=false
  endif
! # With samevm, you cannot use -javaoptions? (-agentvm is more reliable -samevm)
  ifeq ($(USE_JTREG_SAMEVM),true)
!   JTREG_SAMEVM_OPTION = -agentvm
    EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
    JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
  else
    JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
  endif
  
+ ifdef CONCURRENCY
+   EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
+ endif
+ 
  # Some tests annoy me and fail frequently
  PROBLEM_LIST=ProblemList.txt
  PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
  EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt