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

[OMGPizzaGuy]

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

Summary:
87748edb77 CREATE_PROJECT: Fix parsing of TESTS definition
e6e3e8b76e CREATE_PROJECT: Update path to cxxtestgen


Commit: 87748edb77de969a1a99c3c7f40e674a45101e46
    https://github.com/scummvm/scummvm/commit/87748edb77de969a1a99c3c7f40e674a45101e46
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2026-05-14T21:02:28-05:00

Commit Message:
CREATE_PROJECT: Fix parsing of TESTS definition

Changed paths:
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 327474d5ec8..3e6e98768da 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -2424,47 +2424,53 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin
 			++i;
 
 			while (i != tokens.end()) {
-				// Read input
-				std::string folder = unifyPath(*i);
+				if (*i == "\\") {
+					std::getline(moduleMk, line);
+					tokens = tokenize(line);
+					i = tokens.begin();
+				} else {
+					// Read input
+					std::string folder = unifyPath(*i);
 
-				// Get include folder
-				const std::string source_dir = "$(srcdir)/";
-				const std::string selector = getLastPathComponent(folder);
-				const std::string module = getLastPathComponent(moduleDir);
+					// Get include folder
+					const std::string source_dir = "$(srcdir)/";
+					const std::string selector = getLastPathComponent(folder);
+					const std::string module = getLastPathComponent(moduleDir);
 
-				folder.replace(folder.find(source_dir), source_dir.length(), "");
-				folder.replace(folder.find(selector), selector.length(), "");
-				folder.replace(folder.find(module), module.length(), moduleDir);
+					folder.replace(folder.find(source_dir), source_dir.length(), "");
+					folder.replace(folder.find(selector), selector.length(), "");
+					folder.replace(folder.find(module), module.length(), moduleDir);
 
-				// Scan all files in the include folder
-				FileList files = listDirectory(folder);
+					// Scan all files in the include folder
+					FileList files = listDirectory(folder);
 
-				// Add to list of test folders
-				if (shouldInclude.top()) {
-					testDirs.push_back(folder);
-				}
+					// Add to list of test folders
+					if (shouldInclude.top()) {
+						testDirs.push_back(folder);
+					}
 
-				for (FileList::const_iterator f = files.begin(); f != files.end(); ++f) {
-					if (f->isDirectory)
-						continue;
+					for (FileList::const_iterator f = files.begin(); f != files.end(); ++f) {
+						if (f->isDirectory)
+							continue;
 
-					std::string filename = folder + f->name;
+						std::string filename = folder + f->name;
 
-					if (shouldInclude.top()) {
-						// In case we should include a file, we need to make
-						// sure it is not in the exclude list already. If it
-						// is we just drop it from the exclude list.
-						excludeList.remove(filename);
+						if (shouldInclude.top()) {
+							// In case we should include a file, we need to make
+							// sure it is not in the exclude list already. If it
+							// is we just drop it from the exclude list.
+							excludeList.remove(filename);
 
-						includeList.push_back(filename);
-					} else if (std::find(includeList.begin(), includeList.end(), filename) == includeList.end()) {
-						// We only add the file to the exclude list in case it
-						// has not yet been added to the include list.
-						excludeList.push_back(filename);
+							includeList.push_back(filename);
+						} else if (std::find(includeList.begin(), includeList.end(), filename) == includeList.end()) {
+							// We only add the file to the exclude list in case it
+							// has not yet been added to the include list.
+							excludeList.push_back(filename);
+						}
 					}
-				}
 
-				++i;
+					++i;
+				}
 			}
 		} else if (*i == "ifdef") {
 			if (tokens.size() < 2)


Commit: e6e3e8b76ebba9f5e4ee5e7d484c8266b1e28441
    https://github.com/scummvm/scummvm/commit/e6e3e8b76ebba9f5e4ee5e7d484c8266b1e28441
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2026-05-14T21:03:22-05:00

Commit Message:
CREATE_PROJECT: Update path to cxxtestgen

Changed paths:
    devtools/create_project/msvc.cpp


diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 4e98b4558ee..2c18f45430e 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -323,7 +323,7 @@ std::string MSVCProvider::getTestPreBuildEvent(const BuildSetup &setup) const {
 
 	std::string cmdLine = "";
 	cmdLine = "if not exist \"$(SolutionDir)test\\runner\" mkdir \"$(SolutionDir)test\\runner\"\n"
-	          "python3 "$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test/runner/test_runner.cpp"" + target;
+	          "python3 "$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/bin/cxxtestgen" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test/runner/test_runner.cpp"" + target;
 	return cmdLine;
 }