Added --gcstress and --gcverify shortcut flags to run-test
Change-Id: Ia11fcbc71488710ca32f397c3c1b19613e294d1e
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 47111c5..0cf9e16 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -415,8 +415,7 @@
else
ifeq ($(5),gcverify)
uc_run_type := GCVERIFY
- run_test_options += --runtime-option -Xgc:preverify --runtime-option -Xgc:postverify \
- --runtime-option -Xgc:preverify_rosalloc --runtime-option -Xgc:postverify_rosalloc
+ run_test_options += --gcverify
run_test_rule_name := test-art-$(2)-run-test-gcverify-$(3)-$(6)-$(1)$(4)
ifneq ($$(ART_TEST_GC_VERIFY),true)
skip_test := true
@@ -424,8 +423,7 @@
else
ifeq ($(5),gcstress)
uc_run_type := GCSTRESS
- run_test_options += --runtime-option -Xgc:SS --runtime-option -Xms2m \
- --runtime-option -Xmx2m --runtime-option -Xgc:preverify --runtime-option -Xgc:postverify
+ run_test_options += --gcstress
run_test_rule_name := test-art-$(2)-run-test-gcstress-$(3)-$(6)-$(1)$(4)
ifneq ($$(ART_TEST_GC_STRESS),true)
skip_test := true
diff --git a/test/run-all-tests b/test/run-all-tests
index 284cca0..98f1208 100755
--- a/test/run-all-tests
+++ b/test/run-all-tests
@@ -80,6 +80,12 @@
elif [ "x$1" = "x--64" ]; then
run_args="${run_args} --64"
shift
+ elif [ "x$1" = "x--gcstress" ]; then
+ run_args="${run_args} --gcstress"
+ shift
+ elif [ "x$1" = "x--gcverify" ]; then
+ run_args="${run_args} --gcverify"
+ shift
elif [ "x$1" = "x--trace" ]; then
run_args="${run_args} --trace"
shift
@@ -116,7 +122,7 @@
"further documentation:"
echo " --debug --dev --host --interpreter --jvm --no-optimize"
echo " --no-verify -O --update --valgrind --zygote --64 --relocate"
- echo " --prebuild --always-clean"
+ echo " --prebuild --always-clean --gcstress --gcverify --trace"
echo " Specific Runtime Options:"
echo " --seq Run tests one-by-one, avoiding failures caused by busy CPU"
) 1>&2
diff --git a/test/run-test b/test/run-test
index ca7e68c..496f7d1 100755
--- a/test/run-test
+++ b/test/run-test
@@ -77,6 +77,9 @@
build_only="no"
suffix64=""
trace="false"
+basic_verify="false"
+gc_verify="false"
+gc_stress="false"
always_clean="no"
while true; do
@@ -108,6 +111,14 @@
elif [ "x$1" = "x--no-prebuild" ]; then
prebuild_mode="no"
shift;
+ elif [ "x$1" = "x--gcverify" ]; then
+ basic_verify="true"
+ gc_verify="true"
+ shift
+ elif [ "x$1" = "x--gcstress" ]; then
+ basic_verify="true"
+ gc_stress="true"
+ shift
elif [ "x$1" = "x--image" ]; then
shift
image="$1"
@@ -197,6 +208,15 @@
done
mkdir -p $tmp_dir
+if [ "$basic_verify" = "true" ]; then
+ run_args="${run_args} --runtime-option -Xgc:preverify --runtime-option -Xgc:postverify"
+fi
+if [ "$gc_verify" = "true" ]; then
+ run_args="${run_args} --runtime-option -Xgc:preverify_rosalloc --runtime-option -Xgc:postverify_rosalloc"
+fi
+if [ "$gc_stress" = "true" ]; then
+ run_args="${run_args} --runtime-option -Xgc:SS --runtime-option -Xms2m --runtime-option -Xmx2m"
+fi
if [ "$trace" = "true" ]; then
run_args="${run_args} --runtime-option -Xmethod-trace --runtime-option -Xmethod-trace-file:${DEX_LOCATION}/trace.bin --runtime-option -Xmethod-trace-file-size:2000000"
fi
@@ -333,6 +353,8 @@
"files."
echo " --64 Run the test in 64-bit mode"
echo " --trace Run with method tracing"
+ echo " --gcstress Run with gc stress testing"
+ echo " --gcverify Run with gc verification"
echo " --always-clean Delete the test files even if the test fails."
) 1>&2
exit 1