++
отслеживание нанов в тестах
This commit is contained in:
@@ -150,12 +150,10 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
if (ethalon == null) {
|
||||
String options_ = "-s";
|
||||
String environments_ = "";
|
||||
|
||||
if (Global.normalProperties.CompleteCompilationOptions)
|
||||
options_ = completeOptions(options_);
|
||||
if (Global.normalProperties.CompleteRunEnvironments)
|
||||
environments_ = completeEnvironments(environments_);
|
||||
|
||||
compilationTasks.add(compilationTask = new DVMCompilationTask(
|
||||
index, configuration,
|
||||
options_,
|
||||
@@ -305,23 +303,21 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
List<String> output_lines = Arrays.asList(output.split("\n"));
|
||||
List<String> errors_lines = Arrays.asList(errors.split("\n"));
|
||||
//---
|
||||
if (output.trim().isEmpty()) {
|
||||
if (output.trim().isEmpty() || Utils.isCrushed(output_lines, errors_lines)) {
|
||||
runTask.state = TaskState.Crushed;
|
||||
} else {
|
||||
if (Utils.isCrushed(output_lines, errors_lines)) {
|
||||
runTask.state = TaskState.Crushed;
|
||||
} else {
|
||||
if (Utils.hasNan(output_lines))
|
||||
runTask.state = TaskState.NaN;
|
||||
else {
|
||||
//--
|
||||
Pair<TaskState, Integer> results = new Pair<>(TaskState.Done, 100);
|
||||
switch (runTask.test_type) {
|
||||
case Correctness:
|
||||
results = Utils.analyzeCorrectness(output_lines);
|
||||
break;
|
||||
case Performance:
|
||||
results = Utils.analyzePerformance(output_lines);
|
||||
runTask.CleanTime = Utils.parseCleanTime(output);
|
||||
break;
|
||||
default:
|
||||
results = Utils.analyzeCorrectness(output_lines);
|
||||
break;
|
||||
}
|
||||
//---
|
||||
@@ -363,7 +359,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||
);
|
||||
String taskOut = FileUtils.readFileToString(taskOutFile);
|
||||
String ethalonOut = FileUtils.readFileToString(ethalonOutFile);
|
||||
if (!taskOut.equals(ethalonOut)){
|
||||
if (!taskOut.equals(ethalonOut)) {
|
||||
runTask.state = TaskState.DoneWithDiffs;
|
||||
hasErrors = true;
|
||||
good--;
|
||||
|
||||
Reference in New Issue
Block a user