From aa04c84f624ebda4d2c7ec0d76d1a3c92aadaa8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 17 Nov 2017 01:26:02 +0100 Subject: [PATCH] [ROSTESTS] Move the tests unsupported by rosautotest under a "suppl" (supplementary) sub-directory of "reactos/bin". Indeed, rosautotest has an annoying tendency to fail with: Invalid test file name: .exe SYSREG_ROSAUTOTEST_FAILURE when .exe is a test that do not comply with the rosautotest interface. This is indeed the case for all the tests under /rostests/win32/, with the exception of cmd_rostest. Addendum to 8dd89c7. --- modules/rostests/win32/advapi32/eventlog/CMakeLists.txt | 4 ++-- modules/rostests/win32/fs/tunneltest/CMakeLists.txt | 2 +- .../rostests/win32/kernel32/notificationtest/CMakeLists.txt | 2 +- modules/rostests/win32/user32/paintdesktop/CMakeLists.txt | 2 +- modules/rostests/win32/user32/sysicon/CMakeLists.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt b/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt index 2220b951987..ff617c646ae 100644 --- a/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt +++ b/modules/rostests/win32/advapi32/eventlog/CMakeLists.txt @@ -8,10 +8,10 @@ add_library(MyEventProvider_dll SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvid add_dependencies(MyEventProvider_dll MyEventProvider) set_module_type(MyEventProvider_dll module UNICODE) set_target_properties(MyEventProvider_dll PROPERTIES OUTPUT_NAME "MyEventProvider") -add_rostests_file(TARGET MyEventProvider_dll) +add_rostests_file(TARGET MyEventProvider_dll SUBDIR suppl) add_executable(evtlogtest EvtLogTest.c) set_module_type(evtlogtest win32cui UNICODE) add_dependencies(evtlogtest MyEventProvider MyEventProvider_dll) add_importlibs(evtlogtest advapi32 msvcrt kernel32) -add_rostests_file(TARGET evtlogtest) +add_rostests_file(TARGET evtlogtest SUBDIR suppl) diff --git a/modules/rostests/win32/fs/tunneltest/CMakeLists.txt b/modules/rostests/win32/fs/tunneltest/CMakeLists.txt index 8ab41f953d3..812932cfb2a 100644 --- a/modules/rostests/win32/fs/tunneltest/CMakeLists.txt +++ b/modules/rostests/win32/fs/tunneltest/CMakeLists.txt @@ -5,4 +5,4 @@ list(APPEND SOURCE add_executable(tunneltest ${SOURCE}) set_module_type(tunneltest win32cui UNICODE) add_importlibs(tunneltest msvcrt kernel32 ntdll) -add_rostests_file(TARGET tunneltest) +add_rostests_file(TARGET tunneltest SUBDIR suppl) diff --git a/modules/rostests/win32/kernel32/notificationtest/CMakeLists.txt b/modules/rostests/win32/kernel32/notificationtest/CMakeLists.txt index da79cdfc320..00853fa3e75 100644 --- a/modules/rostests/win32/kernel32/notificationtest/CMakeLists.txt +++ b/modules/rostests/win32/kernel32/notificationtest/CMakeLists.txt @@ -6,4 +6,4 @@ add_executable(notificationtest ${SOURCE}) target_link_libraries(notificationtest wine ${PSEH_LIB}) set_module_type(notificationtest win32cui) add_importlibs(notificationtest gdi32 user32 shlwapi msvcrt kernel32 ntdll) -add_rostests_file(TARGET notificationtest) +add_rostests_file(TARGET notificationtest SUBDIR suppl) diff --git a/modules/rostests/win32/user32/paintdesktop/CMakeLists.txt b/modules/rostests/win32/user32/paintdesktop/CMakeLists.txt index 3c5172571e0..bf3ac1922d1 100644 --- a/modules/rostests/win32/user32/paintdesktop/CMakeLists.txt +++ b/modules/rostests/win32/user32/paintdesktop/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(paintdesktop PaintDesktop.c) set_module_type(paintdesktop win32gui UNICODE) add_importlibs(paintdesktop user32 msvcrt kernel32) -add_rostests_file(TARGET paintdesktop) +add_rostests_file(TARGET paintdesktop SUBDIR suppl) diff --git a/modules/rostests/win32/user32/sysicon/CMakeLists.txt b/modules/rostests/win32/user32/sysicon/CMakeLists.txt index 054734c3734..55d70ab239d 100644 --- a/modules/rostests/win32/user32/sysicon/CMakeLists.txt +++ b/modules/rostests/win32/user32/sysicon/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable(sysicon ${SOURCE}) target_link_libraries(sysicon ${PSEH_LIB}) set_module_type(sysicon win32gui UNICODE) add_importlibs(sysicon gdi32 user32 msvcrt kernel32) -add_rostests_file(TARGET sysicon) +add_rostests_file(TARGET sysicon SUBDIR suppl)