From b736400807676d48aec2a289606290680c0fa70d Mon Sep 17 00:00:00 2001 From: zalox Date: Sat, 25 May 2019 17:27:35 +0200 Subject: [PATCH] fix remaining tests on windows --- tests/python_bindings/CMake_tests/cmake_test.cc | 4 ++++ tests/python_bindings/Config_tests/config_test.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/python_bindings/CMake_tests/cmake_test.cc b/tests/python_bindings/CMake_tests/cmake_test.cc index 1f79d31..512d959 100644 --- a/tests/python_bindings/CMake_tests/cmake_test.cc +++ b/tests/python_bindings/CMake_tests/cmake_test.cc @@ -3,7 +3,11 @@ int main() { auto &config = Config::get(); +#ifdef _WIN32 + config.project.cmake.command = "cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/mingw64"; +#else config.project.cmake.command = "cmake"; +#endif auto suite_name = "CMake_tests"; suite test_suite(suite_name); auto module = py::module::import("cmake_test"); diff --git a/tests/python_bindings/Config_tests/config_test.cc b/tests/python_bindings/Config_tests/config_test.cc index 29c6b79..b594670 100644 --- a/tests/python_bindings/Config_tests/config_test.cc +++ b/tests/python_bindings/Config_tests/config_test.cc @@ -84,7 +84,7 @@ int main() { }); doTest("cfg", [](Config &config) { - g_assert_cmpstr(config.home_juci_path.c_str(), ==, "/away"); - g_assert_cmpstr(config.home_path.c_str(), ==, "/home"); + g_assert_cmpstr(config.home_juci_path.string().c_str(), ==, "/away"); + g_assert_cmpstr(config.home_path.string().c_str(), ==, "/home"); }); }