diff --git a/source/tester.cpp b/source/tester.cpp index 1c539d9..5b89b13 100644 --- a/source/tester.cpp +++ b/source/tester.cpp @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) if (jaffarCommon::file::loadStringFromFile(sequenceRaw, sequenceFilePath) == false) JAFFAR_THROW_LOGIC("[ERROR] Could not find or read from input sequence file: %s\n", sequenceFilePath.c_str()); // Building sequence information - const auto sequence = jaffarCommon::string::split(sequenceRaw, ' '); + const auto sequence = jaffarCommon::string::split(sequenceRaw, '\n'); // Getting sequence lenght const auto sequenceLength = sequence.size(); diff --git a/tests/arkanoid.arkNESController.test b/tests/arkanoid.arkNESController.test index 65ab45a..ea42004 100644 --- a/tests/arkanoid.arkNESController.test +++ b/tests/arkanoid.arkNESController.test @@ -4,7 +4,7 @@ "Initial State File": "", "Sequence File": "arkanoid.arkNESController.sol", "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "MAPR", "CTRL", "APUR" ], - "Controller 1 Type": "Joypad", + "Controller 1 Type": "ArkanoidNES", "Controller 2 Type": "None", "Differential Compression": { diff --git a/tests/arkanoid2.arkFamicomController.test b/tests/arkanoid2.arkFamicomController.test new file mode 100644 index 0000000..52da279 --- /dev/null +++ b/tests/arkanoid2.arkFamicomController.test @@ -0,0 +1,15 @@ +{ + "Rom File": "roms/Arkanoid II (J) [!].nes", + "Expected ROM SHA1": "79F9D3DA1904400832546216833978A2261313A5", + "Initial State File": "", + "Sequence File": "arkanoid2.arkFamicomController.sol", + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "MAPR", "CTRL", "APUR" ], + "Controller 1 Type": "ArkanoidFamicom", + "Controller 2 Type": "None", + "Differential Compression": + { + "Enabled": false, + "Max Differences": 2200, + "Use Zlib": true + } +} diff --git a/tests/meson.build b/tests/meson.build index 7a1b20f..5b22461 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -90,5 +90,25 @@ if get_option('onlyOpenSource') == false workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testFile, '--cycleType', 'Full'], - suite : [ testSuite ]) + suite : [ testSuite ]) + + testFile = 'arkanoid.arkNESController.test' + testSuite = testFile.split('.')[0] + testName = testFile.split('.')[1] + test(testName, + quickerNESTester, + workdir : meson.current_source_dir(), + timeout: testTimeout, + args : [ testFile, '--cycleType', 'Full'], + suite : [ testSuite ]) + + testFile = 'arkanoid2.arkFamicomController.test' + testSuite = testFile.split('.')[0] + testName = testFile.split('.')[1] + test(testName, + quickerNESTester, + workdir : meson.current_source_dir(), + timeout: testTimeout, + args : [ testFile, '--cycleType', 'Full'], + suite : [ testSuite ]) endif \ No newline at end of file