alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsodium: Enables UTs for ESP32-S2 & C3

Browse Source
This commit is contained in:
KonstantinKondrashov
2021-02-25 05:21:05 +08:00
committed by bot
parent e290d1ff41
commit e29b99f1a5
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab/ci/target-test.yml
View File

@@ -549,9 +549,16 @@ UT_046:
- ESP32_IDF - ESP32_IDF
- UT_T1_GPIO - UT_T1_GPIO
UT_047:
extends: .unit_test_esp32s2_template
parallel: 2
tags:
- ESP32S2_IDF
- UT_T1_1
UT_C3: UT_C3:
extends: .unit_test_esp32c3_template extends: .unit_test_esp32c3_template
parallel: 29 parallel: 30
tags: tags:
- ESP32C3_IDF - ESP32C3_IDF
- UT_T1_1 - UT_T1_1

6
components/libsodium/port/randombytes_esp32.c
View File

@@ -14,9 +14,9 @@
#include "randombytes_default.h" #include "randombytes_default.h"
#include "esp_system.h" #include "esp_system.h"
static const char *randombytes_esp32_implementation_name(void) static const char *randombytes_esp32xx_implementation_name(void)
{ {
return "esp32"; return CONFIG_IDF_TARGET;
} }
/* /*
@@ -27,7 +27,7 @@ static const char *randombytes_esp32_implementation_name(void)
is no need to call randombytes_set_implementation(). is no need to call randombytes_set_implementation().
*/ */
const struct randombytes_implementation randombytes_esp32_implementation = { const struct randombytes_implementation randombytes_esp32_implementation = {
.implementation_name = randombytes_esp32_implementation_name, .implementation_name = randombytes_esp32xx_implementation_name,
.random = esp_random, .random = esp_random,
.stir = NULL, .stir = NULL,
.uniform = NULL, .uniform = NULL,

2
components/libsodium/test/test_sodium.c
View File

@@ -37,7 +37,6 @@ TEST_CASE("box tests", "[libsodium]")
TEST_ASSERT_EQUAL(0, box2_xmain()); TEST_ASSERT_EQUAL(0, box2_xmain());
} }
#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
extern int ed25519_convert_xmain(void); extern int ed25519_convert_xmain(void);
TEST_CASE("ed25519_convert tests", "[libsodium][timeout=60]") TEST_CASE("ed25519_convert tests", "[libsodium][timeout=60]")
@@ -45,7 +44,6 @@ TEST_CASE("ed25519_convert tests", "[libsodium][timeout=60]")
printf("Running ed25519_convert\n"); printf("Running ed25519_convert\n");
TEST_ASSERT_EQUAL(0, ed25519_convert_xmain() ); TEST_ASSERT_EQUAL(0, ed25519_convert_xmain() );
} }
#endif
extern int sign_xmain(void); extern int sign_xmain(void);

4
tools/unit-test-app/configs/libsodium_c3 Normal file
View File

@@ -0,0 +1,4 @@
CONFIG_IDF_TARGET="esp32c3"
TEST_COMPONENTS=libsodium
TEST_EXCLUDE_COMPONENTS=bt app_update
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288

6
tools/unit-test-app/configs/libsodium_s2 Normal file
View File

@@ -0,0 +1,6 @@
CONFIG_IDF_TARGET="esp32s2"
TEST_COMPONENTS=libsodium
TEST_EXCLUDE_COMPONENTS=bt app_update
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y