mirror of
				https://github.com/winfsp/winfsp.git
				synced 2025-10-30 19:48:38 -05:00 
			
		
		
		
	Merge branch 'master' into pvt-sxs
This commit is contained in:
		| @@ -32,6 +32,7 @@ | ||||
| int NtfsTests = 0; | ||||
| int WinFspDiskTests = 1; | ||||
| int WinFspNetTests = 1; | ||||
| int RunningInContainer = 0; | ||||
|  | ||||
| BOOLEAN OptExternal = FALSE; | ||||
| BOOLEAN OptFuseExternal = FALSE; | ||||
| @@ -259,6 +260,12 @@ int main(int argc, char *argv[]) | ||||
|     if (0 == getenv("WINFSP_TESTS_EXCEPTION_FILTER_DISABLE")) | ||||
|         SetUnhandledExceptionFilter(UnhandledExceptionHandler); | ||||
|  | ||||
|     RunningInContainer = ERROR_SUCCESS == RegGetValueW( | ||||
|         HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control", | ||||
|         L"ContainerType", | ||||
|         RRF_RT_REG_DWORD, 0, | ||||
|         0, 0); | ||||
|  | ||||
|     for (int argi = 1; argc > argi; argi++) | ||||
|     { | ||||
|         const char *a = argv[argi]; | ||||
| @@ -267,6 +274,7 @@ int main(int argc, char *argv[]) | ||||
|             if (0 == strcmp("--ntfs", a) || 0 == strcmp("--external", a)) | ||||
|             { | ||||
|                 OptExternal = TRUE; | ||||
|                 OptFuseExternal = FALSE; | ||||
|                 NtfsTests = 1; | ||||
|                 WinFspDiskTests = 0; | ||||
|                 WinFspNetTests = 0; | ||||
| @@ -405,6 +413,10 @@ int main(int argc, char *argv[]) | ||||
|     if (!NtfsTests && OptShareName) | ||||
|         ABORT("option --share requires --ntfs/--external"); | ||||
|  | ||||
|     if (RunningInContainer) | ||||
|         /* container: disable network file system tests */ | ||||
|         WinFspNetTests = 0; | ||||
|  | ||||
|     DisableBackupRestorePrivileges(); | ||||
|  | ||||
|     AddNetShareIfNeeded(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user