diff --git a/joj3_config_generator/processers/task.py b/joj3_config_generator/processers/task.py index b2894b4..025572f 100644 --- a/joj3_config_generator/processers/task.py +++ b/joj3_config_generator/processers/task.py @@ -276,13 +276,7 @@ def fix_diff( stage_cases.append( result.OptionalCmd( stdin=result.CmdFile( - src=( - (task_conf.root / task_conf.path) - .parent.joinpath(stdin) - .name - if task_conf.root is not None and task_conf.path is not None - else f"/home/tt/.config/joj/{task_conf.task.type_}/{stdin}" - ) + src=f"/home/tt/.config/joj/{task_conf.task.type_}/{stdin}", ), args=(shlex.split(command) if command is not None else None), cpu_limit=cpu_limit, @@ -305,16 +299,7 @@ def fix_diff( { "score": diff_output.score, "fileName": "stdout", - "answerPath": ( - (task_conf.root / task_conf.path) - .parent.joinpath(stdout) - .name - if ( - task_conf.root is not None - and task_conf.path is not None - ) - else f"/home/tt/.config/joj/{task_conf.task.type_}/{stdout}" - ), + "answerPath": f"/home/tt/.config/joj/{task_conf.task.type_}/{stdout}", "forceQuitOnDiff": diff_output.forcequit, "alwaysHide": diff_output.hide, "compareSpace": not diff_output.ignorespaces, diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index a50b7c3..5361189 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -22,20 +22,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, @@ -69,9 +69,9 @@ "env": [ "PATH=/usr/bin:/bin:/usr/local/bin" ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "cpuLimit": 1, + "clockLimit": 2, + "memoryLimit": 128000000, "procLimit": 50, "copyOut": [ "stdout", @@ -91,9 +91,9 @@ "env": [ "LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log" ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "cpuLimit": 1, + "clockLimit": 2, + "memoryLimit": 128000000, "procLimit": 50, "copyOut": [ "stdout", @@ -133,7 +133,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -154,7 +154,7 @@ "copyIn": { "tools/compile": { "src": "/home/tt/.config/joj/tools/compile", - "max": 419430400 + "max": 128000000 } }, "copyInCached": {}, @@ -223,7 +223,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -244,7 +244,7 @@ "copyIn": { "tools/filelength": { "src": "/home/tt/.config/joj/tools/filelength", - "max": 419430400 + "max": 128000000 } }, "copyInCached": { @@ -332,7 +332,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -353,7 +353,7 @@ "copyIn": { "tests/homework/h7/.clang-tidy": { "src": "/home/tt/.config/joj/tests/homework/h7/.clang-tidy", - "max": 419430400 + "max": 128000000 } }, "copyInCached": { @@ -467,7 +467,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -573,7 +573,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -719,8 +719,8 @@ "PATH=/usr/bin:/bin:/usr/local/bin" ], "stdin": { - "src": "case0.in", - "max": 419430400 + "src": "/home/tt/.config/joj/homework/h7/e2/case0.in", + "max": 128000000 }, "cpuLimit": 1000000000, "clockLimit": 2000000000, @@ -736,8 +736,8 @@ "PATH=/usr/bin:/bin:/usr/local/bin" ], "stdin": { - "src": "case1.in", - "max": 419430400 + "src": "/home/tt/.config/joj/homework/h7/e2/case1.in", + "max": 128000000 }, "cpuLimit": 1000000000, "clockLimit": 2000000000, @@ -762,7 +762,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "case0.out", + "answerPath": "/home/tt/.config/joj/homework/h7/e2/case0.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false @@ -774,7 +774,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "case1.out", + "answerPath": "/home/tt/.config/joj/homework/h7/e2/case1.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false @@ -822,20 +822,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, diff --git a/tests/convert/clang-tidy/task.json b/tests/convert/clang-tidy/task.json index 8c8ed9f..a89a7d4 100644 --- a/tests/convert/clang-tidy/task.json +++ b/tests/convert/clang-tidy/task.json @@ -10,111 +10,6 @@ "sandboxToken": "", "outputPath": "/tmp/joj3_result.json", "stages": [ - { - "name": "healthcheck", - "group": "", - "executor": { - "name": "local", - "with": { - "default": { - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "stdin": { - "content": "", - "max": 419430400 - }, - "stdout": { - "name": "stdout", - "max": 4096 - }, - "stderr": { - "name": "stderr", - "max": 4096 - }, - "cpuLimit": 4000000000000, - "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "stackLimit": 0, - "procLimit": 50, - "cpuRateLimit": 0, - "cpuSetLimit": "", - "copyIn": {}, - "copyInCached": {}, - "copyInDir": ".", - "copyOut": [ - "stdout", - "stderr" - ], - "copyOutCached": [], - "copyOutMax": 0, - "copyOutDir": "", - "tty": false, - "strictMemoryLimit": false, - "dataSegmentLimit": false, - "addressSpaceLimit": false - }, - "cases": [ - { - "args": [ - "/usr/local/bin/repo-health-checker", - "-root=.", - "-repoSize=10", - "-checkFileSumList=-checkFileNameList=" - ], - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - }, - { - "args": [ - "/usr/local/bin/joint-teapot", - "joj3-check-env", - "/home/tt/.config/teapot/teapot.env", - "--grading-repo-name", - "ece280-joj", - "--group-config", - "=100:24" - ], - "env": [ - "LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - } - ] - } - }, - "parsers": [ - { - "name": "healthcheck", - "with": { - "score": 1 - } - }, - { - "name": "debug", - "with": { - "score": 0 - } - } - ] - }, { "name": "[cq] Clang-tidy", "group": "cq", @@ -136,7 +31,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -157,11 +52,11 @@ "copyIn": { "tests/homework/h7/.clang-tidy": { "src": "/home/tt/.config/joj/tests/homework/h7/.clang-tidy", - "max": 419430400 + "max": 128000000 }, "h7/build/compile_commands.json": { "src": "/home/tt/.config/joj/h7/build/compile_commands.json", - "max": 419430400 + "max": 128000000 } }, "copyInCached": {}, @@ -271,20 +166,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, diff --git a/tests/convert/cppcheck/task.json b/tests/convert/cppcheck/task.json index dab704d..1d8ef63 100644 --- a/tests/convert/cppcheck/task.json +++ b/tests/convert/cppcheck/task.json @@ -10,111 +10,6 @@ "sandboxToken": "", "outputPath": "/tmp/joj3_result.json", "stages": [ - { - "name": "healthcheck", - "group": "", - "executor": { - "name": "local", - "with": { - "default": { - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "stdin": { - "content": "", - "max": 419430400 - }, - "stdout": { - "name": "stdout", - "max": 4096 - }, - "stderr": { - "name": "stderr", - "max": 4096 - }, - "cpuLimit": 4000000000000, - "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "stackLimit": 0, - "procLimit": 50, - "cpuRateLimit": 0, - "cpuSetLimit": "", - "copyIn": {}, - "copyInCached": {}, - "copyInDir": ".", - "copyOut": [ - "stdout", - "stderr" - ], - "copyOutCached": [], - "copyOutMax": 0, - "copyOutDir": "", - "tty": false, - "strictMemoryLimit": false, - "dataSegmentLimit": false, - "addressSpaceLimit": false - }, - "cases": [ - { - "args": [ - "/usr/local/bin/repo-health-checker", - "-root=.", - "-repoSize=10", - "-checkFileSumList=-checkFileNameList=" - ], - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - }, - { - "args": [ - "/usr/local/bin/joint-teapot", - "joj3-check-env", - "/home/tt/.config/teapot/teapot.env", - "--grading-repo-name", - "ece280-joj", - "--group-config", - "=100:24" - ], - "env": [ - "LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - } - ] - } - }, - "parsers": [ - { - "name": "healthcheck", - "with": { - "score": 1 - } - }, - { - "name": "debug", - "with": { - "score": 0 - } - } - ] - }, { "name": "[cq] Cppcheck", "group": "cq", @@ -136,7 +31,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -239,20 +134,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, diff --git a/tests/convert/cpplint/task.json b/tests/convert/cpplint/task.json index b032a61..f007b8e 100644 --- a/tests/convert/cpplint/task.json +++ b/tests/convert/cpplint/task.json @@ -10,111 +10,6 @@ "sandboxToken": "", "outputPath": "/tmp/joj3_result.json", "stages": [ - { - "name": "healthcheck", - "group": "", - "executor": { - "name": "local", - "with": { - "default": { - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "stdin": { - "content": "", - "max": 419430400 - }, - "stdout": { - "name": "stdout", - "max": 4096 - }, - "stderr": { - "name": "stderr", - "max": 4096 - }, - "cpuLimit": 4000000000000, - "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "stackLimit": 0, - "procLimit": 50, - "cpuRateLimit": 0, - "cpuSetLimit": "", - "copyIn": {}, - "copyInCached": {}, - "copyInDir": ".", - "copyOut": [ - "stdout", - "stderr" - ], - "copyOutCached": [], - "copyOutMax": 0, - "copyOutDir": "", - "tty": false, - "strictMemoryLimit": false, - "dataSegmentLimit": false, - "addressSpaceLimit": false - }, - "cases": [ - { - "args": [ - "/usr/local/bin/repo-health-checker", - "-root=.", - "-repoSize=10", - "-checkFileSumList=-checkFileNameList=" - ], - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - }, - { - "args": [ - "/usr/local/bin/joint-teapot", - "joj3-check-env", - "/home/tt/.config/teapot/teapot.env", - "--grading-repo-name", - "ece280-joj", - "--group-config", - "=100:24" - ], - "env": [ - "LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - } - ] - } - }, - "parsers": [ - { - "name": "healthcheck", - "with": { - "score": 1 - } - }, - { - "name": "debug", - "with": { - "score": 0 - } - } - ] - }, { "name": "[cq] Cpplint", "group": "cq", @@ -135,7 +30,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -241,20 +136,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, diff --git a/tests/convert/diff/task.json b/tests/convert/diff/task.json index aae42cc..76ecc7f 100644 --- a/tests/convert/diff/task.json +++ b/tests/convert/diff/task.json @@ -10,111 +10,6 @@ "sandboxToken": "", "outputPath": "/tmp/joj3_result.json", "stages": [ - { - "name": "healthcheck", - "group": "", - "executor": { - "name": "local", - "with": { - "default": { - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "stdin": { - "content": "", - "max": 419430400 - }, - "stdout": { - "name": "stdout", - "max": 4096 - }, - "stderr": { - "name": "stderr", - "max": 4096 - }, - "cpuLimit": 4000000000000, - "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "stackLimit": 0, - "procLimit": 50, - "cpuRateLimit": 0, - "cpuSetLimit": "", - "copyIn": {}, - "copyInCached": {}, - "copyInDir": ".", - "copyOut": [ - "stdout", - "stderr" - ], - "copyOutCached": [], - "copyOutMax": 0, - "copyOutDir": "", - "tty": false, - "strictMemoryLimit": false, - "dataSegmentLimit": false, - "addressSpaceLimit": false - }, - "cases": [ - { - "args": [ - "/usr/local/bin/repo-health-checker", - "-root=.", - "-repoSize=10", - "-checkFileSumList=-checkFileNameList=" - ], - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - }, - { - "args": [ - "/usr/local/bin/joint-teapot", - "joj3-check-env", - "/home/tt/.config/teapot/teapot.env", - "--grading-repo-name", - "ece280-joj", - "--group-config", - "=100:24" - ], - "env": [ - "LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - } - ] - } - }, - "parsers": [ - { - "name": "healthcheck", - "with": { - "score": 1 - } - }, - { - "name": "debug", - "with": { - "score": 0 - } - } - ] - }, { "name": "[joj] ex2-asan", "group": "joj", @@ -148,7 +43,7 @@ "copyIn": { "h7/build/ex2-asan": { "src": "/home/tt/.config/joj/h7/build/ex2-asan", - "max": 419430400 + "max": 128000000 } }, "copyInCached": {}, @@ -171,8 +66,8 @@ "PATH=/usr/bin:/bin:/usr/local/bin" ], "stdin": { - "src": "case0.in", - "max": 419430400 + "src": "/home/tt/.config/joj/homework/h7/e2/case0.in", + "max": 128000000 }, "cpuLimit": 1000000000, "clockLimit": 2000000000, @@ -188,8 +83,8 @@ "PATH=/usr/bin:/bin:/usr/local/bin" ], "stdin": { - "src": "case1.in", - "max": 419430400 + "src": "/home/tt/.config/joj/homework/h7/e2/case1.in", + "max": 128000000 }, "cpuLimit": 1000000000, "clockLimit": 2000000000, @@ -214,7 +109,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "case0.out", + "answerPath": "/home/tt/.config/joj/homework/h7/e2/case0.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false @@ -226,7 +121,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "case1.out", + "answerPath": "/home/tt/.config/joj/homework/h7/e2/case1.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false @@ -274,20 +169,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, diff --git a/tests/convert/keyword/task.json b/tests/convert/keyword/task.json index c2e2fcb..4201fa7 100644 --- a/tests/convert/keyword/task.json +++ b/tests/convert/keyword/task.json @@ -10,111 +10,6 @@ "sandboxToken": "", "outputPath": "/tmp/joj3_result.json", "stages": [ - { - "name": "healthcheck", - "group": "", - "executor": { - "name": "local", - "with": { - "default": { - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "stdin": { - "content": "", - "max": 419430400 - }, - "stdout": { - "name": "stdout", - "max": 4096 - }, - "stderr": { - "name": "stderr", - "max": 4096 - }, - "cpuLimit": 4000000000000, - "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "stackLimit": 0, - "procLimit": 50, - "cpuRateLimit": 0, - "cpuSetLimit": "", - "copyIn": {}, - "copyInCached": {}, - "copyInDir": ".", - "copyOut": [ - "stdout", - "stderr" - ], - "copyOutCached": [], - "copyOutMax": 0, - "copyOutDir": "", - "tty": false, - "strictMemoryLimit": false, - "dataSegmentLimit": false, - "addressSpaceLimit": false - }, - "cases": [ - { - "args": [ - "/usr/local/bin/repo-health-checker", - "-root=.", - "-repoSize=10", - "-checkFileSumList=-checkFileNameList=" - ], - "env": [ - "PATH=/usr/bin:/bin:/usr/local/bin" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - }, - { - "args": [ - "/usr/local/bin/joint-teapot", - "joj3-check-env", - "/home/tt/.config/teapot/teapot.env", - "--grading-repo-name", - "ece280-joj", - "--group-config", - "=100:24" - ], - "env": [ - "LOG_FILE_PATH=/home/tt/.cache/joint-teapot-debug.log" - ], - "cpuLimit": 4000000000000, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, - "procLimit": 50, - "copyOut": [ - "stdout", - "stderr" - ] - } - ] - } - }, - "parsers": [ - { - "name": "healthcheck", - "with": { - "score": 1 - } - }, - { - "name": "debug", - "with": { - "score": 0 - } - } - ] - }, { "name": "[cq] Filelength", "group": "cq", @@ -134,7 +29,7 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", @@ -155,7 +50,7 @@ "copyIn": { "tools/filelength": { "src": "/home/tt/.config/joj/tools/filelength", - "max": 419430400 + "max": 128000000 } }, "copyInCached": {}, @@ -239,20 +134,20 @@ ], "stdin": { "content": "", - "max": 419430400 + "max": 128000000 }, "stdout": { "name": "stdout", - "max": 4096 + "max": 128000000 }, "stderr": { "name": "stderr", - "max": 4096 + "max": 128000000 }, - "cpuLimit": 4000000000000, + "cpuLimit": 1, "realCpuLimit": 0, - "clockLimit": 8000000000000, - "memoryLimit": 838860800, + "clockLimit": 2, + "memoryLimit": 128000000, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0,