Skip to content

Commit cf41224

Browse files
committed
Merge branch 'submission_pipeline' of https://github.com/coding-blocks/judge-taskmaster into submission_pipeline
2 parents e733bba + 9bdc480 commit cf41224

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/tasks/run.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ async function execRun (job: RunJob): Promise<RunResult> {
3535

3636
// Check for compile_stderr if can't find a stdout file ; stdout can be ''
3737
const compile_stderr = cat(path.join(currentJobDir, 'compile.stderr')).toString()
38-
const runguard_stderr = cat(path.join(currentJobDir, 'runguard.stderr')).toString()
39-
let stderr = runguard_stderr || compile_stderr || cat((path.join(currentJobDir, 'run.stderr')).toString())
38+
let stderr = compile_stderr || cat((path.join(currentJobDir, 'run.stderr')).toString())
4039

4140
const run_time = cat(path.join(currentJobDir, 'runguard.time')).toString()
4241
const code = cat(path.join(currentJobDir, 'runguard.code')).toString()

src/tasks/submission.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ async function execSubmission(job: SubmissionJob): Promise<SubmissionResult> {
5454

5555
// Check for compile_stderr if can't find a stdout file ; stdout can be ''
5656
const compile_stderr = cat(path.join(currentJobDir, 'compile.stderr')).toString()
57-
const runguard_stderr = cat(path.join(currentJobDir, 'runguard.stderr')).toString()
58-
let stderr = runguard_stderr || compile_stderr || cat((path.join(currentJobDir, 'run.stderr')).toString())
57+
let stderr = compile_stderr || cat((path.join(currentJobDir, 'run.stderr')).toString())
5958

6059
rm('-rf', currentJobDir)
6160

0 commit comments

Comments
 (0)