Skip to content

Commit e80c0e7

Browse files
kekyokekyo
committed
Removed Test.Common project file.
1 parent d5f3bd5 commit e80c0e7

File tree

8 files changed

+62
-84
lines changed

8 files changed

+62
-84
lines changed

‎il2c.sln

-7
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core.Test.BasicTypes",
5050
{2CBC90EC-5581-452F-8231-086E4553D20E} = {2CBC90EC-5581-452F-8231-086E4553D20E}
5151
EndProjectSection
5252
EndProject
53-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core.Test.Common", "tests\IL2C.Core.Test.Common\IL2C.Core.Test.Common.csproj", "{6811E378-50B3-4206-BB48-1E56A2F2D90E}"
54-
EndProject
5553
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2C.Core.Test.ILConverters", "tests\IL2C.Core.Test.ILConverters\IL2C.Core.Test.ILConverters.csproj", "{DC306000-300C-4E65-826C-2E41C6445CA9}"
5654
ProjectSection(ProjectDependencies) = postProject
5755
{BB7FA204-433A-416B-B9D0-9A79DF874284} = {BB7FA204-433A-416B-B9D0-9A79DF874284}
@@ -146,10 +144,6 @@ Global
146144
{A6072CD1-A526-45F2-BB88-D1040AC3A7E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
147145
{A6072CD1-A526-45F2-BB88-D1040AC3A7E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
148146
{A6072CD1-A526-45F2-BB88-D1040AC3A7E8}.Release|Any CPU.Build.0 = Release|Any CPU
149-
{6811E378-50B3-4206-BB48-1E56A2F2D90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150-
{6811E378-50B3-4206-BB48-1E56A2F2D90E}.Debug|Any CPU.Build.0 = Debug|Any CPU
151-
{6811E378-50B3-4206-BB48-1E56A2F2D90E}.Release|Any CPU.ActiveCfg = Release|Any CPU
152-
{6811E378-50B3-4206-BB48-1E56A2F2D90E}.Release|Any CPU.Build.0 = Release|Any CPU
153147
{DC306000-300C-4E65-826C-2E41C6445CA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
154148
{DC306000-300C-4E65-826C-2E41C6445CA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
155149
{DC306000-300C-4E65-826C-2E41C6445CA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -192,7 +186,6 @@ Global
192186
EndGlobalSection
193187
GlobalSection(NestedProjects) = preSolution
194188
{A6072CD1-A526-45F2-BB88-D1040AC3A7E8} = {5710A57F-57F8-4D50-8C78-82E2DFDCB613}
195-
{6811E378-50B3-4206-BB48-1E56A2F2D90E} = {5710A57F-57F8-4D50-8C78-82E2DFDCB613}
196189
{DC306000-300C-4E65-826C-2E41C6445CA9} = {5710A57F-57F8-4D50-8C78-82E2DFDCB613}
197190
{E397A251-4373-4A8E-AA13-3891282DEDC7} = {5710A57F-57F8-4D50-8C78-82E2DFDCB613}
198191
{C26C4683-9840-4307-8774-F1F952E3591B} = {D105E6CD-626A-4C04-8AF6-0AA34A4E9CF4}

‎tests/IL2C.Core.Test.BasicTypes/IL2C.Core.Test.BasicTypes.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<OutputType>Library</OutputType>
1818
<Optimize>False</Optimize>
1919
<Nullable>enable</Nullable>
20+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2021
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
2122

2223
<AssemblyName>IL2C.Core.Test.BasicTypes</AssemblyName>
@@ -38,10 +39,12 @@
3839

3940
<ItemGroup>
4041
<ProjectReference Include="..\..\src\IL2C.Interop\IL2C.Interop.csproj" />
42+
<ProjectReference Include="..\..\src\IL2C.Core\IL2C.Core.csproj" />
4143
</ItemGroup>
4244

4345
<ItemGroup>
4446
<Compile Include="..\IL2C.Core.Test.Common\*.cs" />
47+
<EmbeddedResource Include="..\IL2C.Core.Test.Common\Templates\*" LinkBase="Templates" />
4548
</ItemGroup>
4649

4750
<!-- ====================================================== -->

‎tests/IL2C.Core.Test.Common/IL2C.Core.Test.Common.csproj

-19
This file was deleted.

‎tests/IL2C.Core.Test.Common/Templates/TestMain.cs

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
////////////////////////////////////////////////////////////////////////////
2+
//
3+
// IL2C - A translator for ECMA-335 CIL/MSIL to C language.
4+
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
5+
//
6+
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
7+
//
8+
////////////////////////////////////////////////////////////////////////////
9+
10+
using System;
11+
12+
namespace IL2C.Tests
13+
{
14+
public static class TestMain
15+
{
16+
public static int Main()
17+
{
18+
try
19+
{
20+
#if {mainIsVoid}
21+
////////////////////////
22+
// Execute target function.
23+
24+
{mainSymbol}();
25+
#else
26+
////////////////////////
27+
// Execute target function.
28+
29+
var actual = {mainSymbol}();
30+
31+
////////////////////////
32+
// Check result.
33+
34+
if (actual != {expected})
35+
{
36+
Console.WriteLine(actual?.ToString());
37+
return 1;
38+
}
39+
#endif
40+
}
41+
catch (Exception ex)
42+
{
43+
Console.WriteLine(ex.ToString());
44+
return 2;
45+
}
46+
47+
return 0;
48+
}
49+
}
50+
}

‎tests/IL2C.Core.Test.Common/TestCaseAttribute.cs

+4-57
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ public RunOnOSs RunOnOSs
159159
this.runOnOSs = value;
160160

161161
var ignores = new List<string>();
162-
if (Utilities.IsRunningOnWindows &&
162+
if (TestUtilities.IsRunningOnWindows &&
163163
!value.HasFlag(RunOnOSs.Windows))
164164
{
165165
ignores.Add("NotWindows");
166166
}
167-
if (!Utilities.IsRunningOnWindows &&
167+
if (!TestUtilities.IsRunningOnWindows &&
168168
!value.HasFlag(RunOnOSs.Posix))
169169
{
170170
ignores.Add("NotPosix");
@@ -195,12 +195,12 @@ public RunOnPlatforms RunOnPlatforms
195195
this.runOnPlatforms = value;
196196

197197
var ignores = new List<string>();
198-
if (!Utilities.IsRunningOnMono &&
198+
if (!TestUtilities.IsRunningOnMono &&
199199
!value.HasFlag(RunOnPlatforms.DotNet))
200200
{
201201
ignores.Add("NotDotNet");
202202
}
203-
if (Utilities.IsRunningOnMono &&
203+
if (TestUtilities.IsRunningOnMono &&
204204
!value.HasFlag(RunOnPlatforms.Mono))
205205
{
206206
ignores.Add("NotMono");
@@ -237,58 +237,5 @@ public void AfterTest(ITest test)
237237
{
238238
// TODO: delegates to test native code.
239239
}
240-
241-
#if false
242-
private static object?[] ConvertToArgumentsType(object?[] args, Type[] argumentTypes) =>
243-
args.Zip(argumentTypes, ConvertToArgumentType).ToArray();
244-
245-
private static object? ConvertToArgumentType(object? value, Type argumentType)
246-
{
247-
// This is helper function that convert between raw value type and argument type.
248-
// Because .NET attribute can't have complex type arguments.
249-
if (value == null)
250-
{
251-
return null;
252-
}
253-
else if (value.GetType() == argumentType)
254-
{
255-
return value;
256-
}
257-
else if (argumentType == typeof(IntPtr))
258-
{
259-
if (value is int)
260-
{
261-
return new IntPtr((int)value);
262-
}
263-
else if (value is long)
264-
{
265-
return new IntPtr((long)value);
266-
}
267-
else
268-
{
269-
throw new InvalidCastException();
270-
}
271-
}
272-
else if (argumentType == typeof(UIntPtr))
273-
{
274-
if (value is uint)
275-
{
276-
return new UIntPtr((uint)value);
277-
}
278-
else if (value is ulong)
279-
{
280-
return new UIntPtr((ulong)value);
281-
}
282-
else
283-
{
284-
throw new InvalidCastException();
285-
}
286-
}
287-
else
288-
{
289-
return Convert.ChangeType(value, argumentType);
290-
}
291-
}
292-
#endif
293240
}
294241
}

‎tests/IL2C.Core.Test.Common/Utilities.cs ‎tests/IL2C.Core.Test.Common/TestUtilities.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace IL2C
1616
{
1717
[IgnoreTranslation]
18-
public static class Utilities
18+
public static class TestUtilities
1919
{
2020
public static readonly bool IsRunningOnWindows =
2121
Environment.OSVersion.Platform == PlatformID.Win32NT;

‎tests/IL2C.Core.Test.ILConverters/IL2C.Core.Test.ILConverters.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<OutputType>Library</OutputType>
1818
<Optimize>False</Optimize>
1919
<Nullable>enable</Nullable>
20+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2021
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
2122

2223
<AssemblyName>IL2C.Core.Test.ILConverters</AssemblyName>
@@ -38,6 +39,7 @@
3839

3940
<ItemGroup>
4041
<ProjectReference Include="..\..\src\IL2C.Interop\IL2C.Interop.csproj" />
42+
<ProjectReference Include="..\..\src\IL2C.Core\IL2C.Core.csproj" />
4143
</ItemGroup>
4244

4345
<ItemGroup>

‎tests/IL2C.Core.Test.RuntimeSystems/IL2C.Core.Test.RuntimeSystems.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<OutputType>Library</OutputType>
1818
<Optimize>False</Optimize>
1919
<Nullable>enable</Nullable>
20+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
2021
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
2122

2223
<AssemblyName>IL2C.Core.Test.RuntimeSystems</AssemblyName>
@@ -38,6 +39,7 @@
3839

3940
<ItemGroup>
4041
<ProjectReference Include="..\..\src\IL2C.Interop\IL2C.Interop.csproj" />
42+
<ProjectReference Include="..\..\src\IL2C.Core\IL2C.Core.csproj" />
4143
</ItemGroup>
4244

4345
<ItemGroup>

0 commit comments

Comments
 (0)