More tweaks to make coverage

More tweaks to pip-install.yml Added junit to .gitignore
VirtualPlanetaryLaboratory · Sep 6, 2024 · cc482fa · cc482fa
1 parent 890178a
commit cc482fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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