ci: separate meson tests and reorganize build steps

Instead of running the test directly in the build script, we can make a
separate step in the workflow so it looks a little prettier. For running
the actual tests, we skip mingw since they will never be run (cross
compiled). Additionally, improve the github workflow logic a bit so that
way logs on failure are only shown when that specific step fails. The
freebsd job still has to be less elegant since it's in a weird vm
thingy.

Not really related but the location of various build directories
(particularly waf) are corrected as well (might as well).

5 files changed, 4 insertions, 11 deletions

diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh
index f08af6418b..39afe57f2d 100755
--- a/ci/build-freebsd.sh
+++ b/ci/build-freebsd.sh
@@ -12,6 +12,7 @@ meson setup build \
     -Dopenal=enabled \
     -Dsdl2=enabled \
     -Dsndio=enabled \
+    -Dtests=true \
     -Dvdpau=enabled \
     -Dvulkan=enabled \
     -Doss-audio=enabled \
@@ -22,7 +23,6 @@ meson setup build \
     $NULL
 
 meson compile -C build
-meson test -C build
 ./build/mpv -v --no-config
 
 if [ ! -e "./waf" ] ; then
diff --git a/ci/build-macos.sh b/ci/build-macos.sh
index 00124107a0..3b3255b8a6 100755
--- a/ci/build-macos.sh
+++ b/ci/build-macos.sh
@@ -14,13 +14,11 @@ if [[ $1 = "meson" ]]; then
     PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \
       meson setup build \
         -Dprefix="${MPV_INSTALL_PREFIX}" \
-        -Dlibmpv=true \
+        -D{libmpv,tests}=true \
         -D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \
         -D{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl}=enabled
 
     meson compile -C build -j4
-    meson test -C build
-
     meson install -C build
     ./build/mpv -v --no-config
 fi
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh
index 6ac2f262ed..bd0c07cd0c 100755
--- a/ci/build-mingw64.sh
+++ b/ci/build-mingw64.sh
@@ -200,16 +200,15 @@ rm -rf build
 if [ "$1" = "meson" ]; then
     meson setup build --cross-file "$prefix_dir/crossfile" \
         --buildtype debugoptimized \
-        -D{libmpv,tests}=true -Dlua=luajit \
+        -Dlibmpv=true -Dlua=luajit \
         -D{shaderc,spirv-cross,d3d11,libplacebo}=enabled
 
     meson compile -C build
-    meson test -C build
 elif [ "$1" = "waf" ]; then
     PKG_CONFIG=pkg-config ./waf configure \
         --out=build_waf \
         --enable-libmpv-shared --lua=luajit \
-        --enable-{shaderc,spirv-cross,d3d11,libplacebo,tests}
+        --enable-{shaderc,spirv-cross,d3d11,libplacebo}
 
     ./waf build
 fi
diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh
index 0afd93e789..a044f61447 100755
--- a/ci/build-msys2.sh
+++ b/ci/build-msys2.sh
@@ -24,7 +24,6 @@ if [ "$1" = "meson" ]; then
       -D vulkan=enabled
     meson compile -C build
     cp ./build/generated/mpv.com ./build
-    meson test -C build
     ./build/mpv.com -v --no-config
 fi
 
@@ -47,7 +46,6 @@ if [ "$1" = "waf" ]; then
       --enable-rubberband      \
       --enable-shaderc         \
       --enable-spirv-cross     \
-      --enable-tests           \
       --enable-uchardet        \
       --enable-vapoursynth     \
       --lua=luajit             \
diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh
index 44020848fa..11a13f597c 100755
--- a/ci/build-tumbleweed.sh
+++ b/ci/build-tumbleweed.sh
@@ -14,7 +14,6 @@ if [ "$1" = "meson" ]; then
       -Dtests=true            \
       -Dvulkan=enabled
     meson compile -C build
-    meson test -C build
     ./build/mpv -v --no-config
 fi
 
@@ -29,7 +28,6 @@ if [ "$1" = "waf" ]; then
       --enable-manpage-build \
       --enable-pipewire      \
       --enable-shaderc       \
-      --enable-tests         \
       --enable-vulkan
     python3 ./waf build
     ./build_waf/mpv -v --no-config