gearmulator

commit 4647d2acfe25c0653e314b92153a1e229b6749f7
parent 19bf3d35ee150973938dafdd2676200b2178964c
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sat, 29 Jun 2024 14:39:53 +0200

run integration tests in Snow mode as TI/TI2 modes are not predictable due to threading

Diffstat:
M
source/virusConsoleLib/consoleApp.cpp
 | 
8
++++----
M
source/virusConsoleLib/consoleApp.h
 | 
2
+-
M
source/virusIntegrationTest/integrationTest.cpp
 | 
8
++++----
M
source/virusIntegrationTest/integrationTest.h
 | 
2
+-
M
source/virusTestConsole/virusTestConsole.cpp
 | 
2
+-

5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/source/virusConsoleLib/consoleApp.cpp b/source/virusConsoleLib/consoleApp.cpp
@@ -23,18 +23,18 @@ class EsaiListener;
 
 namespace
 {
-	ROMFile findRom(const std::string& _name)
+	ROMFile findRom(const std::string& _name, const DeviceModel _tiModel)
 	{
-		auto result = ROMLoader::findROM(_name, DeviceModel::TI2);
+		auto result = ROMLoader::findROM(_name, _tiModel);
 		if(result.isValid())
 			return result;
 		return ROMLoader::findROM(_name, DeviceModel::ABC);
 	}
 }
 
-ConsoleApp::ConsoleApp(const std::string& _romFile)
+ConsoleApp::ConsoleApp(const std::string& _romFile, const DeviceModel _tiModel)
 : m_romName(_romFile)
-, m_rom(findRom(_romFile))
+, m_rom(findRom(_romFile, _tiModel))
 , m_preset({})
 {
 	if (!m_rom.isValid())
diff --git a/source/virusConsoleLib/consoleApp.h b/source/virusConsoleLib/consoleApp.h
@@ -9,7 +9,7 @@
 class ConsoleApp
 {
 public:
-	ConsoleApp(const std::string& _romFile);
+	ConsoleApp(const std::string& _romFile, virusLib::DeviceModel _tiModel);
 	~ConsoleApp();
 
 	bool isValid() const;
diff --git a/source/virusIntegrationTest/integrationTest.cpp b/source/virusIntegrationTest/integrationTest.cpp
@@ -52,7 +52,7 @@ int main(int _argc, char* _argv[])
 				const auto romFile = cmd.get("rom");
 				const auto preset = cmd.get("preset");
 
-				IntegrationTest test(cmd, romFile, preset, std::string());
+				IntegrationTest test(cmd, romFile, preset, std::string(), virusLib::DeviceModel::Snow);
 				return test.run();
 			}
 			if(cmd.contains("folder"))
@@ -152,7 +152,7 @@ int main(int _argc, char* _argv[])
 
 					for (auto& preset : presets)
 					{
-						IntegrationTest test(cmd, romFile, preset, subfolder + '/');
+						IntegrationTest test(cmd, romFile, preset, subfolder + '/', virusLib::DeviceModel::Snow);
 						if(test.run() != 0)
 							return -1;
 					}
@@ -172,12 +172,12 @@ int main(int _argc, char* _argv[])
 	}
 }
 
-IntegrationTest::IntegrationTest(const CommandLine& _commandLine, std::string _romFile, std::string _presetName, std::string _outputFolder)
+IntegrationTest::IntegrationTest(const CommandLine& _commandLine, std::string _romFile, std::string _presetName, std::string _outputFolder, const virusLib::DeviceModel _tiModel)
 	: m_cmd(_commandLine)
 	, m_romFile(std::move(_romFile))
 	, m_presetName(std::move(_presetName))
 	, m_outputFolder(std::move(_outputFolder))
-	, m_app(m_romFile)
+	, m_app(m_romFile, _tiModel)
 {
 }
 
diff --git a/source/virusIntegrationTest/integrationTest.h b/source/virusIntegrationTest/integrationTest.h
@@ -9,7 +9,7 @@ class CommandLine;
 class IntegrationTest
 {
 public:
-	explicit IntegrationTest(const CommandLine& _commandLine, std::string _romFile, std::string _presetName, std::string _outputFolder);
+	explicit IntegrationTest(const CommandLine& _commandLine, std::string _romFile, std::string _presetName, std::string _outputFolder, virusLib::DeviceModel _tiModel);
 
 	int run();
 
diff --git a/source/virusTestConsole/virusTestConsole.cpp b/source/virusTestConsole/virusTestConsole.cpp
@@ -34,7 +34,7 @@ int main(int _argc, char* _argv[])
 	}
 	
 	std::unique_ptr<ConsoleApp> app;
-	app.reset(new ConsoleApp({}));
+	app.reset(new ConsoleApp({}, DeviceModel::TI2));
 
 	if(!app->isValid())
 	{