Merge branch 'add_idle_test' of github.com:tanvikini/openj9-systemtes…

…t into add_idle_test
adoptium · Mar 22, 2018 · 26aa219 · 26aa219
2 parents ec36c12 + b12b01f
commit 26aa219
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 321 deletions.
diff --git a/openj9.build/makefile b/openj9.build/makefile
@@ -416,11 +416,18 @@ test.SharedClasses.SCM23.MultiThread \
 test.SharedClasses.SCM23.MultiThreadMultiCL
 SHARED_CLASSES_TESTS:=$(filter-out $(EXCLUDE),$(SHARED_CLASSES_TESTS))
 
+IDLE_TESTS:=test.IdleBenchMark_MinIdleWaitTime \
+test.IdleBenchMark_GcOnIdle \
+test.IdleBenchMark_CompactOnIdle
+IDLE_TESTS:=$(filter-out $(EXCLUDE),$(IDLE_TESTS))
+
 TEST_TARGETS:=test.list \
 test.help \
 $(DAA_TESTS) \
 $(GC_TESTS) \
-$(SHARED_CLASSES_TESTS)
+$(SHARED_CLASSES_TESTS) \
+$(IDLE_TESTS)
+
 TEST_TARGETS:=$(filter-out $(EXCLUDE),$(TEST_TARGETS))
 
 .PHONY: build configure clean refresh_source test $(TEST_TARGETS)
@@ -447,6 +454,7 @@ test: $(TEST_TARGETS)
 test.daa: $(DAA_TESTS)
 test.gc: $(GC_TESTS)
 test.SharedClasses: $(SHARED_CLASSES_TESTS)
+test.idle: $(IDLE_TESTS)
 
 test.list:
 	echo Running target $@
@@ -534,15 +542,15 @@ test.SharedClasses.SCM23.MultiThreadMultiCL:
 	echo Target $@ completed
 test.IdleBenchMark_MinIdleWaitTime:
 	echo Running target $@
-	$(STF_COMMAND) -test=IdleLoadTest -java-args="-XX:IdleTuningMinIdleWaitTime=180 -Xmx1024m -Xjit:verbose={compilePerformance},vlog=jitlog" $(LOG)
+	$(STF_COMMAND) -test=IdleLoadTest -test-args="variation=MinIdleWaitTime" $(LOG)
 	echo Target $@ completed
 test.IdleBenchMark_GcOnIdle:
 	echo Running target $@
-	$(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)
+	$(STF_COMMAND) -test=IdleLoadTest -test-args="variation=GcOnIdle" $(LOG)
 	echo Target $@ completed
 test.IdleBenchMark_CompactOnIdle:
 	echo Running target $@
-	$(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)
+	$(STF_COMMAND) -test=IdleLoadTest -test-args="variation=CompactOnIdle" $(LOG)
 	echo Target $@ completed 
 
 help: