[INTEROP_UNITTEST] Move to unit tests

binarymaster · Jul 31, 2024 · 67315fc · 67315fc
1 parent cfcab9f
commit 67315fc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/modules/rostests/unittests/CMakeLists.txt b/modules/rostests/unittests/CMakeLists.txt
@@ -1 +1,2 @@
+add_subdirectory(interop)
 add_subdirectory(setuplib)
diff --git a/modules/rostests/unittests/interop/CMakeLists.txt b/modules/rostests/unittests/interop/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+PROJECT(interop_unittest)
+
+include_directories(../../apitests/include)
+
+list(APPEND SOURCE
+    LocaleTests.cpp
+    testlist.c)
+
+add_executable(interop_unittest ${SOURCE})
+
+target_link_libraries(interop_unittest cppstl)
+set_module_type(interop_unittest win32cui)
+target_compile_definitions(interop_unittest PRIVATE UNICODE _UNICODE _STLP_NO_EXCEPTIONS)
+add_importlibs(interop_unittest shell32 user32 msvcrt kernel32)
+add_rostests_file(TARGET interop_unittest)
diff --git a/...stests/win32/interop_test/LocaleTests.cpp → ...ostests/unittests/interop/LocaleTests.cpp b/...stests/win32/interop_test/LocaleTests.cpp → ...ostests/unittests/interop/LocaleTests.cpp
@@ -241,7 +241,7 @@ static void TEST_LocaleTests(void)
 #define ADD_LIB(eModule, pszPath) lib.insert(std::make_pair(eModule, pszPath));
 
     GetModuleFileNameW(NULL, szBuffer, _countof(szBuffer));
-    LPCWSTR pszFind = StrStrW(szBuffer, L"modules\\rostests\\win32");
+    LPCWSTR pszFind = StrStrW(szBuffer, L"modules\\rostests\\unittests");
     if (pszFind)
     {
         // We're running in ReactOS output folder

diff --git a/...les/rostests/win32/interop_test/interop.h → modules/rostests/unittests/interop/interop.h b/...les/rostests/win32/interop_test/interop.h → modules/rostests/unittests/interop/interop.h
diff --git a/...es/rostests/win32/interop_test/testlist.c → ...les/rostests/unittests/interop/testlist.c b/...es/rostests/win32/interop_test/testlist.c → ...les/rostests/unittests/interop/testlist.c
diff --git a/modules/rostests/win32/CMakeLists.txt b/modules/rostests/win32/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_subdirectory(advapi32)
 add_subdirectory(cmd)
 add_subdirectory(comctl32)
-add_subdirectory(interop_test)
 add_subdirectory(kernel32)
 add_subdirectory(user32)
diff --git a/modules/rostests/win32/interop_test/CMakeLists.txt b/modules/rostests/win32/interop_test/CMakeLists.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		add_subdirectory(interop)
		add_subdirectory(setuplib)