Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/framework/Testee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ export class Testee { // TODO unified with testbed interface
await testee.initialize(description.program, description.args ?? []).catch((o) => {
return Promise.reject(o)
});
}), 1).catch((e: Error) => {
}), 1).catch((e: string) => {
const result = new StepOutcome(step);
testee.states.set(description.title, result.update((e.message.includes('timeout')) ? Outcome.timedout : Outcome.error, e.message));
testee.states.set(description.title, result.update((e.includes('timeout')) ? Outcome.timedout : Outcome.error, e));
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/manage/Compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class WatCompiler extends Compiler {
compile.on('close', (code) => {
if (code !== 0) {
this.emit(CompilationEvents.failed, err);
reject(`Compilation to wasm failed: wat2wasm exited with code ${code}: ${err}`);
reject(`Compilation to wasm failed: wat2wasm exited with code ${code}: ${err.substring(0, 320).trim()}`);
return;
}
this.compiled.set(program, {file: file, out: out, err: err});
Expand Down Expand Up @@ -224,7 +224,7 @@ export class AsScriptCompiler extends Compiler {

compile.on('close', (code) => {
if (code !== 0) {
reject(`Compilation to wasm failed: ${err}`);
reject(`Compilation to wasm failed: ${err.substring(0, 320).trim()}`);
return;
}
this.compiled.set(program, {file: file, out: out, err: err});
Expand Down
2 changes: 1 addition & 1 deletion src/manage/Uploader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export class EmulatorUploader extends Uploader {

reader.on('close', () => {
that.emit(UploaderEvents.failed);
reject(`Could not connect. Error: ${error}`);
reject(`Testbed closed unexpectedly.`);
});
} else {
that.emit(UploaderEvents.failed);
Expand Down
1 change: 1 addition & 0 deletions src/reporter/Results.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ abstract class AbstractAggregateResult implements AggregateResult {
aggregate(outcomes: Result[]) {
this.subOutcomes = outcomes;
this.outcome = this.check();
if (this.clarification.length === 0) this.clarification = this.subOutcomes.flatMap(outcome => outcome.clarification).join('; ')
}

outcomes(): Result[] {
Expand Down
Loading