From a4e989049d44169b2c59909106eb4d86844dfe91 Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Thu, 20 May 2021 18:35:29 +0200
Subject: [PATCH] ci: Fix test scripts to be able to run with a local
 virglrenderer

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Rohan Garg <rohan.garg@collabora.com>
---
 ci/run_ci_locally.sh |  4 ++--
 ci/run_tests.sh      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ci/run_ci_locally.sh b/ci/run_ci_locally.sh
index e25acf4..a07e968 100755
--- a/ci/run_ci_locally.sh
+++ b/ci/run_ci_locally.sh
@@ -20,8 +20,8 @@ RENDER_DEVICE=/dev/dri/renderD128
 
 if test $NUM_THREADS -gt 0; then THREAD_CONFIG="-e NUM_THREADS=$NUM_THREADS"; fi
 if test -e "$RENDER_DEVICE"; then RD_CONFIG="--device=$RENDER_DEVICE -e RENDER_DEVICE=$RENDER_DEVICE"; fi
-if test -e "$MESA_PATH"; then LOCAL_MESA="-v $MESA_PATH:/local_mesa -e LOCAL_MESA=/local_mesa"; fi
-if test -e "$VIRGL_PATH"; then LOCAL_VIRGL="-v $VIRGL_PATH:/virglrenderer -e LOCAL_VIRGL=/virglrenderer"; fi
+if test -e "$MESA_PATH"; then LOCAL_MESA="-v "$MESA_PATH":/local_mesa -e LOCAL_MESA=/local_mesa"; fi
+if test -e "$VIRGL_PATH"; then LOCAL_VIRGL="-v "$VIRGL_PATH":/virglrenderer -e LOCAL_VIRGL=/virglrenderer"; fi
 
 echo THREAD_CONFIG=$THREAD_CONFIG
 echo RD_CONFIG=$RD_CONFIG
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 4f8c474..63a421b 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -43,7 +43,7 @@ run_setup()
       pushd $LOCAL_MESA
       mkdir -p build  && \
       meson build/ && \
-      meson configure build/ -Dprefix=/usr/local -Dplatforms=drm,x11,wayland,surfaceless -Ddri-drivers=i965 -Dgallium-drivers=swrast,virgl,radeonsi,r600 -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
+      meson configure build/ -Dprefix=/usr/local -Dplatforms=x11,wayland -Ddri-drivers= -Dgallium-drivers=swrast,virgl,radeonsi,iris -Dbuildtype=debugoptimized -Dllvm=true -Dglx=dri -Dgallium-vdpau=false -Dgallium-va=false -Dvulkan-drivers=[] -Dlibdir=lib && \
       ninja -C build/ install -j $NUM_THREADS
       if [ $? -ne 0 ]; then
         meson setup --wipe build/
@@ -55,7 +55,7 @@ run_setup()
    rm -rf ./results/
    mkdir -p ./results/
 
-   mkdir build
+   mkdir -p build
    if [ "x$use_clang_fuzzer" = "x1" ]; then
       export CC=clang
       export FUZZER=-Dfuzzer=true
@@ -65,8 +65,10 @@ run_setup()
        export TRACING=-Dtracing=stderr
    fi
 
+   pwd | grep virglrenderer >/dev/null || pushd /virglrenderer && pushd $(pwd)
    meson build/ -Dprefix=/usr/local -Ddebug=true -Dtests=true --fatal-meson-warnings $FUZZER $TRACING
    ninja -C build -j$NUM_THREADS install
+   popd
 }
 
 run_make_check_meson()
@@ -145,7 +147,7 @@ run_deqp()
       BACKENDS="${BACKENDS} --backend vtest-gpu"
    fi
 
-   pushd ci
+   pwd | grep virglrenderer >/dev/null || pushd /virglrenderer/ci && pushd ci
    ./run_test_suite.sh --deqp ${TEST_SUITE} \
       --host-${OGL_BACKEND} \
       ${BACKENDS}
@@ -171,7 +173,7 @@ run_piglit()
       BACKENDS="${BACKENDS} --backend vtest-gpu"
    fi
 
-   pushd ci
+   pwd | grep virglrenderer >/dev/null || pushd /virglrenderer/ci && pushd ci
    ./run_test_suite.sh --piglit --gles2 --gles3 \
       --host-${OGL_BACKEND} \
       ${BACKENDS}