diff options
| author | 2016-03-17 17:53:47 +0000 | |
|---|---|---|
| committer | 2016-03-17 17:53:47 +0000 | |
| commit | 1160f2e14d61f95f3fb6bea03acb5451ad926acc (patch) | |
| tree | 4b41626bede2b57128e48a686ce1f3f12e622101 | |
| parent | 275f97e225f534582b446eb7b9eb00c6757255d9 (diff) | |
| parent | 97acf19053813bbfb5b957e51b9dd6efc16351b6 (diff) | |
Merge "Make run-test give extra time when doing gc-stress runs."
| -rwxr-xr-x | test/etc/run-test-jar | 4 | ||||
| -rwxr-xr-x | test/run-test | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 2db1e6c947..b360f67874 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -66,6 +66,10 @@ while true; do fi LIB="$1" shift + elif [ "x$1" = "x--gc-stress" ]; then + # Give an extra 5 mins if we are gc-stress. + TIME_OUT_VALUE=$((${TIME_OUT_VALUE} + 300)) + shift elif [ "x$1" = "x--testlib" ]; then shift if [ "x$1" = "x" ]; then diff --git a/test/run-test b/test/run-test index 6bb154942c..3350b35783 100755 --- a/test/run-test +++ b/test/run-test @@ -389,7 +389,7 @@ 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,gcstress --runtime-option -Xms2m --runtime-option -Xmx16m" + run_args="${run_args} --gc-stress --runtime-option -Xgc:SS,gcstress --runtime-option -Xms2m --runtime-option -Xmx16m" fi if [ "$trace" = "true" ]; then run_args="${run_args} --runtime-option -Xmethod-trace --runtime-option -Xmethod-trace-file-size:2000000" |