Skip to content

Commit 73182a7

Browse files
DakshitBabbarDakshitBabbar
authored
Merge pull request #39 from DakshitBabbar/esp32-ci-updates
Updates for clean build with latest ESP-IDF v5.4
2 parents 0f9f984 + 935c734 commit 73182a7

File tree

5 files changed

+55
-32
lines changed

5 files changed

+55
-32
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- name: Run Coverage
2929
run: |
3030
make -C build/ coverage
31-
declare -a EXCLUDE=("\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*vendor/unity\*" "\*_deps\*")
31+
declare -a EXCLUDE=("\*_deps\*")
3232
echo ${EXCLUDE[@]} | xargs lcov --rc lcov_branch_coverage=1 -r build/coverage.info -o build/coverage.info
33-
lcov --rc lcov_branch_coverage=1 --list build/coverage.info
33+
lcov --rc lcov_branch_coverage=1 --summary build/coverage.info
3434
- name: Check Coverage
3535
uses: FreeRTOS/CI-CD-Github-Actions/coverage-cop@main
3636
with:
@@ -63,7 +63,7 @@ jobs:
6363
with:
6464
path: ./
6565
formatting:
66-
runs-on: ubuntu-20.04
66+
runs-on: ubuntu-latest
6767
steps:
6868
- uses: actions/checkout@v3
6969
- name: Check formatting
@@ -93,7 +93,10 @@ jobs:
9393
- name: Clone coreJSON
9494
run: git clone https://github.com/FreeRTOS/coreJSON.git --depth 1 --branch v3.2.0
9595
- name: Clone tinycbor
96-
run: git clone https://github.com/intel/tinycbor.git --depth 1 --branch main
96+
run: |
97+
git clone https://github.com/intel/tinycbor.git
98+
cd tinycbor
99+
git checkout 9924cfed3b95ad6de299ae675064430fdb886216
97100
- name: Install Python3
98101
uses: actions/setup-python@v3
99102
with:

‎docs/doxygen/include/size_table.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</tr>
1515
<tr>
1616
<td>MQTTFileDownloader_cbor.c</td>
17-
<td><center>0.8K</center></td>
17+
<td><center>0.7K</center></td>
1818
<td><center>0.6K</center></td>
1919
</tr>
2020
<tr>
@@ -29,12 +29,12 @@
2929
</tr>
3030
<tr>
3131
<td>cborparser.c</td>
32-
<td><center>2.8K</center></td>
33-
<td><center>2.2K</center></td>
32+
<td><center>1.9K</center></td>
33+
<td><center>1.7K</center></td>
3434
</tr>
3535
<tr>
3636
<td>cborencoder.c</td>
37-
<td><center>2.0K</center></td>
37+
<td><center>1.7K</center></td>
3838
<td><center>0.7K</center></td>
3939
</tr>
4040
<tr>
@@ -44,7 +44,7 @@
4444
</tr>
4545
<tr>
4646
<td><b>Total estimates</b></td>
47-
<td><b><center>10.3K</center></b></td>
48-
<td><b><center>7.6K</center></b></td>
47+
<td><b><center>9.0K</center></b></td>
48+
<td><b><center>7.1K</center></b></td>
4949
</tr>
5050
</table>

‎source/MQTTFileDownloader_cbor.c‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ bool CBOR_Decode_GetStreamResponseMessage( const uint8_t * messageBuffer,
7171
CborParser parser;
7272
CborValue value, cborMap;
7373
size_t payloadSizeReceived = 0;
74+
int variableBuffer = 0;
7475

7576
if( ( fileId == NULL ) || ( blockId == NULL ) || ( blockSize == NULL ) ||
7677
( payload == NULL ) || ( payloadSize == NULL ) ||
@@ -114,7 +115,9 @@ bool CBOR_Decode_GetStreamResponseMessage( const uint8_t * messageBuffer,
114115

115116
if( CborNoError == cborResult )
116117
{
117-
cborResult = cbor_value_get_int( &value, ( int32_t * ) fileId );
118+
variableBuffer = ( int ) *fileId;
119+
cborResult = cbor_value_get_int( &value, &variableBuffer );
120+
*fileId = ( int32_t ) variableBuffer;
118121
}
119122

120123
/* Find the block ID. */
@@ -132,7 +135,9 @@ bool CBOR_Decode_GetStreamResponseMessage( const uint8_t * messageBuffer,
132135

133136
if( CborNoError == cborResult )
134137
{
135-
cborResult = cbor_value_get_int( &value, ( int32_t * ) blockId );
138+
variableBuffer = ( int ) *blockId;
139+
cborResult = cbor_value_get_int( &value, &variableBuffer );
140+
*blockId = ( int32_t ) variableBuffer;
136141
}
137142

138143
/* Find the block size. */
@@ -150,7 +155,9 @@ bool CBOR_Decode_GetStreamResponseMessage( const uint8_t * messageBuffer,
150155

151156
if( CborNoError == cborResult )
152157
{
153-
cborResult = cbor_value_get_int( &value, ( int32_t * ) blockSize );
158+
variableBuffer = ( int ) *blockSize;
159+
cborResult = cbor_value_get_int( &value, &variableBuffer );
160+
*blockSize = ( int32_t ) variableBuffer;
154161
}
155162

156163
/* Find the payload bytes. */

‎tools/cmock/coverage.cmake‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
# Taken from amazon-freertos repository
22
cmake_minimum_required(VERSION 3.13)
33
set(BINARY_DIR ${CMAKE_BINARY_DIR})
4+
45
# reset coverage counters
56
execute_process(
6-
COMMAND lcov --directory ${CMAKE_BINARY_DIR} --base-directory
7-
${CMAKE_BINARY_DIR} --zerocounters
7+
COMMAND lcov --directory ${CMAKE_BINARY_DIR}
8+
--base-directory ${CMAKE_BINARY_DIR}
9+
--zerocounters
810
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/coverage)
9-
# make the initial/baseline capture a zeroed out files
11+
12+
# make the initial/baseline capture a zeroed out files
1013
execute_process(
11-
COMMAND
12-
lcov --directory ${CMAKE_BINARY_DIR} --base-directory ${CMAKE_BINARY_DIR}
13-
--initial --capture --rc lcov_branch_coverage=1 --rc
14-
genhtml_branch_coverage=1
15-
--output-file=${CMAKE_BINARY_DIR}/base_coverage.info)
16-
file(GLOB files "${CMAKE_BINARY_DIR}/bin/tests/*")
14+
COMMAND lcov --directory ${CMAKE_BINARY_DIR}
15+
--base-directory ${CMAKE_BINARY_DIR}
16+
--initial
17+
--capture
18+
--rc lcov_branch_coverage=1
19+
--rc genhtml_branch_coverage=1
20+
--output-file=${CMAKE_BINARY_DIR}/base_coverage.info
21+
--include "*source*")
1722

23+
file(GLOB files "${CMAKE_BINARY_DIR}/bin/tests/*")
1824
set(REPORT_FILE ${CMAKE_BINARY_DIR}/utest_report.txt)
1925
file(WRITE ${REPORT_FILE} "")
26+
2027
# execute all files in bin directory, gathering the output to show it in CI
2128
foreach(testname ${files})
2229
get_filename_component(test ${testname} NAME_WLE)
@@ -34,18 +41,24 @@ execute_process(COMMAND ruby ${CMOCK_DIR}/vendor/unity/auto/parse_output.rb -xml
3441

3542
# capture data after running the tests
3643
execute_process(
37-
COMMAND
38-
lcov --capture --rc lcov_branch_coverage=1 --rc genhtml_branch_coverage=1
39-
--base-directory ${CMAKE_BINARY_DIR} --directory ${CMAKE_BINARY_DIR}
40-
--output-file ${CMAKE_BINARY_DIR}/second_coverage.info)
44+
COMMAND lcov --capture
45+
--rc lcov_branch_coverage=1
46+
--rc genhtml_branch_coverage=1
47+
--base-directory ${CMAKE_BINARY_DIR}
48+
--directory ${CMAKE_BINARY_DIR}
49+
--output-file ${CMAKE_BINARY_DIR}/second_coverage.info
50+
--include "*source*")
4151

4252
# combile baseline results (zeros) with the one after running the tests
4353
execute_process(
44-
COMMAND
45-
lcov --base-directory ${CMAKE_BINARY_DIR} --directory ${CMAKE_BINARY_DIR}
46-
--add-tracefile ${CMAKE_BINARY_DIR}/base_coverage.info --add-tracefile
47-
${CMAKE_BINARY_DIR}/second_coverage.info --output-file
48-
${CMAKE_BINARY_DIR}/coverage.info --no-external --rc lcov_branch_coverage=1)
54+
COMMAND lcov --base-directory ${CMAKE_BINARY_DIR}
55+
--directory ${CMAKE_BINARY_DIR}
56+
--add-tracefile ${CMAKE_BINARY_DIR}/base_coverage.info
57+
--add-tracefile ${CMAKE_BINARY_DIR}/second_coverage.info
58+
--output-file ${CMAKE_BINARY_DIR}/coverage.info
59+
--no-external
60+
--rc lcov_branch_coverage=1)
61+
4962
execute_process(
5063
COMMAND
5164
genhtml --rc lcov_branch_coverage=1 --branch-coverage --output-directory

‎tools/coverity/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ For generating the report as outlined below, we have used Coverity version 2023.
99

1010
## Getting Started
1111
### Prerequisites
12-
You can run this on a platform supported by Coverity. The list and other details can be found [here](https://sig-docs.synopsys.com/polaris/topics/c_coverity-compatible-platforms.html).
12+
You can run this on a platform supported by Coverity. The list and other details can be found [here](https://documentation.blackduck.com/bundle/coverity-docs-2024.9/page/deploy-install-guide/topics/supported_platforms_for_coverity_analysis.html).
1313
To compile and run the Coverity target successfully, you must have the following:
1414

1515
1. CMake version >= 3.16.0 (You can check whether you have this by typing `cmake --version`)

0 commit comments

Comments
 (0)