Merge pull request #5 from jacobwilliams/coverage

Coverage

Author: jacobwilliams

.github/workflows/CI.yml

@@ -9,14 +9,14 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         gcc_v: [10] # Version of GFortran we want to use.
-        python-version: [3.7]
+        python-version: [3.9]
     env:
       FC: gfortran-${{ matrix.gcc_v }}
       GCC_V: ${{ matrix.gcc_v }}
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.0.2
       with:
         submodules: recursive
 
@@ -29,7 +29,7 @@ jobs:
       uses: ts-graphviz/setup-graphviz@v1
 
     - name: Setup Fortran Package Manager
-      uses: fortran-lang/setup-fpm@v3
+      uses: fortran-lang/setup-fpm@v4
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -43,25 +43,38 @@ jobs:
     - name: Install GFortran Linux
       if: contains( matrix.os, 'ubuntu')
       run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V}
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
-        --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
-        --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V}
+        sudo apt-get install lcov
+        sudo update-alternatives \
+           --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc_v }} 100 \
+           --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${{ matrix.gcc_v }} \
+           --slave /usr/bin/gcov gcov /usr/bin/gcov-${{ matrix.gcc_v }}
 
-    - name: Compile
-      run: fpm build --profile release
+    # - name: Compile
+    #   run: fpm build --profile release
 
-    - name: Run test
-      run: fpm test
+    - name: Run tests
+      run: fpm test --profile debug --flag -coverage
+
+    - name: Create coverage report
+      run: |
+        mkdir -p ${{ env.COV_DIR }}
+        lcov --capture --initial --base-directory . --directory build/gfortran_*/ --output-file ${{ env.COV_DIR }}/coverage.base
+        lcov --capture --base-directory . --directory build/gfortran_*/ --output-file ${{ env.COV_DIR }}/coverage.capture
+        lcov --add-tracefile ${{ env.COV_DIR }}/coverage.base --add-tracefile ${{ env.COV_DIR }}/coverage.capture --output-file ${{ env.COV_DIR }}/coverage.info
+      env:
+        COV_DIR: build/coverage
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v2
+      with:
+        files: build/coverage/coverage.info
 
     - name: Build documentation
       run: ford ./lsqr.md
 
     - name: Deploy Documentation
       if: github.ref == 'refs/heads/master'
-      uses: JamesIves/github-pages-deploy-action@4.1.0
+      uses: JamesIves/github-pages-deploy-action@v4.3.3
       with:
         branch: gh-pages # The branch the action should deploy to.
         folder: doc  # The folder the action should deploy.

.gitignore

@@ -35,4 +35,7 @@ bin
 install
 
 # mac
-.DS_Store
+.DS_Store
+
+# tests
+/LSQR.LIS

README.md

@@ -1,7 +1,11 @@
 ![LSQR](media/logo.png)
 ============
 
-![Build Status](https://github.com/jacobwilliams/LSQR/actions/workflows/CI.yml/badge.svg)
+### Status
+[![GitHub release](https://img.shields.io/github/release/jacobwilliams/LSQR.svg)](https://github.com/jacobwilliams/LSQR/releases/latest)
+[![CI Status](https://github.com/jacobwilliams/LSQR/actions/workflows/CI.yml/badge.svg)](https://github.com/jacobwilliams/LSQR/actions)
+[![codecov](https://codecov.io/gh/jacobwilliams/LSQR/branch/master/graph/badge.svg)](https://codecov.io/gh/jacobwilliams/LSQR)
+[![last-commit](https://img.shields.io/github/last-commit/jacobwilliams/LSQR)](https://github.com/jacobwilliams/LSQR/commits/master)
 
 ### Brief Description
 
@@ -68,7 +72,7 @@ lsqr = { git="https://github.com/jacobwilliams/lsqr.git" }
 
 ### Documentation
 
-The latest API documentation can be found [here](http://jacobwilliams.github.io/LSQR/). This was generated from the source code using [FORD](https://github.com/Fortran-FOSS-Programmers/ford).
+The latest API documentation can be found [here](https://jacobwilliams.github.io/LSQR/). This was generated from the source code using [FORD](https://github.com/Fortran-FOSS-Programmers/ford).
 
 ### License
 

codecov.yml

@@ -0,0 +1,13 @@
+comment:
+  layout: header, changes, diff, sunburst
+coverage:
+  ignore:
+  - test
+  - doc
+  status:
+    patch:
+      default:
+        target: 20%
+    project:
+      default:
+        target: 20%

fpm.toml

@@ -9,20 +9,10 @@ keywords = ["conjugate-gradient", "sparse", "linear systems", "least-squares"]
 [build]
 auto-executables = false
 auto-examples = false
-auto-tests = false
+auto-tests = true
 
 [library]
 source-dir = "src"
 
 [install]
-library = true
-
-[[test]]
-name = "lsqrtest_ez"
-source-dir = "tests"
-main = "lsqrtest_ez.f90"
-
-[[test]]
-name = "lsqrtest"
-source-dir = "tests"
-main = "lsqrtest.f90"
+library = true

tests/LSQR.LIS renamed to test/LSQR.LIS

@@ -41,5 +41,7 @@ program main
     write(*,'(1P,A,*(E16.6))') 'A*x     = ', matmul(a_mat, x_vec)
     write(*,'(1P,A,*(E16.6))') 'A*x - b = ', matmul(a_mat, x_vec) - b_vec
 
+    if (any(abs(matmul(a_mat, x_vec) - b_vec) > 1.0e-12)) error stop 'TEST FAILED'
+
     end program main
 !***************************************************************************************************