Skip to content

Commit 00e0039

Browse files
jarevalo-ledgerjarevalo-ledger
committed
FWEO-1481 app_storage: Fix unit tests and cleanup the cmake
1 parent 1f2a6ce commit 00e0039

File tree

4 files changed

+127
-40
lines changed

4 files changed

+127
-40
lines changed

‎lib_cxng/src/cx_crc32.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "lcx_crc.h"
2222
#include "cx_ram.h"
23+
#include "ox_crc.h"
2324

2425
static uint32_t reverse_32_bits(uint32_t value)
2526
{

‎unit-tests/app_storage/CMakeLists.txt

Lines changed: 69 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ endif()
77
# project information
88
project(unit_tests
99
VERSION 0.1
10-
DESCRIPTION "Unit tests for UX_SYNC"
10+
DESCRIPTION "Unit tests for Application storage"
1111
LANGUAGES C)
1212

13-
1413
# guard against bad build-type strings
1514
if (NOT CMAKE_BUILD_TYPE)
1615
set(CMAKE_BUILD_TYPE "Debug")
@@ -22,42 +21,78 @@ ENABLE_TESTING()
2221
# specify C standard
2322
set(CMAKE_C_STANDARD 11)
2423
set(CMAKE_C_STANDARD_REQUIRED True)
25-
add_compile_definitions(SCREEN_SIZE_WALLET)
26-
add_compile_definitions(USB_SEGMENT_SIZE=64)
27-
add_compile_definitions(HAVE_NBGL)
28-
add_compile_definitions(WITH_STDIO)
29-
add_compile_definitions(HAVE_APP_STORAGE)
30-
add_compile_definitions(APP_STORAGE_SIZE=5555)
31-
add_compile_definitions(HAVE_APP_STORAGE_PROP_SETTINGS)
32-
add_compile_definitions(HAVE_APP_STORAGE_PROP_DATA)
33-
3424

35-
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall ${DEFINES} -g -O0 --coverage")
36-
37-
set(GCC_COVERAGE_LINK_FLAGS "--coverage -lgcov")
38-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
39-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
25+
set(CMAKE_BUILD_TYPE Debug)
4026

4127
# guard against in-source builds
4228
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
4329
message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt. ")
4430
endif()
4531

46-
add_compile_definitions(TEST)
47-
48-
include_directories(.)
49-
include_directories(../../target/stax/include)
50-
include_directories(../../include)
51-
include_directories(../../lib_nbgl/include)
52-
include_directories(../../lib_nbgl/include/fonts)
53-
include_directories(../../lib_ux_nbgl)
54-
include_directories(../../lib_standard_app)
55-
56-
add_executable(test_app_storage test_app_storage.c)
57-
58-
add_library(app_storage_stubs SHARED app_storage_stubs.c)
59-
add_library(app_storage SHARED ../../lib_standard_app/app_storage.c)
60-
61-
target_link_libraries(test_app_storage PUBLIC cmocka gcov app_storage app_storage_stubs)
62-
63-
add_test(test_app_storage test_app_storage)
32+
set(TEST test_app_storage)
33+
34+
add_executable(
35+
${TEST}
36+
test_app_storage.c
37+
app_storage_stubs.c
38+
../../lib_standard_app/app_storage.c
39+
../../lib_cxng/src/cx_crc32.c
40+
../../mock/src/cx_crc.c
41+
)
42+
43+
target_include_directories(
44+
${TEST}
45+
PRIVATE
46+
./
47+
../../target/stax/include
48+
../../include
49+
../../lib_cxng/include
50+
../../lib_nbgl/include
51+
../../lib_nbgl/include/fonts
52+
../../lib_ux_nbgl
53+
../../lib_standard_app
54+
../mock/include
55+
)
56+
57+
target_compile_options(
58+
${TEST}
59+
PRIVATE
60+
-Wall
61+
-Werror
62+
-O0
63+
--coverage
64+
)
65+
66+
target_compile_definitions(
67+
${TEST}
68+
PRIVATE
69+
TEST
70+
SCREEN_SIZE_WALLET
71+
USB_SEGMENT_SIZE=64
72+
HAVE_NBGL
73+
WITH_STDIO
74+
HAVE_APP_STORAGE
75+
APP_STORAGE_SIZE=5555
76+
HAVE_APP_STORAGE_PROP_SETTINGS
77+
HAVE_APP_STORAGE_PROP_DATA
78+
HAVE_CRC
79+
)
80+
81+
target_link_libraries(
82+
${TEST}
83+
PRIVATE
84+
cmocka
85+
gcov
86+
)
87+
88+
target_link_options(
89+
${TEST}
90+
PRIVATE
91+
--coverage
92+
-lgcov
93+
)
94+
95+
add_test(
96+
NAME ${TEST}
97+
COMMAND ${TEST}
98+
)

‎unit-tests/app_storage/test_app_storage.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -444,12 +444,6 @@ static void test_app_style_from_prepared(void **state __attribute__((unused)))
444444
}
445445
}
446446

447-
// big numbers + reset
448-
// starting with prepared storage
449-
// structure and accessors (app)
450-
// CI !
451-
// coverage
452-
453447
int main(int argc, char **argv)
454448
{
455449
const struct CMUnitTest tests[] = {

‎unit-tests/mock/src/cx_crc.c

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#include <stdint.h>
2+
#include <stddef.h>
3+
4+
#include "os_helpers.h"
5+
#include "ox_crc.h"
6+
7+
const uint32_t crc_poly_table[256] = {
8+
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
9+
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
10+
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
11+
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
12+
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
13+
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
14+
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
15+
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
16+
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
17+
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
18+
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
19+
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
20+
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
21+
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
22+
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
23+
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
24+
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
25+
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
26+
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
27+
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
28+
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
29+
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
30+
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
31+
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
32+
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
33+
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
34+
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
35+
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
36+
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
37+
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
38+
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
39+
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
40+
41+
static uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len)
42+
{
43+
while (len--) {
44+
crc = crc_poly_table[((uint8_t) crc ^ *(buf++))] ^ (crc >> 8);
45+
}
46+
return (crc ^ 0xffffffff);
47+
}
48+
49+
uint32_t cx_crc_hw(crc_type_t crc_type, uint32_t crc_state, const void *buf, size_t len)
50+
{
51+
UNUSED(crc_state);
52+
53+
if (CRC_TYPE_CRC32 == crc_type) {
54+
return crc32(0xFFFFFFFF, buf, len);
55+
}
56+
return 0;
57+
}

0 commit comments

Comments
 (0)