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

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

[Rodrigo Vivi]

The following piglit commit adds one option to overwrite files:

commit ec317ece07afdf9c8a26de04bdec8a94e5d7b2db
Author: Dylan Baker <baker.dylan.c@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

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@gmail.com>
Cc: Alexandra Yates <alexandra.yates@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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
-- 
2.4.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Marius Vlad]

[-- Attachment #1.1: Type: text/plain, Size: 2100 bytes --]

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@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.

> 
> 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@gmail.com>
> Cc: Alexandra Yates <alexandra.yates@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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
> -- 
> 2.4.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Gabriel Feceoru]

On 18.03.2016 16:02, Rodrigo Vivi wrote:
> The following piglit commit adds one option to overwrite files:
>
> commit ec317ece07afdf9c8a26de04bdec8a94e5d7b2db
> Author: Dylan Baker <baker.dylan.c@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
>
> 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@gmail.com>
> Cc: Alexandra Yates <alexandra.yates@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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
>

I've sent something similar some time ago:

https://patchwork.freedesktop.org/patch/76050/

Gabriel.

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Vivi, Rodrigo]

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@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@gmail.com>
> > Cc: Alexandra Yates <alexandra.yates@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Vivi, Rodrigo]

ops, I have missed that. I'm really sorry Gabriel for duplicating that
effort.

After we figure out what to do with different piglit versions we can
take yours... 

Sorry,
Rodrigo.

On Mon, 2016-03-21 at 13:27 +0200, Gabriel Feceoru wrote:
> 
> On 18.03.2016 16:02, Rodrigo Vivi wrote:
> > The following piglit commit adds one option to overwrite files:
> > 
> > commit ec317ece07afdf9c8a26de04bdec8a94e5d7b2db
> > Author: Dylan Baker <baker.dylan.c@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
> > 
> > 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@gmail.com>
> > Cc: Alexandra Yates <alexandra.yates@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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
> > 
> 
> I've sent something similar some time ago:
> 
> https://patchwork.freedesktop.org/patch/76050/
> 
> Gabriel.
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Dylan Baker]

[-- Attachment #1.1: Type: text/plain, Size: 1711 bytes --]

Quoting Vivi, Rodrigo (2016-03-21 19:00:10)
> 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@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?
> 

I was just thinking that it was stupid that piglit doesn't have a
version of any kind. I'm planning to add one although it will only be a
git sha and maybe a date since piglit intentionally doesn't have major
or minor version numbers.

Dylan

[-- Attachment #1.2: signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABCAAGBQJW8XQjAAoJEAieFpYUBojvwb8H/0af0nXy0Zk/u7nq3wlgg5WD
L8MtLuOqSlZkzBVu4uQ+TCD8DjHYvULb8hf1NFbJRCDDbY5/uN9HNAdOvmRofPcT
aMLfQ95hBE1IEP/qeBF5IkzceBtm5GTiMwj8Cq4Dp4nr5MpmXnFPm9rZhJDuPAdL
EbAJYuEqpLZP72mZAfDXixvG972s0o5JsijtG/jE5CH7DsZfiv7ct04mWrci14g3
KmMI7cDiVY2XDKQRshNNyhxyHDUGHGnGiFMzvQkCS5VEYcfuISVDGVwLKwpAX8hW
uXFBwS87cVuwxivR/bsEonQRl62ddoRrmXEsJZJLuUAqaxB6rwjUVh3jc2+gwZ4=
=oBUo
-----END PGP SIGNATURE-----

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Vivi, Rodrigo]

On Tue, 2016-03-22 at 09:34 -0700, Dylan Baker wrote:
> Quoting Vivi, Rodrigo (2016-03-21 19:00:10)
> > 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@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?
> > 
> 
> I was just thinking that it was stupid that piglit doesn't have a
> version of any kind. I'm planning to add one although it will only be
> a
> git sha and maybe a date since piglit intentionally doesn't have
> major
> or minor version numbers.

Thanks Dylan.... But how will you handle the piglig installed in
/usr/local/bin? Maybe we can have one version in our piglit dir inside
igt but another version in the system what could be different and
misslead this check.


> 
> Dylan
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Dylan Baker]

[-- Attachment #1.1: Type: text/plain, Size: 663 bytes --]

Quoting Vivi, Rodrigo (2016-03-23 18:52:38)
> 
> Thanks Dylan.... But how will you handle the piglig installed in
> /usr/local/bin? Maybe we can have one version in our piglit dir inside
> igt but another version in the system what could be different and
> misslead this check.
> 

I have this: https://patchwork.freedesktop.org/patch/77901/, the only
problem I see with it is that my cmake isn't correct, and the file wont
be regenerated if the git commit changes.

The basic idea is that if piglit is installed a version.py is generated
and when it's not git is directly called to get the sha and date. Does
this meet your requirements?

Dylan

[-- Attachment #1.2: signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABCAAGBQJW9AURAAoJEAieFpYUBojv+PwH/jwscTw5gxC0r5xllDpMdZcD
wbgrI3XWB9Bg1f2sXH7paTMN0EpZVxYAnk5Sn1lFY2vjoolUwu8qYaIzsWjHf7p/
qD0Gb9UXWJTasXnt3GliG5ct1+PTOxdjfJk0RKaEiGFMPzlGDCZzNKdnpFc/28n9
aHmjQVyBcit9G91Y2trVqAKvHYSkGgemDuI6K84s7ae1cCKHDvAeQOOKySiRcCCa
dvW87Fvp8+Csghrb/qZR770CDvwd1rrPXHXRtDVQl0oiGW9rr64OdC6et4CWiFam
rR8qH3MYG70rgDNp6Qa7uHTi1UGR2CgI/jJvXgUh1CTNxlDIknpx87dq8IfLtpg=
=JBrO
-----END PGP SIGNATURE-----

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx