[Intel-gfx] [PATCH i-g-t] scripts/run-test.sh: Piglit overwrite option.

Vivi, Rodrigo rodrigo.vivi at intel.com
Tue Mar 22 02:00:10 UTC 2016


On Mon, 2016-03-21 at 12:53 +0200, Marius Vlad wrote:
> Isn't this as https://patchwork.freedesktop.org/series/4177/?
> 
> On Fri, Mar 18, 2016 at 07:02:11AM -0700, Rodrigo Vivi wrote:
> > The following piglit commit adds one option to overwrite files:
> > 
> > commit ec317ece07afdf9c8a26de04bdec8a94e5d7b2db
> > Author: Dylan Baker <baker.dylan.c at gmail.com>
> > Date:   Mon Feb 1 15:08:23 2016 -0800
> > 
> >     framework/programs/run.py: Add option for overwriting files
> > 
> > So our run-script.sh test that creates the directory before
> > executing
> > the tests were failing with:
> > 
> > "Fatal Error: Cannot overwrite existing folder w/o the -o /-
> > -overwrite option being sent"
> > 
> > I believe it took a while to notice that because many of us never
> > upgrade the piglit. But also the risk with this patch is to have an
> > environment
> > with the old piglit so the result will be:
> > piglit: error: unrecognized arguments: --overwrite
> 
> Maybe we can test against piglit version and use it accordingly.

Yeah, I wondered that... but apparently piglit doesn't return the
version...
The ugly way that came to my mind was something like:

$PIGLIT run --help | grep overwrite > /dev/null
if [ $? -eq 0 ]; then
 # use overwwrite
else
 # keep the old
fi

any non-ugly idea?

> 
> > 
> > So, let's start the discussion and also provide the patch that
> > allows
> > some people with new version to get it running.
> > 
> > Cc: Dylan Baker <baker.dylan.c at gmail.com>
> > Cc: Alexandra Yates <alexandra.yates at intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > ---
> >  scripts/run-tests.sh | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> > index 99e6124..b1abeab 100755
> > --- a/scripts/run-tests.sh
> > +++ b/scripts/run-tests.sh
> > @@ -124,8 +124,7 @@ fi
> >  if [ "x$RESUME" != "x" ]; then
> >  	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" -s $VERBOSE $EXCLUDE $FILTER
> > +	sudo IGT_TEST_ROOT="$IGT_TEST_ROOT" "$PIGLIT" run -
> > -overwrite igt "$RESULTS" -s $VERBOSE $EXCLUDE $FILTER
> >  fi
> >  
> >  if [ "$SUMMARY" == "html" ]; then


More information about the Intel-gfx mailing list