Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
  • Loading branch information
BotellaA committed Nov 25, 2019
1 parent 1a1b2e5 commit 52e6a6f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
strategy:
matrix:
config:
- {cc: gcc, cxx: g++, cmake_args: "-DCMAKE_BUILD_TYPE=Debug", coverage: 'yes', benchmark: 'no'}
- {cc: gcc, cxx: g++, cmake_args: "-DCMAKE_BUILD_TYPE=Release -DUSE_BENCHMARK=ON", coverage: 'no', benchmark: 'yes'}
- {cc: clang, cxx: clang++, cmake_args: "-DCMAKE_BUILD_TYPE=Debug", coverage: 'no', benchmark: 'no'}
- {cc: clang, cxx: clang++, cmake_args: "-DCMAKE_BUILD_TYPE=Release", coverage: 'no', benchmark: 'no'}
- {cc: gcc, cxx: g++, cmake_args: "-DCMAKE_BUILD_TYPE=Debug", coverage: true, benchmark: false}
- {cc: gcc, cxx: g++, cmake_args: "-DCMAKE_BUILD_TYPE=Release -DUSE_BENCHMARK=ON", coverage: false, benchmark: true}
- {cc: clang, cxx: clang++, cmake_args: "-DCMAKE_BUILD_TYPE=Debug", coverage: false, benchmark: false}
- {cc: clang, cxx: clang++, cmake_args: "-DCMAKE_BUILD_TYPE=Release", coverage: false, benchmark: false}

steps:
- uses: actions/checkout@v1
Expand All @@ -50,9 +50,9 @@ jobs:
CXX: ${{ matrix.config.cxx }}
- name: Kcov
run: curl -s https://raw.githubusercontent.com/Geode-solutions/actions/master/kcov.sh | bash -s -- ${GITHUB_WORKSPACE}/build/opengeode/bin
if: matrix.config.coverage == 'yes' && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
if: matrix.config.coverage && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
- uses: codecov/[email protected]
if: matrix.config.coverage == 'yes' && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
if: matrix.config.coverage && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: kcov/kcov-merged/cobertura.xml
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
],
"files.watcherExclude": {
"${workspaceFolder}/build/**": true
}
},
"C_Cpp.dimInactiveRegions": false
}
6 changes: 6 additions & 0 deletions tests/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@

#include <geode/basic/common.h>

/*!
* The OPENGEODE_TEST macro takes a name as input and also use a function
* named "test" that takes no argument. This function should be accessible
* from the context in which OPENGEODE_TEST is called.
*/

#ifdef OPENGEODE_BENCHMARK
#define CATCH_CONFIG_MAIN
#define CATCH_CONFIG_PREFIX_ALL
Expand Down

0 comments on commit 52e6a6f

Please sign in to comment.