diff mbox

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

Message ID 57163320.1000304@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst April 19, 2016, 1:31 p.m. UTC 
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@linux.intel.com>
---

Comments

Ville Syrjälä April 19, 2016, 1:38 p.m. UTC | #1 
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@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"

Just drop the mkdir instead?

> -	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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst April 19, 2016, 1:40 p.m. UTC | #2 
Op 19-04-16 om 15:38 schreef Ville Syrjälä:
> 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@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"
> Just drop the mkdir instead?
>
In that case I wouldn't be able to retry in an existing directory.
Ville Syrjälä April 19, 2016, 1:50 p.m. UTC | #3 
On Tue, Apr 19, 2016 at 03:40:46PM +0200, Maarten Lankhorst wrote:
> Op 19-04-16 om 15:38 schreef Ville Syrjälä:
> > 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@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"
> > Just drop the mkdir instead?
> >
> In that case I wouldn't be able to retry in an existing directory.

Which some people may consider a good thing.
Marius Vlad April 19, 2016, 2:13 p.m. UTC | #4 
There was some discussions about this before:

https://lists.freedesktop.org/archives/intel-gfx/2016-March/089128.html
and
https://lists.freedesktop.org/archives/intel-gfx/2016-March/090302.html

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@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi April 19, 2016, 2:23 p.m. UTC | #5 
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@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@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@lists.freedesktop.org

> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dylan Baker April 19, 2016, 6:16 p.m. UTC | #6 
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@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@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@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@intel.com>
diff mbox

Patch

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