thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TESTS: Remove zero-length string and associated -Wformat massage

Browse source 
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.
This commit is contained in:
Colin Snover 2017-11-20 21:46:37 -06:00
parent cf61174396
commit b89b9095d6
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/common/str.h
View file

@ -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" );

7
test/module.mk
View file

@ -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