diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 9e739ff330..d61bb99406 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -36,6 +36,7 @@ jobs: continue-on-error: false env: BUILD_TYPE: Release + CXXFLAGS: "/Zm256 /MP2" steps: - uses: actions/checkout@v6 - run: cmake --version @@ -70,25 +71,22 @@ jobs: run: | cmake --preset ci-windows -DENABLE_NODE_BINDINGS=ON cmake --build --preset ci-windows + - name: Run tests + shell: bash + run: | + cd build + cmake --build . --config Release --target tests + - name: Run node tests + shell: bash + run: | + ./lib/binding_napi_v8/osrm-extract.exe -p profiles/car.lua test/data/monaco.osm.pbf + + mkdir -p test/data/ch + cp test/data/monaco.osrm* test/data/ch/ + ./lib/binding_napi_v8/osrm-contract.exe test/data/ch/monaco.osrm - # TODO: MSVC goes out of memory when building our tests - # - name: Run tests - # shell: bash - # run: | - # cd build - # cmake --build . --config Release --target tests - # # TODO: run tests - # - name: Run node tests - # shell: bash - # run: | - # ./lib/binding_napi_v8/osrm-extract.exe -p profiles/car.lua test/data/monaco.osm.pbf - - # mkdir -p test/data/ch - # cp test/data/monaco.osrm* test/data/ch/ - # ./lib/binding_napi_v8/osrm-contract.exe test/data/ch/monaco.osrm - - # ./lib/binding_napi_v8/osrm-datastore.exe test/data/ch/monaco.osrm - # node test/nodejs/index.js + ./lib/binding_napi_v8/osrm-datastore.exe test/data/ch/monaco.osrm + node test/nodejs/index.js - name: Build Node package shell: bash run: ./scripts/ci/node_package.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 057d5fc845..3dbf7d2ea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,6 +274,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8") # support Unicode in fmt library + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # limit parallel compilation to reduce memory usage add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC) add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS) add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation