Skip to content

Commit 1ae40c9

Browse files
tamasvajktamasvajk
committed
Change binlog test to have colliding generated file locations
1 parent b22f5f5 commit 1ae40c9

7 files changed

Lines changed: 59 additions & 5 deletions

File tree

‎csharp/ql/integration-tests/all-platforms/binlog/Files.expected‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
| Program.cs:0:0:0:0 | Program.cs |
1+
| a/A.cs:0:0:0:0 | a/A.cs |
2+
| a/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | a/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
3+
| a/obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | a/obj/Debug/net8.0/test.AssemblyInfo.cs |
4+
| a/obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | a/obj/Debug/net8.0/test.GlobalUsings.g.cs |
5+
| b/B.cs:0:0:0:0 | b/B.cs |
6+
| b/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | b/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
7+
| b/obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | b/obj/Debug/net8.0/test.AssemblyInfo.cs |
8+
| b/obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | b/obj/Debug/net8.0/test.GlobalUsings.g.cs |
29
| generated/test.csproj (net8.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs:0:0:0:0 | generated/test.csproj (net8.0)/System.Text.RegularExpressions.Generator/System.Text.RegularExpressions.Generator.RegexGenerator/RegexGenerator.g.cs |
3-
| obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs |
4-
| obj/Debug/net8.0/test.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net8.0/test.AssemblyInfo.cs |
5-
| obj/Debug/net8.0/test.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net8.0/test.GlobalUsings.g.cs |

csharp/ql/integration-tests/all-platforms/binlog/Program.cs renamed to csharp/ql/integration-tests/all-platforms/binlog/a/A.cs

File renamed without changes.

csharp/ql/integration-tests/all-platforms/binlog/test.csproj renamed to csharp/ql/integration-tests/all-platforms/binlog/a/test.csproj

File renamed without changes.

‎csharp/ql/integration-tests/all-platforms/binlog/b/B.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using System.Text.RegularExpressions;
2+
3+
var dummy = "dummy";
4+
5+
partial class Test
6+
{
7+
[GeneratedRegex("abc|def", RegexOptions.IgnoreCase, "en-US")]
8+
private static partial Regex AbcOrDefGeneratedRegex();
9+
}

‎csharp/ql/integration-tests/all-platforms/binlog/b/test.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
</Project>

‎csharp/ql/integration-tests/all-platforms/binlog/test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import subprocess
22
from create_database_utils import *
33

4-
subprocess.check_call(["dotnet", "build", "/bl:test.binlog"])
4+
subprocess.check_call(["dotnet", "build", "test.sln", "/bl:test.binlog"])
55
run_codeql_database_create([], lang="csharp", extra_args=["--build-mode=none", "-Obinlog=test.binlog"])

‎csharp/ql/integration-tests/all-platforms/binlog/test.sln‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.002.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "a", "a\test.csproj", "{B130424A-95E8-4D13-B996-7284832892B2}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "b", "b\test.csproj", "{DCD99DF2-8FA0-4E4B-A18E-C4AA9DF27DEA}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{B130424A-95E8-4D13-B996-7284832892B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{B130424A-95E8-4D13-B996-7284832892B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{B130424A-95E8-4D13-B996-7284832892B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{B130424A-95E8-4D13-B996-7284832892B2}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{DCD99DF2-8FA0-4E4B-A18E-C4AA9DF27DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{DCD99DF2-8FA0-4E4B-A18E-C4AA9DF27DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{DCD99DF2-8FA0-4E4B-A18E-C4AA9DF27DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{DCD99DF2-8FA0-4E4B-A18E-C4AA9DF27DEA}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {0A7E95FD-097D-4B6D-916F-0D0176AD1265}
30+
EndGlobalSection
31+
EndGlobal

0 commit comments

Comments
 (0)