| Message ID | 1409085087-6955-1-git-send-email-michael.w.mason@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 26 August 2014 21:31, Mike Mason <michael.w.mason@intel.com> wrote: > 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 <michael.w.mason@intel.com> > --- > scripts/run-tests.sh | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh > index d0e0c67..580f777 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 <regex> 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,11 +115,15 @@ 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" > echo "HTML summary has been written to $RESULTS/html/index.html" > fi > + > Patch merged, although I've removed this additional new line from the end of the file. > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index d0e0c67..580f777 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 <regex> 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,11 +115,15 @@ 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" echo "HTML summary has been written to $RESULTS/html/index.html" fi +
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 <michael.w.mason@intel.com> --- scripts/run-tests.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)