From 5cae44df924531a9e503920c5f0414801bca2445 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 17 Sep 2022 10:13:01 +0200 Subject: [PATCH 1/5] ci: convert valgrind to cmake --- .github/workflows/valgrind.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index ba6fb3a36..054e8e434 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -14,7 +14,7 @@ jobs: sudo apt-get update && sudo apt-get install -y libssl-dev valgrind - name: make - run: make EXTRA_CFLAGS=-Werror CCACHE= + run: cmake . && make - uses: sreimers/pr-dependency-action@v0.5 with: @@ -37,5 +37,5 @@ jobs: rm re/libre.dylib || true make -C rem librem.a cd retest - make + cmake . && make valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./retest -r From 6e7988c5b90aec13a1bcf269b374287a73c30c16 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 17 Sep 2022 10:22:37 +0200 Subject: [PATCH 2/5] valgrind: use cmake build --- .github/workflows/valgrind.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 054e8e434..6b82134f6 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -37,5 +37,5 @@ jobs: rm re/libre.dylib || true make -C rem librem.a cd retest - cmake . && make + cmake -B build && cmake --build build -j valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./retest -r From 9a31f12a3da466ac4c3c50299acb0fad6e330f4d Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 17 Sep 2022 10:30:59 +0200 Subject: [PATCH 3/5] valgrind: minor fixes --- .github/workflows/valgrind.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 6b82134f6..19d217b61 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -14,7 +14,8 @@ jobs: sudo apt-get update && sudo apt-get install -y libssl-dev valgrind - name: make - run: cmake . && make + run: | + cmake -B build && cmake --build build -j - uses: sreimers/pr-dependency-action@v0.5 with: @@ -38,4 +39,4 @@ jobs: make -C rem librem.a cd retest cmake -B build && cmake --build build -j - valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./retest -r + valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./build/retest -r From 2536307a3b4b355b44c56b0ac369011894d23616 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 17 Sep 2022 11:21:03 +0200 Subject: [PATCH 4/5] valgrind: build rem with cmake --- .github/workflows/valgrind.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 19d217b61..56caba4f5 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -34,9 +34,7 @@ jobs: - name: retest run: | cd .. - rm re/libre.so || true - rm re/libre.dylib || true - make -C rem librem.a + cmake -S rem -B rem/build && cmake --build rem/build cd retest cmake -B build && cmake --build build -j valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./build/retest -r From 390dd95ea2497e1fd649a31dd71182367dca4f89 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sat, 17 Sep 2022 11:25:34 +0200 Subject: [PATCH 5/5] coverage: enable verbose retest --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d1e427b4c..47618d576 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -40,7 +40,7 @@ jobs: rm re/libre.dylib || true make -C rem librem.a cd retest; cmake -B build -DCMAKE_EXE_LINKER_FLAGS="--coverage" && \ - cmake --build build -j && ./build/retest -a + cmake --build build -j && ./build/retest -v -a - name: gcov run: |