From 57c886551f650f1e602ed06c1f6a6ec04b80c1f7 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 5 Oct 2022 23:55:59 +0200 Subject: [PATCH] automation_main.c: fix -Wformat-zero-length warning due to SDL_SetError("") --- test/CMakeLists.txt | 4 +++- test/testautomation_main.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8b2738a7d..133c79752 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.0) project(SDL2_test) +include(CheckCCompilerFlag) +include(CMakePushCheckState) + if(NOT TARGET SDL2::SDL2-static) find_package(SDL2 2.0.23 REQUIRED COMPONENTS SDL2-static SDL2test) endif() @@ -79,7 +82,6 @@ add_executable(testaudioinfo testaudioinfo.c) file(GLOB TESTAUTOMATION_SOURCE_FILES testautomation*.c) add_executable(testautomation ${TESTAUTOMATION_SOURCE_FILES}) - add_executable(testmultiaudio testmultiaudio.c testutils.c) add_executable(testaudiohotplug testaudiohotplug.c testutils.c) add_executable(testaudiocapture testaudiocapture.c) diff --git a/test/testautomation_main.c b/test/testautomation_main.c index f267789b8..97d235231 100644 --- a/test/testautomation_main.c +++ b/test/testautomation_main.c @@ -125,6 +125,11 @@ static int main_testImpliedJoystickQuit (void *arg) #endif } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-zero-length" +#endif + static int main_testSetError(void *arg) { @@ -145,6 +150,10 @@ main_testSetError(void *arg) return TEST_COMPLETED; } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif + static const SDLTest_TestCaseReference mainTest1 = { (SDLTest_TestCaseFp)main_testInitQuitJoystickHaptic, "main_testInitQuitJoystickHaptic", "Tests SDL_Init/Quit of Joystick and Haptic subsystem", TEST_ENABLED};