From 09c75e5a15567655881eefc00c4c9ee56d55751f Mon Sep 17 00:00:00 2001 From: project-repo Date: Sat, 18 Feb 2023 00:10:27 +0100 Subject: [PATCH] Move test build dirs to _build* --- test/build-w-o-warnings | 8 ++++---- test/build-w-o-xwayland | 8 ++++---- test/scan-build | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/build-w-o-warnings b/test/build-w-o-warnings index da76db5..3866aff 100644 --- a/test/build-w-o-warnings +++ b/test/build-w-o-warnings @@ -7,9 +7,9 @@ RESULT=0 # shellcheck disable=SC2164 cd "${MESONCURRENTCONFIGDIR}" echo "Build standard release build" -rm -rf test/test-w-o-warnings -meson setup test/test-w-o-warnings -Dxwayland=true -Dman-pages=true --buildtype=release --fatal-meson-warnings || RESULT=1 -ninja -C test/test-w-o-warnings || RESULT=1 -rm -rf test/test-w-o-warnings +rm -rf _build-w-o-warnings +meson setup _build-w-o-warnings -Dxwayland=true -Dman-pages=true --buildtype=release --fatal-meson-warnings || RESULT=1 +ninja -C _build-w-o-warnings || RESULT=1 +rm -rf _build-w-o-warnings exit "${RESULT}" diff --git a/test/build-w-o-xwayland b/test/build-w-o-xwayland index 3c8c789..6164f6e 100644 --- a/test/build-w-o-xwayland +++ b/test/build-w-o-xwayland @@ -7,9 +7,9 @@ RESULT=0 # shellcheck disable=2164 cd "${MESONCURRENTCONFIGDIR}" echo "Build without xwayland" -rm -rf test/test-w-o-xwayland -meson setup test/test-w-o-xwayland -Dxwayland=false -Dman-pages=false --buildtype=release --fatal-meson-warnings || RESULT=1 -ninja -C test/test-w-o-xwayland || RESULT=1 -rm -rf test/test-w-o-xwayland +rm -rf _build-w-o-xwayland +meson setup _build-w-o-xwayland -Dxwayland=false -Dman-pages=false --buildtype=release --fatal-meson-warnings || RESULT=1 +ninja -C _build-w-o-xwayland || RESULT=1 +rm -rf _build-w-o-xwayland exit "${RESULT}" diff --git a/test/scan-build b/test/scan-build index c7942fd..562fb42 100644 --- a/test/scan-build +++ b/test/scan-build @@ -6,9 +6,9 @@ RESULT=0 # shellcheck disable=2164 cd "${MESONCURRENTCONFIGDIR}" -rm -rf test/test-scan-build -meson setup test/test-scan-build -Dxwayland=true -Dman-pages=true --buildtype=release || RESULT=1 -SCANBUILD="$(pwd)/test/testing-configurations/my-scan-build" ninja -C test/test-scan-build scan-build || RESULT=1 -rm -rf test/test-scan-build +rm -rf _build-scan-build +meson setup _build-scan-build -Dxwayland=true -Dman-pages=true --buildtype=release || RESULT=1 +SCANBUILD="$(pwd)/test/testing-configurations/my-scan-build" ninja -C _build-scan-build scan-build || RESULT=1 +rm -rf _build-scan-build exit "${RESULT}"