tst: winfsp-tests: add --ntfs option

This commit is contained in:
Bill Zissimopoulos 2016-10-25 14:03:26 -07:00
parent 8abadf94f3
commit 66d5fe98df
2 changed files with 14 additions and 4 deletions

View File

@ -11,7 +11,6 @@ void *memfs_start_ex(ULONG Flags, ULONG FileInfoTimeout)
{ {
if (-1 == Flags) if (-1 == Flags)
{ {
AddNetShareIfNeeded();
memfs_running = 1; memfs_running = 1;
return 0; return 0;
} }
@ -39,7 +38,6 @@ void *memfs_start_ex(ULONG Flags, ULONG FileInfoTimeout)
Result = MemfsStart(Memfs); Result = MemfsStart(Memfs);
ASSERT(NT_SUCCESS(Result)); ASSERT(NT_SUCCESS(Result));
AddNetShareIfNeeded();
memfs_running = 1; memfs_running = 1;
return Memfs; return Memfs;
@ -52,7 +50,6 @@ void *memfs_start(ULONG Flags)
void memfs_stop(void *data) void memfs_stop(void *data)
{ {
RemoveNetShareIfNeeded();
memfs_running = 0; memfs_running = 0;
if (0 == data) if (0 == data)

View File

@ -301,7 +301,14 @@ int main(int argc, char *argv[])
const char *a = argv[argi]; const char *a = argv[argi];
if ('-' == a[0]) if ('-' == a[0])
{ {
if (0 == strcmp("--case-insensitive", a)) if (0 == strcmp("--ntfs", a) || 0 == strcmp("--external", a))
{
NtfsTests = 1;
WinFspDiskTests = 0;
WinFspNetTests = 0;
rmarg(argv, argc, argi);
}
else if (0 == strcmp("--case-insensitive", a))
{ {
OptCaseInsensitive = TRUE; OptCaseInsensitive = TRUE;
rmarg(argv, argc, argi); rmarg(argv, argc, argi);
@ -341,6 +348,7 @@ int main(int argc, char *argv[])
OptSharePrefixLength = (ULONG) OptSharePrefixLength = (ULONG)
(sizeof OptShareComputer - 2 * sizeof(WCHAR) + (wcslen(OptShareName) * sizeof(WCHAR))); (sizeof OptShareComputer - 2 * sizeof(WCHAR) + (wcslen(OptShareName) * sizeof(WCHAR)));
WinFspDiskTests = 0;
WinFspNetTests = 0; WinFspNetTests = 0;
} }
} }
@ -356,8 +364,13 @@ int main(int argc, char *argv[])
} }
} }
if (!NtfsTests && OptShareName)
ABORT("option --share requires --ntfs/--external");
DisableBackupRestorePrivileges(); DisableBackupRestorePrivileges();
AddNetShareIfNeeded();
myrandseed = (unsigned)time(0); myrandseed = (unsigned)time(0);
tlib_run_tests(argc, argv); tlib_run_tests(argc, argv);