[test] test wip

Quuxplusone · Oct 19, 2023 · e6598e3 · e6598e3
1 parent b27c6ec
commit e6598e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml
@@ -35,19 +35,14 @@ 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 }}
       run: |
         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
@@ -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)