chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Start compare tasks as soon as they are available

Browse Source
This commit is contained in:
Katy Coe
2020-12-30 18:12:56 +01:00
parent 7c65d2c741
commit c57fa592b9
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Il2CppTests/TestRunner.cs
View File

@@ -140,6 +140,8 @@ namespace Il2CppInspector
var nameSuffix = i++ > 0 ? "-" + (i - 1) : ""; var nameSuffix = i++ > 0 ? "-" + (i - 1) : "";
var compareTasks = new List<Task>();
var csTask = Task.Run(() => { var csTask = Task.Run(() => {
using (new Benchmark("Create C# code stubs")) using (new Benchmark("Create C# code stubs"))
new CSharpCodeStubs(model) { new CSharpCodeStubs(model) {
@@ -147,6 +149,8 @@ namespace Il2CppInspector
SuppressMetadata = false, SuppressMetadata = false,
MustCompile = true MustCompile = true
}.WriteSingleFile(testPath + $@"\test-result{nameSuffix}.cs"); }.WriteSingleFile(testPath + $@"\test-result{nameSuffix}.cs");
compareTasks.Add(Task.Run(() => compareFiles(testPath, nameSuffix + ".cs", $"test-result{nameSuffix}.cs")));
}); });
var appModel = await appModelTask; var appModel = await appModelTask;
@@ -155,12 +159,16 @@ namespace Il2CppInspector
using (new Benchmark("Create JSON metadata")) using (new Benchmark("Create JSON metadata"))
new JSONMetadata(appModel) new JSONMetadata(appModel)
.Write(testPath + $@"\test-result{nameSuffix}.json"); .Write(testPath + $@"\test-result{nameSuffix}.json");
compareTasks.Add(Task.Run(() => compareFiles(testPath, nameSuffix + ".json", $"test-result{nameSuffix}.json")));
}); });
var cppTask = Task.Run(() => { var cppTask = Task.Run(() => {
using (new Benchmark("Create C++ scaffolding")) using (new Benchmark("Create C++ scaffolding"))
new CppScaffolding(appModel) new CppScaffolding(appModel)
.Write(testPath + $@"\test-cpp-result{nameSuffix}"); .Write(testPath + $@"\test-cpp-result{nameSuffix}");
compareTasks.Add(Task.Run(() => compareFiles(testPath, nameSuffix + ".h", $@"test-cpp-result{nameSuffix}\appdata\il2cpp-types.h")));
}); });
var pyTask = Task.Run(() => { var pyTask = Task.Run(() => {
@@ -172,21 +180,9 @@ namespace Il2CppInspector
}); });
await Task.WhenAll(csTask, jsonTask, cppTask, pyTask); await Task.WhenAll(csTask, jsonTask, cppTask, pyTask);
await Task.WhenAll(compareTasks);
})); }));
await Task.WhenAll(imageTasks); await Task.WhenAll(imageTasks);
// Compare test results with expected results
using (new Benchmark("Compare files")) {
var compareTasks = new List<Task>();
for (var i = 0; i < inspectors.Count; i++) {
var suffix = i++ > 0 ? "-" + (i - 1) : "";
compareTasks.Add(Task.Run(() => compareFiles(testPath, suffix + ".cs", $"test-result{suffix}.cs")));
compareTasks.Add(Task.Run(() => compareFiles(testPath, suffix + ".json", $"test-result{suffix}.json")));
compareTasks.Add(Task.Run(() => compareFiles(testPath, suffix + ".h", $@"test-cpp-result{suffix}\appdata\il2cpp-types.h")));
}
await Task.WhenAll(compareTasks);
}
} }
// We have to pass testPath rather than storing it as a field so that tests can be parallelized // We have to pass testPath rather than storing it as a field so that tests can be parallelized