From b89b9095d6b96c7414b03b9cb848f42bcc3ad62c Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Mon, 20 Nov 2017 21:46:37 -0600 Subject: [PATCH] TESTS: Remove zero-length string and associated -Wformat massage This was being patched out downstream in Debian. A solution that works for everybody is to just not use a zero-length string when testing formatting with no conversion specifications. --- test/common/str.h | 2 +- test/module.mk | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/test/common/str.h b/test/common/str.h index 9f8c6fbd605..783ed53c482 100644 --- a/test/common/str.h +++ b/test/common/str.h @@ -340,7 +340,7 @@ class StringTestSuite : public CxxTest::TestSuite } void test_string_printf() { - TS_ASSERT_EQUALS( Common::String::format(""), "" ); + TS_ASSERT_EQUALS( Common::String::format(" "), " " ); TS_ASSERT_EQUALS( Common::String::format("%s", "test"), "test" ); TS_ASSERT_EQUALS( Common::String::format("%s.s%.02d", "monkey", 1), "monkey.s01" ); TS_ASSERT_EQUALS( Common::String::format("Some %s to make this string longer than the default built-in %s %d", "text", "capacity", 123456), "Some text to make this string longer than the default built-in capacity 123456" ); diff --git a/test/module.mk b/test/module.mk index 6974c7bfc13..9e844fa42d3 100644 --- a/test/module.mk +++ b/test/module.mk @@ -29,13 +29,6 @@ TEST_LIBS += backends/platform/psp/memory.o \ backends/platform/psp/trace.o endif -ifdef HAVE_GCC3 -# In test/common/str.h, we test a zero length format string. This causes GCC -# to generate a warning which in turn poses a problem when building with -Werror. -# To work around this, we disable -Wformat here. -TEST_CFLAGS += -Wno-format -endif - # Enable this to get an X11 GUI for the error reporter. #TEST_FLAGS += --gui=X11Gui #TEST_LDFLAGS += -L/usr/X11R6/lib -lX11