Merge pull request simdjson#853 from furkanusta/windows-parsingchecks

jkeiser · web-flow · commit 191faeae70f1 · 2020-05-02T09:19:47.000-07:00
Enable numberparsingcheck and stringparsingcheck on MSVC
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -42,12 +42,12 @@ include(${PROJECT_SOURCE_DIR}/tests/add_cpp_test.cmake)
 #
 # These tests explicitly do #include "simdjson.cpp" so they can override stuff
 #
-if (NOT MSVC) # Can't get simdjson-source to compile on Windows for some reason.
-  add_cpp_test(numberparsingcheck LABELS acceptance per_implementation)
-  target_link_libraries(numberparsingcheck simdjson-include-source)
-  add_cpp_test(stringparsingcheck LABELS acceptance per_implementation)
-  target_link_libraries(stringparsingcheck simdjson-include-source)
-endif()
+add_cpp_test(numberparsingcheck LABELS acceptance per_implementation)
+target_link_libraries(numberparsingcheck simdjson-include-source simdjson-windows-headers)
+target_compile_definitions(numberparsingcheck PRIVATE NOMINMAX)
+add_cpp_test(stringparsingcheck LABELS acceptance per_implementation)
+target_link_libraries(stringparsingcheck simdjson-include-source simdjson-windows-headers)
+target_compile_definitions(stringparsingcheck PRIVATE NOMINMAX)
 
 # All remaining tests link with simdjson proper
 link_libraries(simdjson)
diff --git a/tests/numberparsingcheck.cpp b/tests/numberparsingcheck.cpp
@@ -1,5 +1,4 @@
 #include <cstring>
-#include <dirent.h>
 #include <inttypes.h>
 #include <math.h>
 #include <stdbool.h>
@@ -10,6 +9,11 @@
 #define JSON_TEST_NUMBERS
 #endif
 
+#ifndef _MSC_VER
+#include <dirent.h>
+#else
+#include <dirent_portable.h>
+#endif
 #include "simdjson.h"
 
 // ulp distance
diff --git a/tests/stringparsingcheck.cpp b/tests/stringparsingcheck.cpp
@@ -1,7 +1,6 @@
 #include <cassert>
 #include <climits>
 #include <cstring>
-#include <dirent.h>
 #include <inttypes.h>
 #include <iostream>
 #include <math.h>
@@ -13,6 +12,11 @@
 #define JSON_TEST_STRINGS
 #endif
 
+#ifndef _MSC_VER
+#include <dirent.h>
+#else
+#include <dirent_portable.h>
+#endif
 #include "simdjson.h"
 
 char *fullpath;
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(simdjson-windows-headers INTERFACE)
 if(MSVC)
   target_include_directories(simdjson-windows-headers INTERFACE .)
-endif()
+endif()
