From 9077c74d259f61c0df58983a8208e21074605204 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:06:57 -0500 Subject: [PATCH 01/14] Testing Code Coverage --- .github/workflows/validation.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 8115647c..a9f386d8 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -2,7 +2,7 @@ name: Validation Tests on: push: - branches: [ collab_main ] + branches: [ build_changes ] pull_request: env: @@ -38,4 +38,16 @@ jobs: working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ${{github.workspace}}/build/bin/et_dt_validation \ No newline at end of file + run: ${{github.workspace}}/build/bin/et_dt_validation + + - name: Code Coverage + working-directory: ${{github.workspace}}/build + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: make gcov + + - name: Upload + working-directory: ${{github.workspace}}/build/coverage + uses: codecov/codecov-action@v1 + with: + files: ./crypto_aos.c.gcov ./crypto_config.c.gcov ./crypto_mc.c.gcov ./crypto_tc.c.gcov ./crypto_user.c.gcov ./crypto.c.gcov ./crypto_key_mgmt.c.gcov ./crypto_print.c.gcov ./crypto_tm.c.gcov ./sadb_routine_inmemory.template.c.gcov \ No newline at end of file From 1911218c3a9b8fe39f1aabc0c771760834887997 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:14:34 -0500 Subject: [PATCH 02/14] Testing Code Coverage --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index a9f386d8..7a7c2024 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -47,7 +47,7 @@ jobs: run: make gcov - name: Upload - working-directory: ${{github.workspace}}/build/coverage uses: codecov/codecov-action@v1 + working-directory: ${{github.workspace}}/build/coverage with: files: ./crypto_aos.c.gcov ./crypto_config.c.gcov ./crypto_mc.c.gcov ./crypto_tc.c.gcov ./crypto_user.c.gcov ./crypto.c.gcov ./crypto_key_mgmt.c.gcov ./crypto_print.c.gcov ./crypto_tm.c.gcov ./sadb_routine_inmemory.template.c.gcov \ No newline at end of file From 7f2fdf66e62cc25167ac0fd61a0c15755c9cd040 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:16:24 -0500 Subject: [PATCH 03/14] Testing Code Coverage --- .github/workflows/validation.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 7a7c2024..2e3da950 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -48,6 +48,5 @@ jobs: - name: Upload uses: codecov/codecov-action@v1 - working-directory: ${{github.workspace}}/build/coverage with: - files: ./crypto_aos.c.gcov ./crypto_config.c.gcov ./crypto_mc.c.gcov ./crypto_tc.c.gcov ./crypto_user.c.gcov ./crypto.c.gcov ./crypto_key_mgmt.c.gcov ./crypto_print.c.gcov ./crypto_tm.c.gcov ./sadb_routine_inmemory.template.c.gcov \ No newline at end of file + files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file From b9ccde2bd9464fa30faf84f37ef8ffc9ba97d5d0 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:17:45 -0500 Subject: [PATCH 04/14] Testing Code Coverage --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 2e3da950..b0368be4 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - name: Install Dependencies - run: sudo apt-get install -y libgpg-error-dev libgcrypt20-dev python3 + run: sudo apt-get install -y libgpg-error-dev libgcrypt20-dev python3 lcov - name: Install Python Libraries run: sudo pip install pycryptodome From a1082c40f2c37444edb82ef74f3ea49e2b835efa Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:22:54 -0500 Subject: [PATCH 05/14] Testing Code Coverage --- .github/workflows/validation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index b0368be4..292500ba 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -40,13 +40,14 @@ jobs: # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: ${{github.workspace}}/build/bin/et_dt_validation - - name: Code Coverage + - name: Code-Coverage working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: make gcov - name: Upload + needs: Code-Coverage uses: codecov/codecov-action@v1 with: files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file From 4750dfe2c9e102eae4a62f482992c0a8626656d6 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:24:04 -0500 Subject: [PATCH 06/14] Testing Code Coverage --- .github/workflows/validation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 292500ba..dcaf2cff 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -47,7 +47,7 @@ jobs: run: make gcov - name: Upload - needs: Code-Coverage - uses: codecov/codecov-action@v1 - with: - files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file + needs: Code-Coverage + uses: codecov/codecov-action@v1 + with: + files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file From 51f6624f0b78dfb713786bf1b79d2bb207eaa24a Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:28:05 -0500 Subject: [PATCH 07/14] Testing Code Coverage --- .github/workflows/validation.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index dcaf2cff..7428f22a 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -45,9 +45,10 @@ jobs: # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: make gcov + run: ls + run: ls ./coverage - - name: Upload - needs: Code-Coverage - uses: codecov/codecov-action@v1 - with: - files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file + # - name: Upload + # uses: codecov/codecov-action@v1 + # with: + # files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file From bd306ad22f7734dacb23e83748b14a21170afefe Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:28:58 -0500 Subject: [PATCH 08/14] Testing Code Coverage --- .github/workflows/validation.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 7428f22a..d4090a00 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -44,9 +44,7 @@ jobs: working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: make gcov - run: ls - run: ls ./coverage + run: make gcov && ls && ls ./coverage # - name: Upload # uses: codecov/codecov-action@v1 From 78ffcc7722edf6d75b73ea80d1aabc18a4eb12d4 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:32:39 -0500 Subject: [PATCH 09/14] Testing Code Coverage --- .github/workflows/validation.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index d4090a00..318bf691 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -44,9 +44,10 @@ jobs: working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: make gcov && ls && ls ./coverage + run: make gcov - # - name: Upload - # uses: codecov/codecov-action@v1 - # with: - # files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file + - name: Upload + working-directory: ${{github.workspace}}/build + uses: codecov/codecov-action@v1 + with: + files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file From d7848c08d0bb904c474aa69c1062d6671d38c4b7 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:33:55 -0500 Subject: [PATCH 10/14] Testing Code Coverage --- .github/workflows/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 318bf691..71334927 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -47,7 +47,7 @@ jobs: run: make gcov - name: Upload - working-directory: ${{github.workspace}}/build uses: codecov/codecov-action@v1 with: - files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov \ No newline at end of file + files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov + run: ls ${{github.workspace}}/build/coverage/ \ No newline at end of file From b0f349572bbc01b98d7dd496255192d2c1093b87 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:34:54 -0500 Subject: [PATCH 11/14] Testing Code Coverage --- .github/workflows/validation.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 71334927..7d929d6c 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -46,8 +46,11 @@ jobs: # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: make gcov + - name: Verify DIR + working-directory: ${{github.workspace}}/build + run: ls ./coverage + - name: Upload uses: codecov/codecov-action@v1 with: files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov - run: ls ${{github.workspace}}/build/coverage/ \ No newline at end of file From fbd02a0b9038adcdf9a2944096d3223957832158 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:36:55 -0500 Subject: [PATCH 12/14] Testing Code Coverage --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 7d929d6c..6a6ae787 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -48,7 +48,7 @@ jobs: - name: Verify DIR working-directory: ${{github.workspace}}/build - run: ls ./coverage + run: pwd && ls ./coverage - name: Upload uses: codecov/codecov-action@v1 From 4ff224507b59f473150dbc44dfe5479fa663a8aa Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:45:09 -0500 Subject: [PATCH 13/14] Testing Code Coverage --- .github/workflows/validation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 6a6ae787..fa69e20f 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -53,4 +53,5 @@ jobs: - name: Upload uses: codecov/codecov-action@v1 with: - files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov ${{github.workspace}}/build/coverage/crypto_config.c.gcov ${{github.workspace}}/build/coverage/crypto_mc.c.gcov ${{github.workspace}}/build/coverage/crypto_tc.c.gcov ${{github.workspace}}/build/coverage/crypto_user.c.gcov ${{github.workspace}}/build/coverage/crypto.c.gcov ${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov ${{github.workspace}}/build/coverage/crypto_print.c.gcov ${{github.workspace}}/build/coverage/crypto_tm.c.gcov ${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov + #files: ${{github.workspace}}/build/coverage/crypto_aos.c.gcov,${{github.workspace}}/build/coverage/crypto_config.c.gcov,${{github.workspace}}/build/coverage/crypto_mc.c.gcov,${{github.workspace}}/build/coverage/crypto_tc.c.gcov,${{github.workspace}}/build/coverage/crypto_user.c.gcov,${{github.workspace}}/build/coverage/crypto.c.gcov,${{github.workspace}}/build/coverage/crypto_key_mgmt.c.gcov,${{github.workspace}}/build/coverage/crypto_print.c.gcov,${{github.workspace}}/build/coverage/crypto_tm.c.gcov,${{github.workspace}}/build/coverage/sadb_routine_inmemory.template.c.gcov + files: 'coverage/*.c.gcov' From 04754aba7ccc89da6ad96682770bcaaa9b9fd048 Mon Sep 17 00:00:00 2001 From: Robert Brown Date: Tue, 21 Dec 2021 14:53:22 -0500 Subject: [PATCH 14/14] Adding Code Coverage for PR --- .github/workflows/validation.yml | 6 +----- README.md | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index fa69e20f..9349c73e 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -2,7 +2,7 @@ name: Validation Tests on: push: - branches: [ build_changes ] + branches: [ collab_main ] pull_request: env: @@ -45,10 +45,6 @@ jobs: # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: make gcov - - - name: Verify DIR - working-directory: ${{github.workspace}}/build - run: pwd && ls ./coverage - name: Upload uses: codecov/codecov-action@v1 diff --git a/README.md b/README.md index a14efcf6..ab99a0cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Build](https://github.com/nasa/CryptoLib/actions/workflows/build.yml/badge.svg) ![Unit Tests](https://github.com/nasa/CryptoLib/actions/workflows/utest.yml/badge.svg) ![Validation Tests](https://github.com/nasa/CryptoLib/actions/workflows/validation.yml/badge.svg) +![Build](https://github.com/nasa/CryptoLib/actions/workflows/build.yml/badge.svg) ![Unit Tests](https://github.com/nasa/CryptoLib/actions/workflows/utest.yml/badge.svg) ![Validation Tests](https://github.com/nasa/CryptoLib/actions/workflows/validation.yml/badge.svg) [![CodeCov](https://codecov.io/gh/nasa/CryptoLib/branch/main/graph/badge.svg?token=KCOMCQO0ZU)](https://codecov.io/gh/nasa/CryptoLib) # CryptoLib