From cc482fa199cefb0fbf53b5bc08e520d98bdb1884 Mon Sep 17 00:00:00 2001 From: Rory Barnes Date: Thu, 5 Sep 2024 17:08:51 -0700 Subject: [PATCH] More tweaks to make coverage More tweaks to pip-install.yml Added junit to .gitignore --- .github/workflows/pip-install.yml | 8 ++++++-- .gitignore | 1 + Makefile | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pip-install.yml b/.github/workflows/pip-install.yml index 3c5657cc3..7516f800d 100644 --- a/.github/workflows/pip-install.yml +++ b/.github/workflows/pip-install.yml @@ -15,7 +15,9 @@ jobs: - os: ubuntu-22.04 python-version: '3.6' - os: macos-14 - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: '3.6' + - os: macos-14 + python-version: '3.7' fail-fast: false steps: @@ -61,8 +63,10 @@ jobs: exclude: - os: ubuntu-22.04 python-version: '3.6' + - os: macos-14 + python-version: '3.6' - os: macos-14 - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: '3.7' fail-fast: false steps: diff --git a/.gitignore b/.gitignore index 786b156fd..500e18555 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ tests/Vspace_Log/Log_Test/ *BP_CreateHDF5* *BP_Extract* *BP_Stats* +junit/ coverage.info .coverage diff --git a/Makefile b/Makefile index 4fa857753..60888c986 100644 --- a/Makefile +++ b/Makefile @@ -70,8 +70,9 @@ test: coverage: rm -f ./gcov/*.gcda ./gcov/*.gcno ./.coverage mkdir -p ./gcov - gcc -coverage -o ./bin/vplanet src/*.c -lm - python -m pytest --tb=short tests --junitxml=junit/test-results.xml + cd gcov && gcc -coverage -o ./../bin/vplanet ./../src/*.c -lm + pwd + python -m pytest --tb=short tests --junitxml=./junit/test-results.xml lcov --capture --directory ./gcov --output-file ./.coverage genhtml ./.coverage --output-directory ./gcov/html