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 <gert.wollny@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
macos/master
Gert Wollny 5 years ago committed by Gert Wollny
parent 5f28eb8868
commit 4c5c8b3f77
  1. 3
      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 && \ 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 ninja -C build/ install -j $NUM_THREADS
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 meson setup --wipe build/
ninja -C build/ install -j $NUM_THREADS || exit 1
fi fi
fi fi

Loading…
Cancel
Save