WIP: MSVC C tests

.github/workflows/auto-cancellation.yml

@@ -0,0 +1,11 @@
+name: Cancelling previous actions runs.
+on: pull_request
+
+jobs:
+  cancel:
+    name: auto-cancellation-running-action
+    runs-on: ubuntu-latest
+    steps:
+      - uses: fauguste/[email protected]
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cmake.yml

@@ -1,6 +1,14 @@
 ---
 name: CI
-on: [push, pull_request]
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+  pull_request:
+
 jobs:
   # Regular C build with two compilers, using the environment:
   build_using_compiler_in_environment:

.github/workflows/lint.yml

@@ -1,6 +1,12 @@
 name: test-linters
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+  pull_request:
 
 jobs:
   test-clang-format:

.github/workflows/msvc.yml

@@ -0,0 +1,52 @@
+name: cmake-msvc
+on: [push, pull_request]
+
+jobs:
+  job:
+    name: ${{ matrix.os }}-hosted-basic
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest ]
+        include:
+          - os: windows-latest
+            triplet: x64-windows
+            vcpkgCommitId: '30124253eecff36bc90f73341edbfb4f845e2a1e'
+            vcpkgPackages: 'sqlite3'
+
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          submodules: recursive
+
+      - uses: lukka/get-cmake@latest
+      - name: dir
+        run: find $RUNNER_WORKSPACE
+        shell: bash
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@main
+        id: runvcpkg
+        with:
+          vcpkgArguments: '${{ matrix.vcpkgPackages }}'
+          vcpkgTriplet: '${{ matrix.triplet }}'
+          vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+          vcpkgGitCommitId: '${{ matrix.vcpkgCommitId }}'
+      - name: dir
+        run: find $RUNNER_WORKSPACE
+        shell: bash
+      - name: Prints outputs of run-vcpkg task
+        run: echo "'${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}' '${{  steps.runvcpkg.outputs.RUNVCPKG_VCPKG_TRIPLET_OUT }}' "
+      - name: Run CMake+VS16Win64 without triplet
+        uses: lukka/run-cmake@main
+        id: runcmake
+        with:
+          cmakeGenerator: 'VS16Win64'  # 'Ninja' fails
+          cmakeListsOrSettingsJson: 'CMakeListsTxtBasic'
+          cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+          useVcpkgToolchainFile: true
+          buildWithCMakeArgs: '-j 1'
+          buildDirectory: '${{ runner.workspace }}/b/'
+
+      - name: Run tests
+        run: '${{ runner.workspace }}\b\tests\Debug\test_libsettings.exe'

.github/workflows/python.yml

@@ -1,6 +1,13 @@
 name: Python
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+  pull_request:
+
 jobs:
   build:
 

CMakeLists.txt

@@ -33,8 +33,8 @@ include(CCache)
 include(SwiftCmakeOptions)
 
 if(MSVC)
-  message(STATUS "Skipping unit tests, MSVC detected")
-  set(disable_tests TRUE)
+  #message(STATUS "Skipping unit tests, MSVC detected")
+  #set(disable_tests TRUE)
 elseif(SKIP_UNIT_TESTS)
   message(STATUS "Skipping unit tests requested")
   set(disable_tests TRUE)

src/CMakeLists.txt

@@ -16,6 +16,8 @@ add_library(settings
             setting_type_int.c
             setting_type_str.c)
 
+target_compile_definitions(settings PRIVATE "_WINDLL")
+
 target_link_libraries(settings swiftnav)
 
 target_include_directories(settings PUBLIC ${PROJECT_SOURCE_DIR}/include)

tests/CMakeLists.txt

@@ -20,6 +20,8 @@
     ${PROJECT_SOURCE_DIR}/src/settings.c
     ${PROJECT_SOURCE_DIR}/src/settings_util.c)
 
+    target_compile_definitions(test_libsettings PRIVATE "_WINDLL")
+
   target_include_directories(test_libsettings
       PRIVATE
       ${PROJECT_SOURCE_DIR}/include
@@ -30,18 +32,10 @@
   target_link_libraries(test_libsettings swiftnav gtest_main)
 
   if (WIN32)
-    add_custom_command(
-      TARGET test_libsettings POST_BUILD
-      COMMENT "Running unit tests"
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/libgtest.dll ${CMAKE_BINARY_DIR}/tests
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/libgtest_main.dll ${CMAKE_BINARY_DIR}/tests
-      COMMAND test_libsettings
-    )
   else (WIN32)
     add_custom_command(
       TARGET test_libsettings POST_BUILD
       COMMENT "Running unit tests"
       COMMAND test_libsettings
     )
   endif (WIN32)
-