From 4c5c8b3f773c068ef87b24077f58b19bc4de82e4 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Mon, 19 Aug 2019 14:36:13 +0200 Subject: [PATCH] ci: Make runs with local mesa more robust When a local mesa version is build, we don't use a clean build tree and meson might fail when reconfiguring. In that case try again with --wipe to get a clean start. Signed-off-by: Gert Wollny Reviewed-by: Gurchetan Singh --- ci/run_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index c18367b..d4123f6 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -35,7 +35,8 @@ run_setup() 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 && \ ninja -C build/ install -j $NUM_THREADS if [ $? -ne 0 ]; then - exit 1 + meson setup --wipe build/ + ninja -C build/ install -j $NUM_THREADS || exit 1 fi fi