[Intel-gfx] [PATCH i-g-t] scripts/run_tests.sh: Fix breakage after piglit updates.

[Dylan Baker]

Quoting Vivi, Rodrigo (2016-04-19 07:23:02)
> Well, I don't see how to do it in a good and safe way for the old
> versions that didn't have the version check, so or we do an ugly
> version of it or we just ask people to upgrade the piglit when they
> start to report this commit is breaking stuff. 
> 
> Really up to you. But I believe we need on solution or another so if
> you decide to go with this patch feel free to use:
> 
> Acked-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> 
> On Tue, 2016-04-19 at 17:13 +0300, Marius Vlad wrote:
> > There was some discussions about this before:
> > 
> > https://lists.freedesktop.org/archives/intel-gfx/2016-March/089128.ht
> > ml
> > and
> > https://lists.freedesktop.org/archives/intel-gfx/2016-March/090302.ht
> > ml
> > 
> > There's some concern that his approach might brake with older
> > versions
> > of piglit. Is this still the case, or we can push this?
> > 
> > On Tue, Apr 19, 2016 at 03:31:12PM +0200, Maarten Lankhorst wrote:
> > > Right now scripts/run-tests.sh fails with the following error
> > > message:
> > > 
> > > Fatal Error: Cannot overwrite existing folder without the -o/-
> > > -overwrite option being set.
> > > 
> > > Fix this by adding -o as required.
> > > 
> > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com
> > > >
> > > ---
> > > diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
> > > index 99e6124f5279..f33b0ffd342a 100755
> > > --- a/scripts/run-tests.sh
> > > +++ b/scripts/run-tests.sh
> > > @@ -125,7 +125,7 @@ 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 igt
> > > "$RESULTS" -o -s $VERBOSE $EXCLUDE $FILTER
> > >  fi
> > >  
> > >  if [ "$SUMMARY" == "html" ]; then
> > >  
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx

I think removing the mkdir call will fix piglit before the -o and after
the -o switch. But if you're willing to ask people to upgrade piglit
using the -o will be more robust.

Acked-by: Dylan Baker <dylanx.c.baker at intel.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20160419/162ea1e6/attachment-0001.sig>