From 095a6ae78f6697df78e4efc52d57f13e2eb8e602 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 18 Sep 2024 10:19:57 -0600 Subject: [PATCH 1/6] splitting code coverage --- .github/workflows/developer.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 574f2a40..61e30222 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: true matrix: - config: ["asan/code coverage", "memcheck"] + config: ["asan", "code coverage", "memcheck"] steps: - name: install-dependencies @@ -49,7 +49,16 @@ jobs: key: data-2 - name: asan - if: matrix.config == 'asan/code coverage' + if: matrix.config == 'asan' + run: | + set -x + export CC=gcc + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug + cmake --build g2c/build --parallel 2 --verbose + ctest --test-dir g2c/build --verbose --output-on-failure --rerun-failed + + - name: code_coverage + if: matrix.config == 'code coverage' run: | set -x export CC=gcc @@ -76,7 +85,7 @@ jobs: cp $GITHUB_WORKSPACE/g2c/build/tests/data/* ~/data - name: upload-test-coverage - if: matrix.config == 'asan/code coverage' + if: matrix.config == 'code coverage' uses: actions/upload-artifact@v4 with: name: g2c-test-coverage From 78622fd28082f7eeacea43926e83db6511b97d5d Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 18 Sep 2024 10:25:06 -0600 Subject: [PATCH 2/6] fixed flags --- .github/workflows/developer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 61e30222..2ee02fce 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -53,7 +53,7 @@ jobs: run: | set -x export CC=gcc - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-Werror -g -O0 -fsanitize=address -fno-omit-frame-pointer" cmake --build g2c/build --parallel 2 --verbose ctest --test-dir g2c/build --verbose --output-on-failure --rerun-failed @@ -62,7 +62,7 @@ jobs: run: | set -x export CC=gcc - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0" cmake --build g2c/build --parallel 2 --verbose ctest --test-dir g2c/build --verbose --output-on-failure --rerun-failed gcovr --root g2c -v --html-details --exclude g2c/tests --exclude g2c/build/CMakeFiles --print-summary -o test-coverage.html @@ -73,7 +73,7 @@ jobs: run: | set -x export LD_LIBRARY_PATH="/home/runner/jasper/lib:$LD_LIBRARY_PATH" - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g" cmake --build g2c/build --parallel 2 --verbose ctest --test-dir g2c/build ls -l g2c/build From 2c503ecfb8b1a42ce3f90a45c7451eac260ad20d Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 18 Sep 2024 13:21:31 -0600 Subject: [PATCH 3/6] debugging code coverage --- .github/workflows/developer.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 2ee02fce..087916ef 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -62,9 +62,10 @@ jobs: run: | set -x export CC=gcc - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0" - cmake --build g2c/build --parallel 2 --verbose - ctest --test-dir g2c/build --verbose --output-on-failure --rerun-failed + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0" + cd g2c/build + make VERBOSE=1 + ctest --verbose --output-on-failure --rerun-failed gcovr --root g2c -v --html-details --exclude g2c/tests --exclude g2c/build/CMakeFiles --print-summary -o test-coverage.html ls -l From f318143617878c06509f7891a789d5d1cf9151e1 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 18 Sep 2024 13:53:15 -0600 Subject: [PATCH 4/6] debugging code coverage --- .github/workflows/developer.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 087916ef..7ec0e27c 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: true matrix: - config: ["asan", "code coverage", "memcheck"] + config: ["asan", "code coverage", "memcheck", "docs"] steps: - name: install-dependencies @@ -63,11 +63,12 @@ jobs: set -x export CC=gcc cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0" + pwd cd g2c/build make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed gcovr --root g2c -v --html-details --exclude g2c/tests --exclude g2c/build/CMakeFiles --print-summary -o test-coverage.html - ls -l + ls -l g2c/build/src - name: memcheck if: matrix.config == 'memcheck' @@ -79,6 +80,15 @@ jobs: ctest --test-dir g2c/build ls -l g2c/build + - name: docs + if: matrix.config == 'docs' + run: | + set -x + export LD_LIBRARY_PATH="/home/runner/jasper/lib:$LD_LIBRARY_PATH" + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DENABLE_DOCS=On -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g" + cmake --build g2c/build --parallel 2 --verbose + ls -l g2c/build/docs/html + - name: cache-data if: steps.cache-data.outputs.cache-hit != 'true' run: | @@ -93,3 +103,9 @@ jobs: path: | *.html *.css + - uses: actions/upload-artifact@v4 + if: matrix.config == 'docs' + with: + name: docs + path: | + g2c/build/docs/html From 55d153d6ad97fe441e31f0af976885b40f886305 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 18 Sep 2024 14:18:51 -0600 Subject: [PATCH 5/6] debugging code coverage --- .github/workflows/developer.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 7ec0e27c..61c8ffe3 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -67,8 +67,10 @@ jobs: cd g2c/build make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed - gcovr --root g2c -v --html-details --exclude g2c/tests --exclude g2c/build/CMakeFiles --print-summary -o test-coverage.html - ls -l g2c/build/src + gcovr --root . -v --html-details --exclude tests --exclude CMakeFiles --print-summary -o test-coverage.html + pwd + ls -l + ls -l src - name: memcheck if: matrix.config == 'memcheck' From c26f12ef0efe8429800ee3ecfc268a90434bbf62 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 18 Sep 2024 14:42:03 -0600 Subject: [PATCH 6/6] debugging code coverage --- .github/workflows/developer.yml | 8 ++++---- tests/tst_degrib2_ftp_all.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 61c8ffe3..589806dc 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -53,7 +53,7 @@ jobs: run: | set -x export CC=gcc - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-Werror -g -O0 -fsanitize=address -fno-omit-frame-pointer" + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-Werror -g -O0 -fsanitize=address -fno-omit-frame-pointer" cmake --build g2c/build --parallel 2 --verbose ctest --test-dir g2c/build --verbose --output-on-failure --rerun-failed @@ -62,12 +62,12 @@ jobs: run: | set -x export CC=gcc - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0" + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DFTP_LARGE_TEST_FILES=OFF -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug-DCMAKE_C_FLAGS="-g -fprofile-arcs -ftest-coverage -fprofile-abs-path -O0" pwd cd g2c/build make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed - gcovr --root . -v --html-details --exclude tests --exclude CMakeFiles --print-summary -o test-coverage.html + gcovr --root .. -v --html-details --exclude tests --exclude CMakeFiles --print-summary -o test-coverage.html pwd ls -l ls -l src @@ -77,7 +77,7 @@ jobs: run: | set -x export LD_LIBRARY_PATH="/home/runner/jasper/lib:$LD_LIBRARY_PATH" - cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DENABLE_DOCS=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g" + cmake -S g2c -B g2c/build -DUSE_AEC=ON -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=ON -DLOGGING=On -DPTHREADS=ON -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-g" cmake --build g2c/build --parallel 2 --verbose ctest --test-dir g2c/build ls -l g2c/build diff --git a/tests/tst_degrib2_ftp_all.c b/tests/tst_degrib2_ftp_all.c index bd7ea929..dbf73afd 100644 --- a/tests/tst_degrib2_ftp_all.c +++ b/tests/tst_degrib2_ftp_all.c @@ -42,7 +42,7 @@ main() int f; int t; int ret; - g2c_set_log_level(15); + /* g2c_set_log_level(15); */ /* for (f = 0; f < NUM_FILES; f++) */ for (f = 0; f < 1; f++)