Skip to content

Commit 016d200

Browse files
committed
Fix unit tests
1 parent ad394a0 commit 016d200

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -936,9 +936,9 @@ public void TestDotnetVersionNotInstalled()
936936
{
937937
actions.RunProcess["dotnet --list-sdks"] = 0;
938938
actions.RunProcessOut["dotnet --list-sdks"] = "2.1.2 [C:\\Program Files\\dotnet\\sdks]\n2.1.4 [C:\\Program Files\\dotnet\\sdks]";
939-
actions.RunProcess[@"chmod u+x dotnet-install.sh"] = 0;
940-
actions.RunProcess[@"./dotnet-install.sh --channel release --version 2.1.3 --install-dir scratch/.dotnet"] = 0;
941-
actions.RunProcess[@"rm dotnet-install.sh"] = 0;
939+
actions.RunProcess[@"chmod u+x scratch/.dotnet/dotnet-install.sh"] = 0;
940+
actions.RunProcess[@"scratch/.dotnet/dotnet-install.sh --channel release --version 2.1.3 --install-dir scratch/.dotnet"] = 0;
941+
actions.RunProcess[@"rm scratch/.dotnet/dotnet-install.sh"] = 0;
942942
actions.RunProcess[@"scratch/.dotnet/dotnet --info"] = 0;
943943
actions.RunProcess[@"scratch/.dotnet/dotnet clean C:\Project/test.csproj"] = 0;
944944
actions.RunProcess[@"scratch/.dotnet/dotnet restore C:\Project/test.csproj"] = 0;
@@ -960,7 +960,8 @@ public void TestDotnetVersionNotInstalled()
960960
961961
</Project>");
962962
actions.LoadXml[@"C:\Project/test.csproj"] = xml;
963-
actions.DownloadFiles.Add(("https://dot.net/v1/dotnet-install.sh", "dotnet-install.sh"));
963+
actions.DownloadFiles.Add(("https://dot.net/v1/dotnet-install.sh", "scratch/.dotnet/dotnet-install.sh"));
964+
actions.CreateDirectories.Add(@"scratch/.dotnet");
964965

965966
var autobuilder = CreateAutoBuilder(false, dotnetVersion: "2.1.3");
966967
TestAutobuilderScript(autobuilder, 0, 8);
@@ -972,9 +973,9 @@ public void TestDotnetVersionAlreadyInstalled()
972973
actions.RunProcess["dotnet --list-sdks"] = 0;
973974
actions.RunProcessOut["dotnet --list-sdks"] = @"2.1.3 [C:\Program Files\dotnet\sdks]
974975
2.1.4 [C:\Program Files\dotnet\sdks]";
975-
actions.RunProcess[@"chmod u+x dotnet-install.sh"] = 0;
976-
actions.RunProcess[@"./dotnet-install.sh --channel release --version 2.1.3 --install-dir scratch/.dotnet"] = 0;
977-
actions.RunProcess[@"rm dotnet-install.sh"] = 0;
976+
actions.RunProcess[@"chmod u+x scratch/.dotnet/dotnet-install.sh"] = 0;
977+
actions.RunProcess[@"scratch/.dotnet/dotnet-install.sh --channel release --version 2.1.3 --install-dir scratch/.dotnet"] = 0;
978+
actions.RunProcess[@"rm scratch/.dotnet/dotnet-install.sh"] = 0;
978979
actions.RunProcess[@"scratch/.dotnet/dotnet --info"] = 0;
979980
actions.RunProcess[@"scratch/.dotnet/dotnet clean C:\Project/test.csproj"] = 0;
980981
actions.RunProcess[@"scratch/.dotnet/dotnet restore C:\Project/test.csproj"] = 0;
@@ -996,7 +997,8 @@ public void TestDotnetVersionAlreadyInstalled()
996997
997998
</Project>");
998999
actions.LoadXml[@"C:\Project/test.csproj"] = xml;
999-
actions.DownloadFiles.Add(("https://dot.net/v1/dotnet-install.sh", "dotnet-install.sh"));
1000+
actions.DownloadFiles.Add(("https://dot.net/v1/dotnet-install.sh", "scratch/.dotnet/dotnet-install.sh"));
1001+
actions.CreateDirectories.Add(@"scratch/.dotnet");
10001002

10011003
var autobuilder = CreateAutoBuilder(false, dotnetVersion: "2.1.3");
10021004
TestAutobuilderScript(autobuilder, 0, 8);

0 commit comments

Comments
 (0)