[Mesa-dev] [PATCH 1/4] glsl/tests/optimisation-test: make sure that $PYTHON2 is set/available
Eric Engestrom
eric.engestrom at imgtec.com
Fri Feb 24 15:34:04 UTC 2017
On Thursday, 2017-02-23 16:43:07 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Otherwise we'll fail when invoking the script outside of "make check"
>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> src/compiler/glsl/tests/optimization-test | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/src/compiler/glsl/tests/optimization-test b/src/compiler/glsl/tests/optimization-test
> index 26a51be698..7ccbb4467d 100755
> --- a/src/compiler/glsl/tests/optimization-test
> +++ b/src/compiler/glsl/tests/optimization-test
> @@ -6,6 +6,16 @@ else
> compare_ir=./compare_ir
> fi
>
> +if [ -z "$PYTHON2" ]; then
> + PYTHON2=python2
> +fi
> +
> +which $PYTHON2 >/dev/null
> +if [ "x$?" != x0 ]; then
You want a numerical comparison here (`[ $? -ne 0 ]`), not a string
comparison, and you could also simplify it as:
if ! which $PYTHON2 >/dev/null; then
...
> + echo "Could not find python2. Make sure that PYTHON2 variable is correctly set."
> + exit 1
> +fi
> +
> total=0
> pass=0
>
> --
> 2.11.0
>
More information about the mesa-dev
mailing list