From 822cc6a5655db6c210204ca349dbbed05ee1838b Mon Sep 17 00:00:00 2001 From: Mike Mason Date: Tue, 26 Aug 2014 13:31:27 -0700 Subject: scripts: Add capability to resume interrupted run-tests.sh session Piglit provides a 'resume' feature that can restart an interrupted test run at the point where it stopped. This patch adds that feature to run_tests.sh. Signed-off-by: Mike Mason [Thomas: remove additional new line from end of file] Signed-off-by: Thomas Wood --- scripts/run-tests.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'scripts/run-tests.sh') diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index d0e0c67a..5f83dcf8 100755 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -59,6 +59,8 @@ function print_help { echo " -v enable verbose mode" echo " -x exclude tests that match the regular expression" 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 "" echo "Useful patterns for test filtering are described in tests/NAMING-CONVENTION" } @@ -73,7 +75,7 @@ function list_tests { done } -while getopts ":dhlr:st:vx:" opt; do +while getopts ":dhlr:st:vx:R" opt; do case $opt in d) download_piglit; exit ;; h) print_help; exit ;; @@ -83,6 +85,7 @@ while getopts ":dhlr:st:vx:" opt; do t) FILTER="$FILTER -t $OPTARG" ;; v) VERBOSE="-v" ;; x) EXCLUDE="$EXCLUDE -x $OPTARG" ;; + R) RESUME="true" ;; :) echo "Option -$OPTARG requires an argument." exit 1 @@ -112,9 +115,12 @@ if [ ! -x "$PIGLIT" ]; then exit 1 fi -mkdir -p "$RESULTS" - -sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" $VERBOSE $EXCLUDE $FILTER +if [ "x$RESUME" != "x" ]; then + sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" resume "$RESULTS" +else + mkdir -p "$RESULTS" + sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run igt "$RESULTS" $VERBOSE $EXCLUDE $FILTER +fi if [ "$SUMMARY" == "html" ]; then "$PIGLIT" summary html --overwrite "$RESULTS/html" "$RESULTS" -- cgit v1.2.3