test updates

Author: snhobbs

.github/workflows/cmake.yml

@@ -8,48 +8,38 @@ env:
 
 jobs:
   build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
 
     steps:
+    # Checkout the repository
     - uses: actions/checkout@v2
 
+    # Checkout submodules if necessary
     - name: Checkout Submodules
-      run: python3 $(pwd)/git_to_https.py .gitmodules && git submodule update --init && git submodule foreach --recursive python3 $(pwd)/git_to_https.py && git submodule update --init
+      run: |
+        python3 $(pwd)/git_to_https.py .gitmodules
+        git submodule update --init
+        git submodule foreach --recursive python3 $(pwd)/git_to_https.py
+        git submodule update --init
 
+    # Create build directory (out-of-source build)
     - name: Create Build Environment
-      # Some projects don't allow in-source building, so create a separate build directory
-      # We'll use this as our working directory for all subsequent commands
-      run: cmake -E make_directory ${{runner.workspace}}/build
-
-    - name: SetupLibs
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: sudo apt-get install googletest && cd /usr/src/googletest && sudo cmake ./ && sudo make && sudo make install
+      run: cmake -E make_directory ${{ runner.workspace }}/build
 
+    # Configure the CMake project
     - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
+      working-directory: ${{ runner.workspace }}/build
       shell: bash
-      working-directory: ${{runner.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source
-      # and build directories, but this is only available with CMake 3.13 and higher.
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
+    # Build the project using CMake
     - name: Build
-      working-directory: ${{runner.workspace}}/build
+      working-directory: ${{ runner.workspace }}/build
       shell: bash
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --config $BUILD_TYPE
 
+    # Run tests defined by the CMake configuration
     - name: Test
-      working-directory: ${{runner.workspace}}/build
+      working-directory: ${{ runner.workspace }}/build
       shell: bash
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C $BUILD_TYPE
+      run: ctest -V -C $BUILD_TYPE

tests/CMakeLists.txt

@@ -174,4 +174,4 @@ message("System Path" ${CMAKE_SYSTEM_INCLUDE_PATH})
 #  StaticAnalysis("${AnalyseFiles}" "./")
 #endif()
 
-add_test(NAME tests COMMAND ${TargetName})
+add_test(NAME ${TargetName} COMMAND ${TargetName})