JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: cases data reading for diff

Browse Source
This commit is contained in:
李衍志523370910113 2024-10-26 13:49:07 +08:00
parent 8d5932801d
commit ad35dffbaf
2 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
joj3_config_generator/lib/task.py
View File

@ -255,7 +255,7 @@ def fix_diff(
def fix_result_detail(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage: def fix_result_detail(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
if "result-detail" in task_stage.parsers: if (task_stage.parsers is not None) and ("result-detail" in task_stage.parsers):
result_detail_parser = next( result_detail_parser = next(
p for p in conf_stage.parsers if p.name == "result-detail" p for p in conf_stage.parsers if p.name == "result-detail"
) )
@ -291,9 +291,12 @@ def fix_comment(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
"result-status", "result-status",
"cpplint", "cpplint",
] # FIXME: determine where cpplint should be ] # FIXME: determine where cpplint should be
if task_stage.parsers is not None:
for parser in task_stage.parsers: for parser in task_stage.parsers:
if parser in comment_parser: if parser in comment_parser:
comment_parser_ = next(p for p in conf_stage.parsers if p.name == parser) comment_parser_ = next(
p for p in conf_stage.parsers if p.name == parser
)
if getattr(task_stage, parser.replace("-", "_"), None) is not None: if getattr(task_stage, parser.replace("-", "_"), None) is not None:
comment_parser_.with_.update( comment_parser_.with_.update(
getattr(task_stage, parser.replace("-", "_")) getattr(task_stage, parser.replace("-", "_"))
@ -301,3 +304,8 @@ def fix_comment(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
else: else:
continue continue
return conf_stage return conf_stage
def fix_diff(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
return conf_stage

45
tests/convert/basic/task.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Homework 1 exercise 2", "name": "h4 ex1",
"logPath": "Homework-1-exercise-2.log", "logPath": "h4-ex1.log",
"expireUnixTimestamp": 1728748740, "expireUnixTimestamp": 1728748740,
"stage": { "stage": {
"sandboxExecServer": "172.17.0.1:5051", "sandboxExecServer": "172.17.0.1:5051",
@ -234,11 +234,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": false,
"mem": false,
"stdout": false,
"stderr": true,
"exitstatus": true,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -379,11 +374,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": false,
"mem": false,
"stdout": false,
"stderr": true,
"exitstatus": false,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -571,11 +561,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": false,
"mem": false,
"stdout": true,
"stderr": false,
"exitstatus": true,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -713,11 +698,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": false,
"mem": false,
"stdout": false,
"stderr": true,
"exitstatus": true,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -820,11 +800,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": false,
"mem": false,
"stdout": true,
"stderr": false,
"exitstatus": true,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -921,11 +896,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": true,
"mem": true,
"stdout": false,
"stderr": true,
"exitstatus": true,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -1022,11 +992,6 @@
{ {
"name": "result-detail", "name": "result-detail",
"with": { "with": {
"time": true,
"mem": true,
"stdout": false,
"stderr": true,
"exitstatus": true,
"score": 0, "score": 0,
"comment": "", "comment": "",
"showFiles": [ "showFiles": [
@ -1042,9 +1007,9 @@
] ]
}, },
"teapot": { "teapot": {
"logPath": "Homework-1-exercise-2-joint-teapot-debug.log", "logPath": "h4-ex1-joint-teapot-debug.log",
"scoreboardPath": "Homework-1-exercise-2-scoreboard.csv", "scoreboardPath": "h4-ex1-scoreboard.csv",
"failedTablePath": "Homework-1-exercise-2-failed-table.md", "failedTablePath": "h4-ex1-failed-table.md",
"gradingRepoName": "engr151-joj", "gradingRepoName": "engr151-joj",
"skipIssue": false, "skipIssue": false,
"skipScoreboard": false, "skipScoreboard": false,