https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a437ac528539287aa73ba...
commit 8a437ac528539287aa73ba60a4bcb3c2edf168f2 Author: Timo Kreuzer timo.kreuzer@reactos.org AuthorDate: Fri Jul 2 18:12:24 2021 +0200 Commit: Timo Kreuzer timo.kreuzer@reactos.org CommitDate: Sat Jul 10 18:41:12 2021 +0200
[ROSTESTS] Skip some test on x64 --- modules/rostests/apitests/localspl/service.c | 8 ++++++++ modules/rostests/apitests/localspl/tests.c | 24 +++++++++++++++++++++++ modules/rostests/apitests/ntdll/NtSetValueKey.c | 8 ++++++++ modules/rostests/kmtests/ntos_ex/ExFastMutex.c | 8 ++++++++ modules/rostests/kmtests/ntos_po/PoIrp_user.c | 8 ++++++++ modules/rostests/winetests/kernel32/pipe.c | 8 ++++++++ modules/rostests/winetests/kernel32/process.c | 26 ++++++++++++++++++++++--- modules/rostests/winetests/kernel32/sync.c | 8 ++++++++ modules/rostests/winetests/kernel32/virtual.c | 8 ++++++++ 9 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/modules/rostests/apitests/localspl/service.c b/modules/rostests/apitests/localspl/service.c index 54ccaad287d..3a114d4c5cc 100644 --- a/modules/rostests/apitests/localspl/service.c +++ b/modules/rostests/apitests/localspl/service.c @@ -162,6 +162,14 @@ START_TEST(service) int argc; char** argv;
+#if defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-366: Skipping localspl_apitest:service because it hangs on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + SERVICE_TABLE_ENTRYW ServiceTable[] = { { SERVICE_NAME, _ServiceMain }, diff --git a/modules/rostests/apitests/localspl/tests.c b/modules/rostests/apitests/localspl/tests.c index c992bcce20b..9d36edbb4ed 100644 --- a/modules/rostests/apitests/localspl/tests.c +++ b/modules/rostests/apitests/localspl/tests.c @@ -210,15 +210,39 @@ Cleanup:
START_TEST(fpEnumPrinters) { +#if defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-366: Skipping localspl_apitest:fpEnumPrinters because it hangs on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + _RunRemoteTest("fpEnumPrinters"); }
START_TEST(fpGetPrintProcessorDirectory) { +#if defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-366: Skipping localspl_apitest:fpGetPrintProcessorDirectory because it hangs on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + _RunRemoteTest("fpGetPrintProcessorDirectory"); }
START_TEST(fpSetJob) { +#if defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-366: Skipping localspl_apitest:fpSetJob because it hangs on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + _RunRemoteTest("fpSetJob"); } diff --git a/modules/rostests/apitests/ntdll/NtSetValueKey.c b/modules/rostests/apitests/ntdll/NtSetValueKey.c index fc4d29181d2..6c56a5024de 100644 --- a/modules/rostests/apitests/ntdll/NtSetValueKey.c +++ b/modules/rostests/apitests/ntdll/NtSetValueKey.c @@ -64,6 +64,14 @@ START_TEST(NtSetValueKey) }; ULONG i;
+#if defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-365: Skipping ntdll_apitest:NtSetValueKey because it hangs on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + Status = RtlOpenCurrentUser(READ_CONTROL, &ParentKeyHandle); ok(Status == STATUS_SUCCESS, "RtlOpenCurrentUser returned %lx\n", Status); if (!NT_SUCCESS(Status)) diff --git a/modules/rostests/kmtests/ntos_ex/ExFastMutex.c b/modules/rostests/kmtests/ntos_ex/ExFastMutex.c index 04de7a9a16f..76eaa71f10c 100644 --- a/modules/rostests/kmtests/ntos_ex/ExFastMutex.c +++ b/modules/rostests/kmtests/ntos_ex/ExFastMutex.c @@ -310,6 +310,14 @@ TestFastMutexConcurrent(
START_TEST(ExFastMutex) { +#if defined(_M_AMD64) + if (TRUE) + { + skip(FALSE, "ROSTESTS-367: Skipping kmtest:ExFastMutex because it hangs on Windows Server 2003 x64-Testbot.\n"); + return; + } +#endif + FAST_MUTEX Mutex; KIRQL Irql;
diff --git a/modules/rostests/kmtests/ntos_po/PoIrp_user.c b/modules/rostests/kmtests/ntos_po/PoIrp_user.c index ed945ea7c76..ee6a1ad57bf 100644 --- a/modules/rostests/kmtests/ntos_po/PoIrp_user.c +++ b/modules/rostests/kmtests/ntos_po/PoIrp_user.c @@ -10,6 +10,14 @@
START_TEST(PoIrp) { +#if defined(_M_AMD64) + if (TRUE) + { + skip(FALSE, "ROSTESTS-368: Skipping kmtest:PoIrp because it crashes on Windows Server 2003 x64-Testbot.\n"); + return; + } +#endif + KmtLoadDriver(L"PoIrp", TRUE); KmtOpenDriver(); KmtSendToDriver(IOCTL_RUN_TEST); diff --git a/modules/rostests/winetests/kernel32/pipe.c b/modules/rostests/winetests/kernel32/pipe.c index b2f673400a5..66106ce5111 100644 --- a/modules/rostests/winetests/kernel32/pipe.c +++ b/modules/rostests/winetests/kernel32/pipe.c @@ -3165,6 +3165,14 @@ START_TEST(pipe) int argc; HMODULE hmod;
+#if defined(__REACTOS__) && defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-370: Skipping kernel32_winetest:pipe because it hangs on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + hmod = GetModuleHandleA("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); hmod = GetModuleHandleA("kernel32.dll"); diff --git a/modules/rostests/winetests/kernel32/process.c b/modules/rostests/winetests/kernel32/process.c index b0bf22a0951..2944c9bf4cb 100644 --- a/modules/rostests/winetests/kernel32/process.c +++ b/modules/rostests/winetests/kernel32/process.c @@ -3,7 +3,7 @@ * * Copyright 2002 Eric Pouech * Copyright 2006 Dmitry Timoshkov - * Copyright 2014 Michael M�ller + * Copyright 2014 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -921,7 +921,7 @@ static void test_CommandLine(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL;
- /* from Fran�ois */ + /* from François */ get_file_name(resfile); sprintf(buffer, ""%s" tests/process.c dump "%s" "a\"b\\" c\" d", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); @@ -1148,6 +1148,14 @@ static void test_Toolhelp(void) DWORD ret; int i;
+#if defined(__REACTOS__) && defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-372: Skipping test in kernel32_winetest:process test_Toolhelp because it leaves a process behind on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + //return; + } +#endif + memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -1171,6 +1179,15 @@ static void test_Toolhelp(void) release_memory(); DeleteFileA(resfile);
+#if defined(__REACTOS__) && defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-371: Skipping kernel32_winetest:sync test_apc_deadlock because it fails on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + } + else + { +#endif + get_file_name(resfile); sprintf(buffer, ""%s" tests/process.c nested "%s"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); @@ -1182,6 +1199,9 @@ static void test_Toolhelp(void)
CloseHandle(info.hProcess); CloseHandle(info.hThread); +#if defined(__REACTOS__) && defined(_M_AMD64) + } +#endif
for (i = 0; i < 20; i++) { @@ -3959,7 +3979,7 @@ START_TEST(process) test_Startup(); test_CommandLine(); test_Directory(); - test_Toolhelp(); + test_Toolhelp(); // test_Environment(); test_SuspendFlag(); test_DebuggingFlag(); diff --git a/modules/rostests/winetests/kernel32/sync.c b/modules/rostests/winetests/kernel32/sync.c index 9056c3d1bbe..e03ebae1f9f 100644 --- a/modules/rostests/winetests/kernel32/sync.c +++ b/modules/rostests/winetests/kernel32/sync.c @@ -2596,6 +2596,14 @@ static void test_apc_deadlock(void) char **argv; int i;
+#if defined(__REACTOS__) && defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-371: Skipping kernel32_winetest:sync test_apc_deadlock because it fails on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + winetest_get_mainargs(&argv); sprintf(cmdline, ""%s" sync apc_deadlock", argv[0]); success = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); diff --git a/modules/rostests/winetests/kernel32/virtual.c b/modules/rostests/winetests/kernel32/virtual.c index f2c504eac99..81e09f4e1a9 100644 --- a/modules/rostests/winetests/kernel32/virtual.c +++ b/modules/rostests/winetests/kernel32/virtual.c @@ -4110,6 +4110,14 @@ START_TEST(virtual) char **argv; argc = winetest_get_mainargs( &argv );
+#if defined(__REACTOS__) && defined(_M_AMD64) + if (!winetest_interactive) + { + skip("ROSTESTS-369: Skipping kernel32_winetest:virtual because it crashes on Windows Server 2003 x64-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + if (argc >= 3) { if (!strcmp(argv[2], "sleep"))
-
Timo Kreuzer