[Mesa-dev] [PATCH 2/2] glsl: remove execute bit and shebang from python tests

Andres Gomez agomez at igalia.com
Fri Aug 24 14:42:50 UTC 2018


Emil, I've done some trivial conflicts resolution upon cherry picking
this commit.

You can see it at (staging/18.2):
https://gitlab.freedesktop.org/mesa/mesa/commit/f6dccf66865c31b13f48b50891a9f5a0d9949b1c

Please, let me know if this is OK.


On Fri, 2018-08-17 at 12:11 +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Just like the rest of the tree - these should be run either as part of
> the build system check target, or at the very least with an explicitly
> versioned python executable.
> 
> Cc: Dylan Baker <dylan at pnwbakers.com>
> Fixes: db8cd8e3677 ("glcpp/tests: Convert shell scripts to a python script")
> Fixes: 97c28cb0823 ("glsl/tests: Convert optimization-test.sh to pure python")
> Fixes: 3b52d292273 ("glsl/tests: reimplement warnings-test in python")
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/compiler/glsl/glcpp/tests/glcpp_test.py  | 1 -
>  src/compiler/glsl/tests/optimization_test.py | 1 -
>  src/compiler/glsl/tests/warnings_test.py     | 1 -
>  3 files changed, 3 deletions(-)
>  mode change 100755 => 100644 src/compiler/glsl/glcpp/tests/glcpp_test.py
>  mode change 100755 => 100644 src/compiler/glsl/tests/optimization_test.py
>  mode change 100755 => 100644 src/compiler/glsl/tests/warnings_test.py
> 
> diff --git a/src/compiler/glsl/glcpp/tests/glcpp_test.py b/src/compiler/glsl/glcpp/tests/glcpp_test.py
> old mode 100755
> new mode 100644
> index 8ac5d7cb0a1..8c7552124a6
> --- a/src/compiler/glsl/glcpp/tests/glcpp_test.py
> +++ b/src/compiler/glsl/glcpp/tests/glcpp_test.py
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python2
>  # encoding=utf-8
>  # Copyright © 2018 Intel Corporation
>  
> diff --git a/src/compiler/glsl/tests/optimization_test.py b/src/compiler/glsl/tests/optimization_test.py
> old mode 100755
> new mode 100644
> index 577d2dfc20f..f8518a168e0
> --- a/src/compiler/glsl/tests/optimization_test.py
> +++ b/src/compiler/glsl/tests/optimization_test.py
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python2
>  # encoding=utf-8
>  # Copyright © 2018 Intel Corporation
>  
> diff --git a/src/compiler/glsl/tests/warnings_test.py b/src/compiler/glsl/tests/warnings_test.py
> old mode 100755
> new mode 100644
> index 2e0f23180f3..2c4fa5a0d5a
> --- a/src/compiler/glsl/tests/warnings_test.py
> +++ b/src/compiler/glsl/tests/warnings_test.py
> @@ -1,4 +1,3 @@
> -#!/usr/bin/env python
>  # encoding=utf-8
>  # Copyright © 2017 Intel Corporation
>  
-- 
Br,

Andres


More information about the mesa-dev mailing list