Commit b1c3915
authored
File tree
- csharp
- ql/integration-tests/posix-only/dotnet_test
- tools
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,6 @@ | |||
| 3 | 3 | <PropertyGroup> | |
| 4 | 4 | <TargetFramework>net7.0</TargetFramework> | |
| 5 | 5 | <Nullable>enable</Nullable> | |
| 6 | - | ||
| 7 | 6 | <IsPackable>false</IsPackable> | |
| 8 | 7 | </PropertyGroup> | |
| 9 | 8 | ||
@@ -14,4 +13,9 @@ | |||
| 14 | 13 | <PackageReference Include="coverlet.collector" Version="3.2.0" /> | |
| 15 | 14 | </ItemGroup> | |
| 16 | 15 | ||
| 16 | + <Target Name="DeleteBinObjFolders" BeforeTargets="Clean"> | ||
| 17 | + <RemoveDir Directories=".\bin" /> | ||
| 18 | + <RemoveDir Directories=".\obj" /> | ||
| 19 | + <RemoveDir Directories=".\myout" /> | ||
| 20 | + </Target> | ||
| 17 | 21 | </Project> | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,3 +8,8 @@ | |||
| 8 | 8 | # Explicitly build and then run tests. | |
| 9 | 9 | run_codeql_database_create(['dotnet clean', 'rm -rf test-db', 'dotnet build -o myout', 'dotnet test myout/dotnet_test.dll'], test_db="test2-db", lang="csharp") | |
| 10 | 10 | check_diagnostics(test_db="test2-db") | |
| 11 | + | ||
| 12 | + thisDir = os.path.abspath(os.getcwd()) | ||
| 13 | + # Explicit build and then run tests using the absolute path. | ||
| 14 | + run_codeql_database_create(['dotnet clean', 'rm -rf test2-db', 'dotnet build -o myout', f'dotnet test {thisDir}/myout/dotnet_test.dll'], test_db="test3-db", lang="csharp") | ||
| 15 | + check_diagnostics(test_db="test3-db") | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -80,16 +80,15 @@ function RegisterExtractorPack(id) | |||
| 80 | 80 | end | |
| 81 | 81 | end | |
| 82 | 82 | ||
| 83 | - -- for `dotnet test`, we should not append `-p:UseSharedCompilation=false` to the command line | ||
| 84 | - -- if an `exe` or `dll` is passed as an argument as the call is forwarded to vstest. | ||
| 85 | - if testMatch and (arg:match('%.exe$') or arg:match('%.dll')) then | ||
| 86 | - match = false | ||
| 87 | - break | ||
| 88 | - end | ||
| 89 | - | ||
| 90 | 83 | -- we have found a sub-command, ignore all strings that look like sub-command names from now on | |
| 91 | 84 | inSubCommandPosition = false | |
| 92 | 85 | end | |
| 86 | + -- for `dotnet test`, we should not append `-p:UseSharedCompilation=false` to the command line | ||
| 87 | + -- if an `exe` or `dll` is passed as an argument as the call is forwarded to vstest. | ||
| 88 | + if testMatch and (arg:match('%.exe$') or arg:match('%.dll')) then | ||
| 89 | + match = false | ||
| 90 | + break | ||
| 91 | + end | ||
| 93 | 92 | -- if we see a separator to `dotnet run`, inject just prior to the existing separator | |
| 94 | 93 | if arg == '--' then | |
| 95 | 94 | dotnetRunNeedsSeparator = false | |
0 commit comments