[IPHLPAPI_APITEST] Move icmp tests from winetests to apitests where they belong....
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 4 Dec 2015 10:34:24 +0000 (10:34 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 4 Dec 2015 10:34:24 +0000 (10:34 +0000)
svn path=/trunk/; revision=70261

rostests/apitests/iphlpapi/CMakeLists.txt
rostests/apitests/iphlpapi/icmp.c [moved from rostests/winetests/icmp/icmp.c with 78% similarity]
rostests/apitests/iphlpapi/testlist.c
rostests/winetests/CMakeLists.txt
rostests/winetests/icmp/CMakeLists.txt [deleted file]
rostests/winetests/icmp/testlist.c [deleted file]

index 9e0fcc3..0cc2132 100644 (file)
@@ -1,5 +1,6 @@
 
 list(APPEND SOURCE
+    icmp.c
     SendARP.c
     testlist.c)
 
similarity index 78%
rename from rostests/winetests/icmp/icmp.c
rename to rostests/apitests/iphlpapi/icmp.c
index 700e82d..1107a80 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Unit test suite for Icmp.dll functions
+ * Unit test suite for Icmp functions
  *
  * Copyright 2006 Steven Edwards
  *
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/*
- * TODO:
- * It seems under Windows XP, 2003 and Vista these functions are not implemented
- * in iphlpapi. Move the implementation and tests there.
- */
-
-#include <windows.h>
-#include "wine/test.h"
 
-HANDLE WINAPI IcmpCreateFile(void);
-BOOL WINAPI IcmpCloseHandle(HANDLE handle);
+#include <apitest.h>
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+#include <icmpapi.h>
 
 HANDLE handle;
 
index 3e9fd7f..3a0db62 100644 (file)
@@ -3,10 +3,12 @@
 #define STANDALONE
 #include <apitest.h>
 
+extern void func_icmp(void);
 extern void func_SendARP(void);
 
 const struct test winetest_testlist[] =
 {
+    { "icmp",                 func_icmp },
     { "SendARP",              func_SendARP },
 
     { 0, 0 }
index def5eaa..b86a58b 100644 (file)
@@ -31,7 +31,6 @@ add_subdirectory(fusion)
 add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(hlink)
-add_subdirectory(icmp)
 add_subdirectory(imagehlp)
 add_subdirectory(imm32)
 add_subdirectory(inetcomm)
diff --git a/rostests/winetests/icmp/CMakeLists.txt b/rostests/winetests/icmp/CMakeLists.txt
deleted file mode 100644 (file)
index d0c7b3c..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_executable(icmp_winetest icmp.c testlist.c)
-target_link_libraries(icmp_winetest wine uuid)
-set_module_type(icmp_winetest win32cui)
-add_importlibs(icmp_winetest icmp msvcrt kernel32 ntdll)
-add_cd_file(TARGET icmp_winetest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/icmp/testlist.c b/rostests/winetests/icmp/testlist.c
deleted file mode 100644 (file)
index 6800e31..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Automatically generated file; DO NOT EDIT!! */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#define STANDALONE
-#include "wine/test.h"
-
-extern void func_icmp(void);
-
-const struct test winetest_testlist[] =
-{
-    { "icmp", func_icmp },
-    { 0, 0 }
-};