Skip to content

Return exit code #419

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

Merged
merged 1 commit into from
Aug 28, 2018
Merged

Return exit code #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions Src/IronPythonTest/Cases/CaseExecuter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ private int GetScopeTest(TestInfo testcase) {
}

private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource source, string testPath, string workingDir) {
int res = 0;
var path = Environment.GetEnvironmentVariable("IRONPYTHONPATH");
if (string.IsNullOrEmpty(path)) {
Environment.SetEnvironmentVariable("IRONPYTHONPATH", IRONPYTHONPATH);
Expand All @@ -257,23 +256,22 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
var scope = engine.CreateScope();
engine.GetSysModule().SetVariable("argv", List.FromArrayNoCopy(new object[] { source.Path }));
var compiledCode = source.Compile(new IronPython.Compiler.PythonCompilerOptions() { ModuleName = "__main__" });

var task = Task<int>.Run(() => {
try {
return engine.Operations.ConvertTo<int>(compiledCode.Execute(scope) ?? 0);
} catch (SystemExitException ex) {
return ex.GetExitCode(out object otherCode);
return ex.GetExitCode(out object _);
}
});

if (!task.Wait(testcase.Options.Timeout)) {
NUnit.Framework.TestContext.Error.WriteLine($"{testcase.Name} timed out after {testcase.Options.Timeout / 1000.0} seconds.");
res = -1;
return -1;
}
return task.Result;
} finally {
Environment.CurrentDirectory = cwd;
}
return res;
}
}
}