diff options
| author | Mike Mason <michael.w.mason@intel.com> | 2015-05-27 08:25:06 -0700 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2015-05-28 17:23:57 +0100 |
| commit | b1e40e97c89a82b6f574af298214ea599b089264 (patch) | |
| tree | 61e238a6fee550a623e0035a9cba00e661594960 /scripts/run-tests.sh | |
| parent | f49723872bf02788872f02e37df3e48682b5ef9b (diff) | |
scripts/run-tests.sh: add option to not retry incomplete tests on resume
This patch utilizes piglit's new --no-retry option. That option
prevents incomplete tests from being retried when resuming a
test run. This is necessary because retrying tests that cause
a crash or reboot prevents a test run from being resumed.
This patch also adds -s to the piglit command line. The -s option
forces test logs to be synced to disk after every test.
Without it, some logs can be lost if a test causes a crash
or reboot, making it impossible to resume the test run at the
correct point.
Signed-off-by: Mike Mason <michael.w.mason@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'scripts/run-tests.sh')
| -rwxr-xr-x | scripts/run-tests.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index d65e813a..d72fc053 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -61,6 +61,8 @@ function print_help { echo " (can be used more than once)" echo " -R resume interrupted test where the partial results" echo " are in the directory given by -r" + echo " -n do not retry incomplete tests when resuming a" + echo " test run with -R" echo "" echo "Useful patterns for test filtering are described in tests/NAMING-CONVENTION" } @@ -78,7 +80,7 @@ function list_tests { done } -while getopts ":dhlr:st:vx:R" opt; do +while getopts ":dhlr:st:vx:Rn" opt; do case $opt in d) download_piglit; exit ;; h) print_help; exit ;; @@ -89,6 +91,7 @@ while getopts ":dhlr:st:vx:R" opt; do v) VERBOSE="-v" ;; x) EXCLUDE="$EXCLUDE -x $OPTARG" ;; R) RESUME="true" ;; + n) NORETRY="--no-retry" ;; :) echo "Option -$OPTARG requires an argument." exit 1 @@ -119,10 +122,10 @@ if [ ! -x "$PIGLIT" ]; then fi if [ "x$RESUME" != "x" ]; then - sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" + sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" $NORETRY else mkdir -p "$RESULTS" - sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" $VERBOSE $EXCLUDE $FILTER + sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER fi if [ "$SUMMARY" == "html" ]; then |