Give precedence to filename for expected result

DOMjudge team · nickygerritsen · commit ed391765e8ff · 2019-03-31T15:34:27.000+01:00
diff --git a/webapp/src/DOMJudgeBundle/Service/ImportProblemService.php b/webapp/src/DOMJudgeBundle/Service/ImportProblemService.php
@@ -577,6 +577,8 @@ public function importZippedProblem(
                     } elseif (!in_array($expectedResult, $results)) {
                         $messages[] = sprintf("Annotated result '%s' does not match directory for %s",
                                               implode(', ', $results), $path);
+                    } elseif (!empty($expectedResult)) {
+                        $results[] = $expectedResult;
                     }
                     if ($totalSize <= $this->DOMJudgeService->dbconfig_get('sourcesize_limit') * 1024) {
                         $contest        = $this->entityManager->getRepository(Contest::class)->find($contest->getCid());

Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,8 @@ public function importZippedProblem(`
`577`	`577`	`} elseif (!in_array($expectedResult, $results)) {`
`578`	`578`	`$messages[] = sprintf("Annotated result '%s' does not match directory for %s",`
`579`	`579`	`implode(', ', $results), $path);`
	`580`	`+ } elseif (!empty($expectedResult)) {`
	`581`	`+ $results[] = $expectedResult;`
`580`	`582`	`}`
`581`	`583`	`if ($totalSize <= $this->DOMJudgeService->dbconfig_get('sourcesize_limit') * 1024) {`
`582`	`584`	`$contest = $this->entityManager->getRepository(Contest::class)->find($contest->getCid());`