Re: [Piglit] [PATCH] Cmake: Install shader_source files

[Dylan Baker]

Quoting Mark Janes (2018-08-28 11:38:30)
> Reviewed-by: Mark Janes 
> Tested-by: Mark Janes 
> 
> Dylan Baker  writes:
> 
> > Otherwise these tests fail in odd ways when running from an installed
> > instance.
> >
> > Cc: Alejandro Piñeiro 
> > Cc: Mark Janes 
> > Cc: Clayton Craft 
> > ---
> >  CMakeLists.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/CMakeLists.txt b/CMakeLists.txt
> > index 8f19457fc..596870b9b 100644
> > --- a/CMakeLists.txt
> > +++ b/CMakeLists.txt
> > @@ -537,7 +537,7 @@ install (
> >  install (
> >   DIRECTORY tests
> >   DESTINATION ${PIGLIT_INSTALL_LIBDIR}
> > - FILES_MATCHING REGEX 
> > ".*\\.(xml|xml.gz|py|program_test|shader_test|frag|vert|geom|tesc|tese|comp|ktx|cl|txt|inc)$"
> > + FILES_MATCHING REGEX 
> > ".*\\.(xml|xml.gz|py|program_test|shader_test|shader_source|frag|vert|geom|tesc|tese|comp|ktx|cl|txt|inc)$"
> >   REGEX 
> > "CMakeFiles|CMakeLists|serializer.py|opengl.py|cl.py|quick_gl.py|glslparser.py|shader.py|quick_shader.py|no_error.py|llvmpipe_gl.py|sanity.py"
> >  EXCLUDE
> >  )
> >  
> > -- 
> > 2.18.0

Pushed.


signature.asc
Description: signature
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] Cmake: Install shader_source files

[Mark Janes]

Reviewed-by: Mark Janes 
Tested-by: Mark Janes 

Dylan Baker  writes:

> Otherwise these tests fail in odd ways when running from an installed
> instance.
>
> Cc: Alejandro Piñeiro 
> Cc: Mark Janes 
> Cc: Clayton Craft 
> ---
>  CMakeLists.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 8f19457fc..596870b9b 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -537,7 +537,7 @@ install (
>  install (
>   DIRECTORY tests
>   DESTINATION ${PIGLIT_INSTALL_LIBDIR}
> - FILES_MATCHING REGEX 
> ".*\\.(xml|xml.gz|py|program_test|shader_test|frag|vert|geom|tesc|tese|comp|ktx|cl|txt|inc)$"
> + FILES_MATCHING REGEX 
> ".*\\.(xml|xml.gz|py|program_test|shader_test|shader_source|frag|vert|geom|tesc|tese|comp|ktx|cl|txt|inc)$"
>   REGEX 
> "CMakeFiles|CMakeLists|serializer.py|opengl.py|cl.py|quick_gl.py|glslparser.py|shader.py|quick_shader.py|no_error.py|llvmpipe_gl.py|sanity.py"
>  EXCLUDE
>  )
>  
> -- 
> 2.18.0
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] Cmake: Install shader_source files

[Dylan Baker]

Otherwise these tests fail in odd ways when running from an installed
instance.

Cc: Alejandro Piñeiro 
Cc: Mark Janes 
Cc: Clayton Craft 
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f19457fc..596870b9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -537,7 +537,7 @@ install (
 install (
DIRECTORY tests
DESTINATION ${PIGLIT_INSTALL_LIBDIR}
-   FILES_MATCHING REGEX 
".*\\.(xml|xml.gz|py|program_test|shader_test|frag|vert|geom|tesc|tese|comp|ktx|cl|txt|inc)$"
+   FILES_MATCHING REGEX 
".*\\.(xml|xml.gz|py|program_test|shader_test|shader_source|frag|vert|geom|tesc|tese|comp|ktx|cl|txt|inc)$"
REGEX 
"CMakeFiles|CMakeLists|serializer.py|opengl.py|cl.py|quick_gl.py|glslparser.py|shader.py|quick_shader.py|no_error.py|llvmpipe_gl.py|sanity.py"
 EXCLUDE
 )
 
-- 
2.18.0

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit