From 60ee5fc844e539466a1addbcd728730d3664e159 Mon Sep 17 00:00:00 2001 From: Furkan Usta Date: Sat, 2 May 2020 15:12:30 +0300 Subject: [PATCH] Enable numberparsingcheck and stringparsingcheck on MSVC --- tests/CMakeLists.txt | 10 ++++------ tests/numberparsingcheck.cpp | 2 +- tests/stringparsingcheck.cpp | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3c77e99ed..f83b80131 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,12 +42,10 @@ 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) +add_cpp_test(stringparsingcheck LABELS acceptance per_implementation) +target_link_libraries(stringparsingcheck simdjson-include-source simdjson-windows-headers) # All remaining tests link with simdjson proper link_libraries(simdjson) diff --git a/tests/numberparsingcheck.cpp b/tests/numberparsingcheck.cpp index 5cd663b6f..c94818010 100644 --- a/tests/numberparsingcheck.cpp +++ b/tests/numberparsingcheck.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -10,6 +9,7 @@ #define JSON_TEST_NUMBERS #endif +#include "dirent_portable.h" #include "simdjson.h" // ulp distance diff --git a/tests/stringparsingcheck.cpp b/tests/stringparsingcheck.cpp index d4bda5a86..690d25c1d 100644 --- a/tests/stringparsingcheck.cpp +++ b/tests/stringparsingcheck.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -13,6 +12,7 @@ #define JSON_TEST_STRINGS #endif +#include "dirent_portable.h" #include "simdjson.h" char *fullpath;