From 23955bf6bb92d2dc10c815cb00fdec5fad582f26 Mon Sep 17 00:00:00 2001 From: Jacob Oursland Date: Fri, 1 Dec 2023 12:46:13 -0700 Subject: [PATCH] CI: Enable C++ unit tests on Windows on Conda. --- .github/workflows/sub_buildWindows.yml | 4 ++-- .github/workflows/sub_buildWindowsConda.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sub_buildWindows.yml b/.github/workflows/sub_buildWindows.yml index e899d3c7a1..03e700d6e4 100644 --- a/.github/workflows/sub_buildWindows.yml +++ b/.github/workflows/sub_buildWindows.yml @@ -133,10 +133,10 @@ jobs: run: | Move-Item -Force -Path ${{ env.libpackdir }}bin -Destination ${{ env.builddir }} - name: C++ unit tests - if: false # Disabled because seems to not exist on Windows build + if: false # Disabled because seems to not function on Windows build timeout-minutes: 1 run: | - . ${{ env.builddir }}\test\Tests_run --gtest_output=json:${{ env.reportdir }}gtest_results.json # 2>&1 | tee -filepath ${{ env.logdir }}\unitTests.log + . ${{ env.builddir }}\tests\Release\Tests_run --gtest_output=json:${{ env.reportdir }}gtest_results.json # 2>&1 | tee -filepath ${{ env.logdir }}\unitTests.log - name: FreeCAD CLI tests run: | . ${{ env.builddir }}\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}\integrationTests.log diff --git a/.github/workflows/sub_buildWindowsConda.yml b/.github/workflows/sub_buildWindowsConda.yml index 4ce65d27bd..d2c0bde34c 100644 --- a/.github/workflows/sub_buildWindowsConda.yml +++ b/.github/workflows/sub_buildWindowsConda.yml @@ -113,10 +113,9 @@ jobs: run: | conda\cmake.cmd --install build\release - name: C++ unit tests - if: false # Disabled because seems to not exist on Windows build timeout-minutes: 1 run: | - . build\release\test\Tests_run --gtest_output=json:${{ env.reportdir }}gtest_results.json # 2>&1 | tee -filepath ${{ env.logdir }}/unitTests.log + . build\release\tests\Tests_run --gtest_output=json:${{ env.reportdir }}gtest_results.json # 2>&1 | tee -filepath ${{ env.logdir }}/unitTests.log - name: FreeCAD CLI tests run: | . build\release\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}/integrationTests.log