Update TestRunner and update-expected-results.ps1

This commit is contained in:
Katy Coe
2020-08-02 22:19:31 +02:00
parent 8926af341f
commit 19a5b3735b
2 changed files with 22 additions and 6 deletions

View File

@@ -54,6 +54,9 @@ namespace Il2CppInspector
MustCompile = true MustCompile = true
}.WriteSingleFile(testPath + $@"\test-result{nameSuffix}.cs"); }.WriteSingleFile(testPath + $@"\test-result{nameSuffix}.cs");
new JSONMetadata(appModel)
.Write(testPath + $@"\test-result{nameSuffix}.json");
new IDAPythonScript(appModel) new IDAPythonScript(appModel)
.WriteScriptToFile(testPath + $@"\test-ida-result{nameSuffix}.py", .WriteScriptToFile(testPath + $@"\test-ida-result{nameSuffix}.py",
testPath + $@"\test-cpp-result{nameSuffix}\appdata\il2cpp-types.h"); testPath + $@"\test-cpp-result{nameSuffix}\appdata\il2cpp-types.h");
@@ -67,6 +70,7 @@ namespace Il2CppInspector
var suffix = (i > 0 ? "-" + i : ""); var suffix = (i > 0 ? "-" + i : "");
compareFiles(testPath, suffix + ".cs", $"test-result{suffix}.cs"); compareFiles(testPath, suffix + ".cs", $"test-result{suffix}.cs");
compareFiles(testPath, suffix + ".json", $"test-result{suffix}.json");
compareFiles(testPath, suffix + ".h", $@"test-cpp-result{suffix}\appdata\il2cpp-types.h"); compareFiles(testPath, suffix + ".h", $@"test-cpp-result{suffix}\appdata\il2cpp-types.h");
compareFiles(testPath, suffix + ".py", $"test-ida-result{suffix}.py"); compareFiles(testPath, suffix + ".py", $"test-ida-result{suffix}.py");
} }

View File

@@ -6,8 +6,10 @@
# It is only intended to be used during development, not for end-user scenarios # It is only intended to be used during development, not for end-user scenarios
# Get all test results # Get all test results
$bin = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-result.cs) $cs = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-result.cs)
$bin2 = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-result-1.cs) $cs2 = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-result-1.cs)
$json = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-result.json)
$json2 = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-result-1.json)
$py = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-ida-result.py) $py = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-ida-result.py)
$py2 = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-ida-result-1.py) $py2 = (gci "$PSScriptRoot/TestBinaries/*/*" -Filter test-ida-result-1.py)
$cpp = (gci "$PSScriptRoot/TestBinaries/*/test-cpp-result/appdata/*" -Filter il2cpp-types.h) $cpp = (gci "$PSScriptRoot/TestBinaries/*/test-cpp-result/appdata/*" -Filter il2cpp-types.h)
@@ -16,16 +18,26 @@ $cpp2 = (gci "$PSScriptRoot/TestBinaries/*/test-cpp-result-1/appdata/*" -Filter
# Get path to expected test results # Get path to expected test results
$results = "$PSScriptRoot/TestExpectedResults" $results = "$PSScriptRoot/TestExpectedResults"
$bin | % { $cs | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + ".cs" $target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + ".cs"
cp $_ -Destination $target -Force cp $_ -Destination $target -Force
} }
$bin2 | % { $cs2 | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + "-1.cs" $target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + "-1.cs"
cp $_ -Destination $target -Force cp $_ -Destination $target -Force
} }
$json | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + ".json"
cp $_ -Destination $target -Force
}
$json2 | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + "-1.json"
cp $_ -Destination $target -Force
}
$py | % { $py | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + ".py" $target = $results + "/" + (Split-Path -Path (Split-Path -Path $_) -Leaf) + ".py"
cp $_ -Destination $target -Force cp $_ -Destination $target -Force
@@ -37,11 +49,11 @@ $py2 | % {
} }
$cpp | % { $cpp | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path (Split-Path -Path $_)) -Leaf) + ".h" $target = $results + "/" + (Split-Path -Path (Split-Path -Path (Split-Path -Path (Split-Path -Path $_))) -Leaf) + ".h"
cp $_ -Destination $target -Force cp $_ -Destination $target -Force
} }
$cpp2 | % { $cpp2 | % {
$target = $results + "/" + (Split-Path -Path (Split-Path -Path (Split-Path -Path $_)) -Leaf) + "-1.h" $target = $results + "/" + (Split-Path -Path (Split-Path -Path (Split-Path -Path (Split-Path -Path $_))) -Leaf) + "-1.h"
cp $_ -Destination $target -Force cp $_ -Destination $target -Force
} }