Skip to content

Commit

Permalink
Move expected path from "GVFS" to "VFS for Git"
Browse files Browse the repository at this point in the history
  • Loading branch information
derrickstolee committed Nov 1, 2021
1 parent 0c54e76 commit d6d98de
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions GVFS/GVFS.FunctionalTests/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ public static void Initialize()
Commitish = @"FunctionalTests/20201014";

EnlistmentRoot = @"C:\Repos\GVFSFunctionalTests\enlistment";
PathToGVFS = @"C:\Program Files\GVFS\GVFS.exe";
PathToGVFS = @"C:\Program Files\VFS for Git\GVFS.exe";
PathToGit = @"C:\Program Files\Git\cmd\git.exe";
PathToBash = @"C:\Program Files\Git\bin\bash.exe";

ControlGitRepoRoot = @"C:\Repos\GVFSFunctionalTests\ControlRepo";
FastFetchBaseRoot = @"C:\Repos\GVFSFunctionalTests\FastFetch";
FastFetchRoot = Path.Combine(FastFetchBaseRoot, "test");
FastFetchControl = Path.Combine(FastFetchBaseRoot, "control");
PathToGVFSService = @"C:\Program Files\GVFS\GVFS.Service.exe";
PathToGVFSService = @"C:\Program Files\VFS for Git\GVFS.Service.exe";
BinaryFileNameExtension = ".exe";
}
}
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Tools/ProjFSFilterInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class ProjFSFilterInstaller
private const string GVFSServiceName = "GVFS.Service";
private const string ProjFSServiceName = "prjflt";
private const string OptionalFeatureName = "Client-ProjFS";
private const string GVFSInstallPath = @"C:\Program Files\GVFS";
private const string GVFSInstallPath = @"C:\Program Files\VFS for Git";
private const string NativeProjFSLibInstallLocation = GVFSInstallPath + @"\ProjFS\ProjectedFSLib.dll";

private const string PrjfltInfName = "prjflt.inf";
Expand Down
2 changes: 1 addition & 1 deletion GVFS/GVFS.FunctionalTests/Windows/Tests/ServiceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace GVFS.FunctionalTests.Windows.Tests
[Category(Categories.ExtraCoverage)]
public class ServiceTests : TestsWithEnlistmentPerFixture
{
private const string NativeLibPath = @"C:\Program Files\GVFS\ProjectedFSLib.dll";
private const string NativeLibPath = @"C:\Program Files\VFS for Git\ProjectedFSLib.dll";
private const string PrjFltAutoLoggerKey = "SYSTEM\\CurrentControlSet\\Control\\WMI\\Autologger\\Microsoft-Windows-ProjFS-Filter-Log";
private const string PrjFltAutoLoggerStartValue = "Start";

Expand Down
8 changes: 4 additions & 4 deletions GVFS/GVFS.Installers/info.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ SETLOCAL

SET SYS_PRJFLT=C:\Windows\System32\drivers\prjflt.sys
SET SYS_PROJFSLIB=C:\Windows\System32\ProjectedFSLib.dll
SET VFS_PROJFSLIB=C:\Program Files\GVFS\ProjectedFSLib.dll
SET VFS_BUND_PRJFLT=C:\Program Files\GVFS\Filter\PrjFlt.sys
SET VFS_BUND_PROJFSLIB=C:\Program Files\GVFS\ProjFS\ProjectedFSLib.dll
SET VFS_EXEC=C:\Program Files\GVFS\GVFS.exe
SET VFS_PROJFSLIB=C:\Program Files\VFS for Git\ProjectedFSLib.dll
SET VFS_BUND_PRJFLT=C:\Program Files\VFS for Git\Filter\PrjFlt.sys
SET VFS_BUND_PROJFSLIB=C:\Program Files\VFS for Git\ProjFS\ProjectedFSLib.dll
SET VFS_EXEC=C:\Program Files\VFS for Git\GVFS.exe
SET GIT_EXEC=C:\Program Files\Git\cmd\git.exe

ECHO Checking ProjFS Windows feature...
Expand Down

0 comments on commit d6d98de

Please sign in to comment.