Give precedence to filename for expected result

DOMjudge team · meisterT · commit 3b9ec839379b · 2019-04-05T19:11:35.000+02:00
(cherry picked from commit ed39176)
diff --git a/webapp/src/DOMJudgeBundle/Service/ImportProblemService.php b/webapp/src/DOMJudgeBundle/Service/ImportProblemService.php
@@ -608,6 +608,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
`@@ -608,6 +608,8 @@ public function importZippedProblem(`
`608`	`608`	`} elseif (!in_array($expectedResult, $results)) {`
`609`	`609`	`$messages[] = sprintf("Annotated result '%s' does not match directory for %s",`
`610`	`610`	`implode(', ', $results), $path);`
	`611`	`+ } elseif (!empty($expectedResult)) {`
	`612`	`+ $results = [$expectedResult];`
`611`	`613`	`}`
`612`	`614`	`if ($totalSize <= $this->DOMJudgeService->dbconfig_get('sourcesize_limit') * 1024) {`
`613`	`615`	`$contest = $this->entityManager->getRepository(Contest::class)->find($contest->getCid());`