Skip to content

Adds folder support for auto grader #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adds folder support for auto grader #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dda6ff
Add support for folder mode (untested)
Tkaixiang Mar 28, 2024
d2d2ff3
Merge branch 'master' of https://github.com/source-academy/grader int…
Tkaixiang Apr 15, 2024
b805024
fixes
Tkaixiang Apr 15, 2024
79c2ec8
Remove package-lock.json
RichDom2185 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 53 additions & 40 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createContext, runInContext, Result as SourceResult } from 'js-slang'
import { createContext, runInContext, runFilesInContext, Result as SourceResult } from 'js-slang'
import { stringify } from 'js-slang/dist/utils/stringify'
import { SourceError, Context, Frame, Value, Variant } from 'js-slang/dist/types'
import {
Expand Down Expand Up @@ -40,20 +40,18 @@ export type Testcase = {
*/
export type AwsEvent = {
library: Library
prependProgram: string
studentProgram: string
postpendProgram: string
testcases: Testcase[]
files: Record<string, string>
entrypointFile: string
}

/**
* Set of properties of a unit test
*/
export type UnitTest = {
library: Library
prependProgram: string
studentProgram: string
postpendProgram: string
files: Record<string, string>
entrypointFile: string
testcase: Testcase
}

Expand Down Expand Up @@ -142,9 +140,8 @@ export const runAll = async (event: AwsEvent): Promise<Summary> => {
const promises: Promise<Output>[] = event.testcases.map((testcase: Testcase) =>
run({
library: event.library,
prependProgram: event.prependProgram || '',
studentProgram: event.studentProgram,
postpendProgram: event.postpendProgram || '',
files: event.files,
entrypointFile: event.entrypointFile,
testcase: testcase
})
)
Expand Down Expand Up @@ -177,43 +174,59 @@ export const run = async (unitTest: UnitTest): Promise<Output> => {
}

// Run prepend
const [prependResult, elevatedBase] = await runInElevatedContext(context, () =>
// const [prependResult, elevatedBase] = await runInElevatedContext(context, () =>
// catchTimeouts(
// runInContext(unitTest.prependProgram, context, {
// executionMethod: 'native',
// originalMaxExecTime: TIMEOUT_DURATION
// })
// )
// )
// if (prependResult.status !== 'finished') {
// return handleResult(prependResult, context, unitTest.prependProgram, 'prepend')
// }

// // Run student program
// const studentResult = await catchTimeouts(
// runInContext(unitTest.studentProgram, context, {
// executionMethod: 'native',
// originalMaxExecTime: TIMEOUT_DURATION
// })
// )
// if (studentResult.status !== 'finished') {
// return handleResult(studentResult, context, unitTest.studentProgram, 'student')
// }

// // Run postpend
// const [postpendResult] = await runInElevatedContext(
// context,
// () =>
// catchTimeouts(
// runInContext(unitTest.postpendProgram, context, {
// executionMethod: 'native',
// originalMaxExecTime: TIMEOUT_DURATION
// })
// ),
// elevatedBase
// )
// if (postpendResult.status !== 'finished') {
// return handleResult(postpendResult, context, unitTest.postpendProgram, 'postpend')
// }

// Run all files with entrypoint file in context
const [runFilesResult, elevatedBase] = await runInElevatedContext(context, () =>
catchTimeouts(
runInContext(unitTest.prependProgram, context, {
runFilesInContext(unitTest.files, unitTest.entrypointFile, context, {
executionMethod: 'native',
originalMaxExecTime: TIMEOUT_DURATION
})
)
)
if (prependResult.status !== 'finished') {
return handleResult(prependResult, context, unitTest.prependProgram, 'prepend')
}

// Run student program
const studentResult = await catchTimeouts(
runInContext(unitTest.studentProgram, context, {
executionMethod: 'native',
originalMaxExecTime: TIMEOUT_DURATION
})
)
if (studentResult.status !== 'finished') {
return handleResult(studentResult, context, unitTest.studentProgram, 'student')
}

// Run postpend
const [postpendResult] = await runInElevatedContext(
context,
() =>
catchTimeouts(
runInContext(unitTest.postpendProgram, context, {
executionMethod: 'native',
originalMaxExecTime: TIMEOUT_DURATION
})
),
elevatedBase
)
if (postpendResult.status !== 'finished') {
return handleResult(postpendResult, context, unitTest.postpendProgram, 'postpend')
// since both prepend and postpend files are combined into the same file (1 string), we target
// the main entrypoint file only
if (runFilesResult.status !== 'finished') {
return handleResult(runFilesResult, context, unitTest.files[unitTest.entrypointFile], 'student')
}

const [testcaseResult] = await runInElevatedContext(
Expand Down
Loading
Loading