From e6598e353b0e1bf53164bd21b12187d8031b5160 Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Wed, 18 Oct 2023 20:23:17 -0400 Subject: [PATCH] [test] test wip --- .github/workflows/build-and-run-tests.yml | 9 ++------- test/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index 90febe6..1636395 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -35,11 +35,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Google Test (Linux) - if: matrix.os == 'ubuntu-latest' - run: > - sudo apt-get install libgtest-dev - - name: Build (Linux) if: matrix.os == 'ubuntu-latest' working-directory: ${{ github.workspace }} @@ -47,7 +42,7 @@ jobs: cmake . -B ./build -G 'Unix Makefiles' \ -DCMAKE_CXX_STANDARD=${{ matrix.cpp_standard }} \ -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_DOWNLOAD_GTEST=ON - name: Build (Windows) if: matrix.os == 'windows-latest' @@ -58,4 +53,4 @@ jobs: - name: Test working-directory: ${{ github.workspace }}/build run: | - make && ./bin/utest + make VERBOSE=1 && ./bin/utest diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a318486..da40ed5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,12 +1,12 @@ if ("${CMAKE_DOWNLOAD_GTEST}") - include(fetchcontent) + include(FetchContent) fetchcontent_declare( - googletest + GTest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # tagged v1.14.0 ) - fetchcontent_makeavailable(googletest) + fetchcontent_makeavailable(GTest) endif() find_package(GTest REQUIRED)