Parse test failures. Add missing MBC5 test

veikkos · Jan 6, 2020 · a718243 · a718243
1 parent afa0209
commit a718243
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/tests/gekkios-tests.cpp b/tests/gekkios-tests.cpp
@@ -22,10 +22,14 @@ TEST(Gekkio, div_write) {
   runTest(GEKKIO, "acceptance/timer/div_write.gb");
 }
 
-TEST(Gekkio, rom_4Mb) {
+TEST(Gekkio, mbc1_rom_4Mb) {
   runTest(GEKKIO, "emulator-only/mbc1/rom_4Mb.gb");
 }
 
+TEST(Gekkio, mbc5_rom_4Mb) {
+  runTest(GEKKIO, "emulator-only/mbc5/rom_4Mb.gb");
+}
+
 TEST(Gekkio, oam_dma_basic) {
   runTest(GEKKIO, "acceptance/oam_dma/basic.gb");
 }

diff --git a/tests/test-runner.cpp b/tests/test-runner.cpp
@@ -16,17 +16,28 @@ static void serialListener(uint8_t b) {
   *outputPtr += b;
 }
 
-std::function<bool()> getValidator(RomType romType, const std::string& testOutput) {
+enum Result {
+  UNINITIALIZED,
+  ONGOING,
+  PASSED,
+  FAILED
+};
+
+std::function<Result()> getValidator(RomType romType, const std::string& testOutput) {
+  const auto validate = [](const std::string& output, const char* passCondition, const char* failCondition) {
+    return output.find(passCondition) != std::string::npos ? PASSED :
+      output.find(failCondition) != std::string::npos ? FAILED : ONGOING;
+  };
+
   switch (romType) {
   case BLARGG:
-    return [&testOutput]() {
-      return testOutput.find("Passed") != std::string::npos;
+    return [&]() {
+      return validate(testOutput, "Passed", "Failed");
     };
   case GEKKIO:
-    return [&testOutput]() {
-      // Magic number for success as can be found from
-      // "mooneye-gb/tests/common/lib/quit.s"
-      return testOutput.find("\x03\x05\x08\x0d\x15\x22") != std::string::npos;
+    return [&]() {
+      // Magic numbers as can be found in "mooneye-gb/tests/common/lib/quit.s"
+      return validate(testOutput, "\x03\x05\x08\x0d\x15\x22", "\x42\x42\x42\x42\x42\x42");
     };
   default:
     return nullptr;
@@ -55,10 +66,13 @@ void runTest(RomType romType, const char* romPath) {
   ASSERT_TRUE(validator);
 
   int i = 4 * 60;
-  while (--i && !validator())
+  Result result = UNINITIALIZED;
+  do {
     run(&chester);
+    result = validator();
+  } while(--i && result == ONGOING);
 
-  EXPECT_LT(0, i);
+  EXPECT_EQ(PASSED, result);
 
   uninit(&chester);
 }