Skip to content

Commit 1c09ebf

Browse files
committed
Updated the test files.
1 parent e84788d commit 1c09ebf

File tree

4 files changed

+45
-5
lines changed

4 files changed

+45
-5
lines changed

.github/workflows/code_cov.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: codecov
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
REPO_NAME: 'pyofm'
7+
DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
8+
DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
9+
DOCKER_TAG: 'latest'
10+
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
11+
12+
jobs:
13+
code_coverage:
14+
runs-on: ubuntu-22.04
15+
name: Codecov
16+
steps:
17+
- uses: actions/checkout@main
18+
- name: Create the docker container and run the tests
19+
run: |
20+
docker pull dafoam/opt-packages:${{env.DOCKER_TAG}}
21+
docker run -i -d -u dafoamuser --name regtest -v $GITHUB_WORKSPACE:${{env.DOCKER_MOUNT_DIR}} dafoam/opt-packages:${{env.DOCKER_TAG}} /bin/bash
22+
docker exec -i regtest /bin/bash -c "rm -rf ${{env.DOCKER_WORKING_DIR}} && cp -r ${{env.DOCKER_MOUNT_DIR}} ${{env.DOCKER_WORKING_DIR}}"
23+
docker exec -i regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd ${{env.DOCKER_WORKING_DIR}}/src && . ./.add_coverage_flag.sh"
24+
docker exec -i -e COMPILE_DAFOAM_ADF=1 regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd ${{env.DOCKER_WORKING_DIR}} && pip install ."
25+
docker exec -i -e DF_CHECK_COVERAGE=1 regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd ${{env.DOCKER_WORKING_DIR}}/reg_tests && coverage run run_reg_tests.py"
26+
docker exec -i regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd ${{env.DOCKER_WORKING_DIR}}/reg_tests && coverage combine && coverage xml && echo dafoamuser | sudo -S cp -r coverage.xml ${{env.DOCKER_MOUNT_DIR}}/"
27+
docker exec -i regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd ${{env.DOCKER_WORKING_DIR}} && lcov --capture --directory . --output-file coverage.info && echo dafoamuser | sudo -S cp -r coverage.info ${{env.DOCKER_MOUNT_DIR}}/"
28+
- name: Upload
29+
uses: codecov/codecov-action@v4
30+
with:
31+
fail_ci_if_error: true
32+
files: ./coverage.info
33+
token: ${{secrets.CODECOV_TOKEN}}
34+
verbose: true

.github/workflows/reg_tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ env:
1111
jobs:
1212

1313
regresstion_tests:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
name: Regression tests
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@main
1818
- name: Create the docker container and run the tests
1919
run: |
2020
docker pull dafoam/opt-packages:${{env.DOCKER_TAG}}
2121
docker run -i -d -u dafoamuser --name regtest -v $GITHUB_WORKSPACE:${{env.DOCKER_MOUNT_DIR}} dafoam/opt-packages:${{env.DOCKER_TAG}} /bin/bash
2222
docker exec -i regtest /bin/bash -c "rm -rf ${{ env.DOCKER_WORKING_DIR}} && cp -r ${{env.DOCKER_MOUNT_DIR}} ${{env.DOCKER_WORKING_DIR}}"
23-
docker exec -i regtest /bin/bash -c ". /home/dafoamuser/dafoam/loadDAFoam.sh && cd ${{env.DOCKER_WORKING_DIR}} && make && pip install ."
23+
docker exec -i regtest /bin/bash -c ". /home/dafoamuser/dafoam/loadDAFoam.sh && cd ${{env.DOCKER_WORKING_DIR}} && pip install ."
2424
docker exec -i regtest /bin/bash -c "cd ${{env.DOCKER_WORKING_DIR}}/reg_tests && rm -rf input.tar.gz && wget https://github.com/mdolab/pyofm/raw/main/reg_tests/input.tar.gz && tar -xzf input.tar.gz"
2525
docker exec -i regtest /bin/bash -c ". /home/dafoamuser/dafoam/loadDAFoam.sh && cd ${{env.DOCKER_WORKING_DIR}}/reg_tests && python run_reg_tests.py"
26-
#docker exec regtest sed -i -e 's/real-opt/complex-opt/g' /home/dafoamuser/dafoam/loadDAFoam.sh
27-
#docker exec -i regtest /bin/bash -c ". /home/dafoamuser/dafoam/loadDAFoam.sh && rm -rf /home/dafoamuser/dafoam/packages/petsc-3.11.4/real-opt && cd /home/dafoamuser/dafoam && git clone https://github.com/mdolab/idwarp && cd idwarp && make -f Makefile_CS && pip uninstall idwarp && pip install . && cd ${{env.DOCKER_WORKING_DIR}}/reg_tests && python run_reg_tests_cs.py"
2826

reg_tests/.coveragerc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[coverage:run]
2+
parallel = true
3+
include = /home/dafoamuser/dafoam/packages/miniconda3/lib/python3.9/site-packages/pyofm/pyOFM.py

src/.add_coverage_flag.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
sed -i 's/finiteVolume\/lnInclude/finiteVolume\/lnInclude -fprofile-arcs -ftest-coverage/g' Make/options
4+
sed -i 's/-lfiniteVolume/-lfiniteVolume -lgcov/g' Make/options
5+

0 commit comments

Comments
 (0)