Skip to content

Commit 26aa219

Browse files
committed
Merge branch 'add_idle_test' of github.com:tanvikini/openj9-systemtest into add_idle_test
2 parents ec36c12 + b12b01f commit 26aa219

File tree

6 files changed

+385
-321
lines changed

6 files changed

+385
-321
lines changed

openj9.build/makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,18 @@ test.SharedClasses.SCM23.MultiThread \
416416
test.SharedClasses.SCM23.MultiThreadMultiCL
417417
SHARED_CLASSES_TESTS:=$(filter-out $(EXCLUDE),$(SHARED_CLASSES_TESTS))
418418

419+
IDLE_TESTS:=test.IdleBenchMark_MinIdleWaitTime \
420+
test.IdleBenchMark_GcOnIdle \
421+
test.IdleBenchMark_CompactOnIdle
422+
IDLE_TESTS:=$(filter-out $(EXCLUDE),$(IDLE_TESTS))
423+
419424
TEST_TARGETS:=test.list \
420425
test.help \
421426
$(DAA_TESTS) \
422427
$(GC_TESTS) \
423-
$(SHARED_CLASSES_TESTS)
428+
$(SHARED_CLASSES_TESTS) \
429+
$(IDLE_TESTS)
430+
424431
TEST_TARGETS:=$(filter-out $(EXCLUDE),$(TEST_TARGETS))
425432

426433
.PHONY: build configure clean refresh_source test $(TEST_TARGETS)
@@ -447,6 +454,7 @@ test: $(TEST_TARGETS)
447454
test.daa: $(DAA_TESTS)
448455
test.gc: $(GC_TESTS)
449456
test.SharedClasses: $(SHARED_CLASSES_TESTS)
457+
test.idle: $(IDLE_TESTS)
450458

451459
test.list:
452460
echo Running target $@
@@ -534,15 +542,15 @@ test.SharedClasses.SCM23.MultiThreadMultiCL:
534542
echo Target $@ completed
535543
test.IdleBenchMark_MinIdleWaitTime:
536544
echo Running target $@
537-
$(STF_COMMAND) -test=IdleLoadTest -java-args="-XX:IdleTuningMinIdleWaitTime=180 -Xmx1024m -Xjit:verbose={compilePerformance},vlog=jitlog" $(LOG)
545+
$(STF_COMMAND) -test=IdleLoadTest -test-args="variation=MinIdleWaitTime" $(LOG)
538546
echo Target $@ completed
539547
test.IdleBenchMark_GcOnIdle:
540548
echo Running target $@
541-
$(STF_COMMAND) -test=IdleLoadTest -java-args="-XX:+IdleTuningGcOnIdle -Xtune:virtualized -XX:IdleTuningMinIdleWaitTime=120 -Xmx1024m -verbose:gc -Xverbosegclog:gc.verbose -Xjit:verbose={compilePerformance},vlog=jitlog" $(LOG)
549+
$(STF_COMMAND) -test=IdleLoadTest -test-args="variation=GcOnIdle" $(LOG)
542550
echo Target $@ completed
543551
test.IdleBenchMark_CompactOnIdle:
544552
echo Running target $@
545-
$(STF_COMMAND) -test=IdleLoadTest -java-args="-XX:+IdleTuningCompactOnIdle -Xtune:virtualized -XX:IdleTuningMinIdleWaitTime=120 -Xmx1024m -verbose:gc -Xverbosegclog:gc.verbose -Xjit:verbose={compilePerformance},vlog=jitlog" $(LOG)
553+
$(STF_COMMAND) -test=IdleLoadTest -test-args="variation=CompactOnIdle" $(LOG)
546554
echo Target $@ completed
547555

548556
help:

0 commit comments

Comments
 (0)