[Scummvm-git-logs] scummvm master -> be7e6731a9f900bb8f5117f36fd2c6d80b833201

[rvanlaar]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
70e715b6f8 TESTS: Fix compiler warnings integer comparisons
ea8b9b0d48 TESTS: add buildartifact to make clean-test
be7e6731a9 BUILD: run clean-test on distclean


Commit: 70e715b6f8ceedf1b42367b9ac5052b91dec1743
    https://github.com/scummvm/scummvm/commit/70e715b6f8ceedf1b42367b9ac5052b91dec1743
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-10-06T17:41:41+02:00

Commit Message:
TESTS: Fix compiler warnings integer comparisons

Use suffix `U` for integers when comparing results of `size`.
Use uints in the forloops.

Changed paths:
    test/common/ini-file.h


diff --git a/test/common/ini-file.h b/test/common/ini-file.h
index c6a56d6e3ed..80331aa92fe 100644
--- a/test/common/ini-file.h
+++ b/test/common/ini-file.h
@@ -12,7 +12,7 @@ class IniFileTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT(!inifile.hasSection("abc"));
 
 		Common::INIFile::SectionList sections = inifile.getSections();
-		TS_ASSERT_EQUALS(sections.size(), 0);
+		TS_ASSERT_EQUALS(sections.size(), 0U);
 	}
 
 	void test_simple_ini_file() {
@@ -23,7 +23,7 @@ class IniFileTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT(result);
 
 		Common::INIFile::SectionList sections = inifile.getSections();
-		TS_ASSERT_EQUALS(sections.size(), 1);
+		TS_ASSERT_EQUALS(sections.size(), 1U);
 
 		TS_ASSERT(inifile.hasSection("s"));
 		TS_ASSERT(inifile.hasKey("abc", "s"));
@@ -46,7 +46,7 @@ class IniFileTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT(result);
 
 		Common::INIFile::SectionList sections = inifile.getSections();
-		TS_ASSERT_EQUALS(sections.size(), 3);
+		TS_ASSERT_EQUALS(sections.size(), 3U);
 
 		TS_ASSERT(inifile.hasSection("s"));
 		TS_ASSERT(inifile.hasSection("empty"));
@@ -62,7 +62,7 @@ class IniFileTestSuite : public CxxTest::TestSuite {
 
 		inifile.clear();
 		sections = inifile.getSections();
-		TS_ASSERT_EQUALS(sections.size(), 0);
+		TS_ASSERT_EQUALS(sections.size(), 0U);
 		TS_ASSERT(!inifile.hasSection("s"));
 	}
 
@@ -104,7 +104,7 @@ class IniFileTestSuite : public CxxTest::TestSuite {
 		TS_ASSERT(inifile.hasSection("sEcT10N -_..Name:"));
 
 		const char invalids[] = "!\"#$%&'()=~[]()+?<>\r\t\n";
-		for (int i = 0; i < sizeof(invalids) - 1; i++) {
+		for (uint i = 0; i < sizeof(invalids) - 1; i++) {
 			char c = invalids[i];
 			const Common::String s(c);
 			inifile.addSection(s);
@@ -113,7 +113,7 @@ class IniFileTestSuite : public CxxTest::TestSuite {
 
 		inifile.clear();
 		inifile.allowNonEnglishCharacters();
-		for (int i = 0; i < sizeof(invalids) - 1; i++) {
+		for (uint i = 0; i < sizeof(invalids) - 1; i++) {
 			char c = invalids[i];
 			if (c == '[' || c == ']' || c == '#' || c == '=' || c == '\r' || c == '\n')
 				continue;


Commit: ea8b9b0d48ae1db25bdadde3950ab4703b27af83
    https://github.com/scummvm/scummvm/commit/ea8b9b0d48ae1db25bdadde3950ab4703b27af83
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-10-06T17:50:17+02:00

Commit Message:
TESTS: add buildartifact to make clean-test

test/null_osystem.o wasn't cleaned up. The result was failing tests
when scummvm itself was build with changed configure settings.

Changed paths:
    test/module.mk


diff --git a/test/module.mk b/test/module.mk
index e42c36ff844..becd3e82c9f 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -75,7 +75,7 @@ test/runner.cpp: $(TESTS) $(srcdir)/test/module.mk
 
 clean: clean-test
 clean-test:
-	-$(RM) test/runner.cpp test/runner test/engine-data/encoding.dat
+	-$(RM) test/runner.cpp test/runner test/engine-data/encoding.dat test/null_osystem.o
 	-rmdir test/engine-data
 
 test/engine-data/encoding.dat: $(srcdir)/dists/engine-data/encoding.dat


Commit: be7e6731a9f900bb8f5117f36fd2c6d80b833201
    https://github.com/scummvm/scummvm/commit/be7e6731a9f900bb8f5117f36fd2c6d80b833201
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-10-06T17:52:47+02:00

Commit Message:
BUILD: run clean-test on distclean

The expectation of distclean is that it cleans as much as possible.
Now the tests are also cleaned on distclean.

Changed paths:
    Makefile.common


diff --git a/Makefile.common b/Makefile.common
index ab4cfd8c270..ae638f61a5a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -141,7 +141,7 @@ else
 manual:
 endif
 
-distclean: clean clean-devtools
+distclean: clean clean-devtools clean-test
 	$(RM) config.h config.mk config.log configure.stamp engines/engines.mk engines/detection_table.h engines/plugins_table.h "ScummVM Manual"*.pdf
 
 clean: clean-toplevel