Fixed 2 test runner issues (#3076)

* Fixed 2 test runner issues Thanks to MGriffin for the help - Fixed non-battle tests omitting errors when failing. - Fixed non-battle tests showing false positive memory leak errors due to the test failing for a different cause. * Update test/test_runner.c Co-authored-by: Martin Griffin <[email protected]>
rh-hideout · Jun 26, 2023 · f3be4e1 · f3be4e1
1 parent 4a6f791
commit f3be4e1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/test/test_runner.c b/test/test_runner.c
@@ -155,7 +155,8 @@ void CB2_TestRunner(void)
         if (gTestRunnerState.test->runner->tearDown)
             gTestRunnerState.test->runner->tearDown(gTestRunnerState.test->data);
 
-        if (!gTestRunnerState.expectLeaks)
+        if (gTestRunnerState.result == gTestRunnerState.expectedResult
+         && !gTestRunnerState.expectLeaks)
         {
             const struct MemBlock *head = HeapHead();
             const struct MemBlock *block = head;
@@ -372,10 +373,10 @@ void Test_ExitWithResult(enum TestResult result, const char *fmt, ...)
     gTestRunnerState.result = result;
     ReinitCallbacks();
     if (gTestRunnerState.state == STATE_REPORT_RESULT
-     && gTestRunnerState.test->runner->handleExitWithResult)
+     && gTestRunnerState.result != gTestRunnerState.expectedResult)
     {
-        if (!gTestRunnerState.test->runner->handleExitWithResult(gTestRunnerState.test->data, result)
-         && gTestRunnerState.result != gTestRunnerState.expectedResult)
+        if (!gTestRunnerState.test->runner->handleExitWithResult
+         || !gTestRunnerState.test->runner->handleExitWithResult(gTestRunnerState.test->data, result))
         {
             va_list va;
             va_start(va, fmt);