empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TestHelper: Updated to match input rework

Browse source
This commit is contained in:
Souryo 2016-02-14 16:53:18 -05:00
parent cf450bcdb7
commit a428c11b20
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
TestHelper/TestHelper.cpp
View file

@ -31,6 +31,7 @@
#include "../Utilities/SimpleLock.h" #include "../Utilities/SimpleLock.h"
#include "../Utilities/Timer.h" #include "../Utilities/Timer.h"
#include "../Core/MessageManager.h" #include "../Core/MessageManager.h"
#include "../Core/ControlManager.h"
using namespace std; using namespace std;
@ -53,6 +54,7 @@ public:
extern "C" { extern "C" {
void __stdcall InitializeEmu(const char* homeFolder, void*, void*); void __stdcall InitializeEmu(const char* homeFolder, void*, void*);
void __stdcall SetControllerType(uint32_t port, ControllerType type);
int __stdcall RomTestRun(char* filename); int __stdcall RomTestRun(char* filename);
void __stdcall LoadROM(char* filename); void __stdcall LoadROM(char* filename);
void __stdcall Run(); void __stdcall Run();
@ -129,12 +131,13 @@ int main(int argc, char* argv[])
timer.Reset(); timer.Reset();
for(int i = 0; i < 4; i++) { int numberOfThreads = 4;
for(int i = 0; i < numberOfThreads; i++) {
std::thread *testThread = new std::thread(RunTest); std::thread *testThread = new std::thread(RunTest);
testThreads.push_back(testThread); testThreads.push_back(testThread);
} }
for(int i = 0; i < 4; i++) { for(int i = 0; i < numberOfThreads; i++) {
testThreads[i]->join(); testThreads[i]->join();
delete testThreads[i]; delete testThreads[i];
} }
@ -158,6 +161,8 @@ int main(int argc, char* argv[])
RegisterNotificationCallback((NotificationListenerCallback)OnNotificationReceived); RegisterNotificationCallback((NotificationListenerCallback)OnNotificationReceived);
InitializeEmu(mesenFolder.c_str(), nullptr, nullptr); InitializeEmu(mesenFolder.c_str(), nullptr, nullptr);
SetControllerType(0, ControllerType::StandardController);
SetControllerType(1, ControllerType::StandardController);
int result = RomTestRun(testFilename); int result = RomTestRun(testFilename);
if(runThread != nullptr) { if(runThread != nullptr) {