icsharpcode/ILSpy
1
0
Fork 0
mirror of https://github.com/icsharpcode/ILSpy.git synced 2026-10-12 02:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add TestsAssemblyOutput, keep existing behavior of output assembly locations

Browse Source
This commit is contained in:
Christoph Wille
2024-07-11 15:31:08 +02:00
parent 7e1523111a
commit c940cbc1d9
6 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
+4 -4
View File
@@ -408,13 +408,13 @@ namespace ICSharpCode.Decompiler.Tests
if ((options & CompilerOptions.UseRoslynMask) != 0 && (options & CompilerOptions.TargetNet40) == 0)
options |= CompilerOptions.UseTestRunner;
string testFileName = testName + ".cs";
string testOutputFileName = testName + Tester.GetSuffix(options) + ".exe";
string testOutputFileName = TestsAssemblyOutput.GetFilePath(TestCasePath, testName, Tester.GetSuffix(options) + ".exe");
CompilerResults outputFile = null, decompiledOutputFile = null;
try
{
outputFile = await Tester.CompileCSharp(Path.Combine(TestCasePath, testFileName), options,
outputFileName: Path.Combine(TestCasePath, testOutputFileName)).ConfigureAwait(false);
outputFileName: testOutputFileName).ConfigureAwait(false);
string decompiledCodeFile = await Tester.DecompileCSharp(outputFile.PathToAssembly, Tester.GetSettings(options)).ConfigureAwait(false);
if ((options & CompilerOptions.UseMcsMask) != 0)
{
@@ -452,13 +452,13 @@ namespace ICSharpCode.Decompiler.Tests
if ((options & CompilerOptions.UseRoslynMask) != 0)
options |= CompilerOptions.UseTestRunner;
string testFileName = testName + ".vb";
string testOutputFileName = testName + Tester.GetSuffix(options) + ".exe";
string testOutputFileName = TestsAssemblyOutput.GetFilePath(TestCasePath, testName, Tester.GetSuffix(options) + ".exe");
CompilerResults outputFile = null, decompiledOutputFile = null;
try
{
outputFile = await Tester.CompileVB(Path.Combine(TestCasePath, testFileName), options,
outputFileName: Path.Combine(TestCasePath, testOutputFileName)).ConfigureAwait(false);
outputFileName: testOutputFileName).ConfigureAwait(false);
string decompiledCodeFile = await Tester.DecompileCSharp(outputFile.PathToAssembly, Tester.GetSettings(options)).ConfigureAwait(false);
decompiledOutputFile = await Tester.CompileCSharp(decompiledCodeFile, options).ConfigureAwait(false);
ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
+1 -1
View File
@@ -886,7 +886,7 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
get {
if (pathToAssembly == null)
{
pathToAssembly = Path.GetTempFileName();
pathToAssembly = TestsAssemblyOutput.GetTempFileName();
tempFiles.Add(pathToAssembly);
}
return pathToAssembly;
ICSharpCode.Decompiler.Tests/Helpers/TestsAssemblyOutput.cs
+40
View File
@@ -0,0 +1,40 @@
// Copyright (c) 2024 Christoph Wille
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.IO;
namespace ICSharpCode.Decompiler.Tests.Helpers
{
/// <summary>
/// Centralizes all file-path generation for compilation output (assemblies)
/// Here a redirect can be added to a different location for the output (ie a directory that is excluded from virus scanning)
/// </summary>
internal static class TestsAssemblyOutput
{
public static string GetFilePath(string testCasePath, string testName, string computedExtension)
{
return Path.Combine(testCasePath, testName) + computedExtension;
}
public static string GetTempFileName()
{
return Path.GetTempFileName();
}
}
}
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
+1
View File
@@ -121,6 +121,7 @@
<ItemGroup>
<Compile Include="DisassemblerPrettyTestRunner.cs" />
<Compile Include="Helpers\RoslynToolset.cs" />
<Compile Include="Helpers\TestsAssemblyOutput.cs" />
<Compile Include="Output\InsertParenthesesVisitorTests.cs" />
<Compile Include="ProjectDecompiler\TargetFrameworkTests.cs" />
<Compile Include="TestAssemblyResolver.cs" />
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
+1 -1
View File
@@ -714,7 +714,7 @@ namespace ICSharpCode.Decompiler.Tests
async Task Run([CallerMemberName] string testName = null, AssemblerOptions asmOptions = AssemblerOptions.None, CompilerOptions cscOptions = CompilerOptions.None, DecompilerSettings decompilerSettings = null)
{
var csFile = Path.Combine(TestCasePath, testName + ".cs");
var exeFile = Path.Combine(TestCasePath, testName) + Tester.GetSuffix(cscOptions) + ".exe";
var exeFile = TestsAssemblyOutput.GetFilePath(TestCasePath, testName, Tester.GetSuffix(cscOptions) + ".exe");
if (cscOptions.HasFlag(CompilerOptions.Library))
{
exeFile = Path.ChangeExtension(exeFile, ".dll");
ICSharpCode.Decompiler.Tests/VBPrettyTestRunner.cs
+1 -1
View File
@@ -147,7 +147,7 @@ namespace ICSharpCode.Decompiler.Tests
{
var vbFile = Path.Combine(TestCasePath, testName + ".vb");
var csFile = Path.Combine(TestCasePath, testName + ".cs");
var exeFile = Path.Combine(TestCasePath, testName) + Tester.GetSuffix(options) + ".exe";
var exeFile = TestsAssemblyOutput.GetFilePath(TestCasePath, testName, Tester.GetSuffix(options) + ".exe");
if (options.HasFlag(CompilerOptions.Library))
{
exeFile = Path.ChangeExtension(exeFile, ".dll");