test/Makefile

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


 340 
 341 # jtreg tests
 342 
 343 # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
 344 ifndef JT_HOME
 345   JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
 346   ifdef JPRT_JTREG_HOME
 347     JT_HOME = $(JPRT_JTREG_HOME)
 348   endif
 349 endif
 350 
 351 # Expect JPRT to set TESTDIRS to the jtreg test dirs
 352 ifndef TESTDIRS
 353   TESTDIRS = demo
 354 endif
 355 
 356 # Samevm settings (default is false)
 357 ifndef USE_JTREG_SAMEVM
 358   USE_JTREG_SAMEVM=false
 359 endif
 360 # With samevm, you cannot use -javaoptions?
 361 ifeq ($(USE_JTREG_SAMEVM),true)
 362   JTREG_SAMEVM_OPTION = -samevm
 363   EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
 364   JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
 365 else
 366   JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)




 367 endif
 368 
 369 # Some tests annoy me and fail frequently
 370 PROBLEM_LIST=ProblemList.txt
 371 PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
 372 EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt
 373 
 374 # Create exclude list for this platform and arch
 375 ifdef NO_EXCLUDES
 376 $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
 377         @$(ECHO) "NOTHING_EXCLUDED" > $@
 378 else
 379 $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
 380         @$(RM) $@ $@.temp1 $@.temp2
 381         @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all'          ) ;\
 382           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)'          ) ;\
 383           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)'  ) ;\
 384           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
 385           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)'      ) ;\
 386           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)'     ) ;\




 340 
 341 # jtreg tests
 342 
 343 # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
 344 ifndef JT_HOME
 345   JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
 346   ifdef JPRT_JTREG_HOME
 347     JT_HOME = $(JPRT_JTREG_HOME)
 348   endif
 349 endif
 350 
 351 # Expect JPRT to set TESTDIRS to the jtreg test dirs
 352 ifndef TESTDIRS
 353   TESTDIRS = demo
 354 endif
 355 
 356 # Samevm settings (default is false)
 357 ifndef USE_JTREG_SAMEVM
 358   USE_JTREG_SAMEVM=false
 359 endif
 360 # With samevm, you cannot use -javaoptions? (-agentvm is more reliable -samevm)
 361 ifeq ($(USE_JTREG_SAMEVM),true)
 362   JTREG_SAMEVM_OPTION = -agentvm
 363   EXTRA_JTREG_OPTIONS += $(JTREG_SAMEVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%)
 364   JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%)
 365 else
 366   JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 367 endif
 368 
 369 ifdef CONCURRENCY
 370   EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
 371 endif
 372 
 373 # Some tests annoy me and fail frequently
 374 PROBLEM_LIST=ProblemList.txt
 375 PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST))
 376 EXCLUDELIST=$(ABS_TEST_OUTPUT_DIR)/excludelist.txt
 377 
 378 # Create exclude list for this platform and arch
 379 ifdef NO_EXCLUDES
 380 $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
 381         @$(ECHO) "NOTHING_EXCLUDED" > $@
 382 else
 383 $(EXCLUDELIST): $(PROBLEM_LISTS) $(TEST_DEPENDENCIES)
 384         @$(RM) $@ $@.temp1 $@.temp2
 385         @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all'          ) ;\
 386           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)'          ) ;\
 387           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)'  ) ;\
 388           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\
 389           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)'      ) ;\
 390           ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH2)'     ) ;\