From 7f4eacd484d72bcecf3605c4fba6d277bc9261ef Mon Sep 17 00:00:00 2001 From: jak1 Date: Thu, 6 Apr 2023 11:33:05 +0200 Subject: removed assertion for sdl surface bpp, tests get ugly, but default runtime works fine added "-A 20" to assert grep, so we get the backtrace directly in our pipelines --- src/resources/sdlimagehelper.cpp | 1 - tools/ci/scripts/runtest.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index 852064799..27e8f2f5d 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -224,7 +224,6 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) if (tmpImage->format->BitsPerPixel != 32) { - reportAlways("Non 32 bit image detected") tmpImage = convertTo32Bit(tmpImage); if (tmpImage == nullptr) diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index 7c41da5ce..7707a34aa 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -18,7 +18,7 @@ function check_is_run { } function check_assert { - grep "Assert:" "${HOME}/.local/share/mana/manaplus.log" + grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaplus.log" if [ "$?" == 0 ]; then echo "Assert found in log" exit 1 -- cgit v1.2.3-60-g2f50