[PATCH xserver 06/10] test: Make the piglit-running script callable with an arbitrary server.

[Julien Cristau]

On Thu, Sep 22, 2016 at 11:45:07 +0300, Eric Anholt wrote:

> diff --git a/test/scripts/xvfb-piglit.sh b/test/scripts/run-piglit.sh
> similarity index 90%
> copy from test/scripts/xvfb-piglit.sh
> copy to test/scripts/run-piglit.sh
> index b775239e34f5..ab37ee3b92ad 100755
> --- a/test/scripts/xvfb-piglit.sh
> +++ b/test/scripts/run-piglit.sh
> @@ -14,6 +14,12 @@ if test "x$PIGLIT_DIR" = "x"; then
>      exit 77
>  fi
>  
> +if test "x$PIGLIT_RESULTS_DIR" = "x"; then
> +    echo "PIGLIT_RESULTS_DIR must be set to where to output piglit results."
> +    # Exit as a real failure because it should always be set.
> +    exit 1
> +fi
> +
>  if test "x$XSERVER_DIR" = "x"; then
>      echo "XSERVER_DIR must be set to the directory of the xserver repository."
>      # Exit as a real failure because it should always be set.
> @@ -26,14 +32,10 @@ if test "x$XSERVER_BUILDDIR" = "x"; then
>      exit 1
>  fi
>  
> -export PIGLIT_RESULTS_DIR=$PIGLIT_DIR/results/xvfb
> -
>  startx \
>      $XSERVER_DIR/test/scripts/xinit-piglit-session.sh \
>      -- \
> -    $XSERVER_BUILDDIR/hw/vfb/Xvfb \
> -        -noreset \
> -        -screen scrn 1280x1024x24
> +    $SERVER_COMMAND
>  
>  # Write out piglit-summaries.
>  SHORT_SUMMARY=$PIGLIT_RESULTS_DIR/summary

Should this check up-front that SERVER_COMMAND is set, like the other
variables?

Cheers,
Julien