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

Fixed automated tests

Browse source
This commit is contained in:
Souryo 2014-07-27 19:42:32 -04:00
parent 941efc4110
commit 4897f2f6ad
3 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Core/Console.cpp
View file

@ -343,6 +343,10 @@ bool Console::RunTest(uint8_t *expectedResult)
Timer timer;
uint8_t maxWait = 60;
uint8_t* lastFrameBuffer = new uint8_t[256 * 240 * 4];
bool result = false;
Console::RunningLock.Acquire();
while(true) {
uint32_t executedCycles = _cpu->Exec();
_ppu->Exec();
@ -354,7 +358,8 @@ bool Console::RunTest(uint8_t *expectedResult)
if(timer.GetElapsedMS() > 100) {
if(memcmp(_ppu->GetFrameBuffer(), expectedResult, 256 * 240 * 4) == 0) {
return true;
result = true;
break;
}
timer.Reset();
@ -366,14 +371,16 @@ bool Console::RunTest(uint8_t *expectedResult)
maxWait--;
if(maxWait == 0) {
return false;
result = false;
break;
}
}
}
Console::RunningLock.Release();
delete[] lastFrameBuffer;
return false;
return result;
}
void Console::SaveTestResult()

36
GUI/MainWindow.cpp
View file

@ -373,18 +373,20 @@ namespace NES
void MainWindow::StartEmuThread()
{
if(!_emuThread) {
_emuThread.reset(new thread(&Console::Run, _console.get()));
}
if(!_runningTests) {
if(!_emuThread) {
_emuThread.reset(new thread(&Console::Run, _console.get()));
}
_currentROM = _console->GetROMPath();
_currentROMName = FolderUtilities::GetFilename(_console->GetROMPath(), false);
SetWindowText(_hWnd, (wstring(_windowName) + L": " + _currentROMName).c_str());
_currentROM = _console->GetROMPath();
_currentROMName = FolderUtilities::GetFilename(_console->GetROMPath(), false);
SetWindowText(_hWnd, (wstring(_windowName) + L": " + _currentROMName).c_str());
Console::ClearFlags(EmulationFlags::Paused);
Console::ClearFlags(EmulationFlags::Paused);
if(IsMenuChecked(ID_OPTIONS_SHOWFPS)) {
_renderer->SetFlags(UIFlags::ShowFPS);
if(IsMenuChecked(ID_OPTIONS_SHOWFPS)) {
_renderer->SetFlags(UIFlags::ShowFPS);
}
}
}
@ -403,9 +405,9 @@ namespace NES
void MainWindow::Stop(bool powerOff)
{
if(powerOff && _emuThread) {
_soundManager->Reset();
_soundManager->Reset();
if(powerOff && _emuThread) {
if(_console) {
_console->Stop();
}
@ -486,16 +488,18 @@ namespace NES
int passCount = 0;
int failCount = 0;
int totalCount = 0;
Console::Pause();
_runningTests = true;
for(wstring testROM : FolderUtilities::GetFilesInFolder(L"..\\TestSuite\\", L"*.nes", true)) {
ifstream testResult(testROM + L".trt", ios::in | ios::binary);
if(testResult) {
std::wcout << testROM.substr(13) << ": ";
uint8_t* expectedResult = new uint8_t[256 * 240 * 4];
testResult.read((char*)expectedResult, 256 * 240 * 4);
Console *console = new Console(testROM);
if(console->RunTest(expectedResult)) {
Console::LoadROM(testROM);
std::wcout << testROM.substr(13) << ": ";
if(_console->RunTest(expectedResult)) {
std::cout << "Passed";
passCount++;
} else {
@ -506,15 +510,17 @@ namespace NES
testResult.close();
delete console;
delete[] expectedResult;
} else {
//std::wcout << "[No result]" << std::endl;
}
totalCount++;
}
Console::Resume();
Stop(true);
_runningTests = false;
std::cout << "------------------------" << std::endl;
std::cout << passCount << " / " << totalCount << " + " << failCount << " FAILED" << std::endl;
std::cout << "------------------------" << std::endl;

1
GUI/MainWindow.h
View file

@ -26,6 +26,7 @@ namespace NES {
int _currentSaveSlot = 0;
bool _runningTests = false;
bool _playingMovie = false;
private: