From e29b99f1a516bbaf65f56c63b8b2c8d8a2eb396c Mon Sep 17 00:00:00 2001
From: KonstantinKondrashov <konstantin@espressif.com>
Date: Thu, 25 Feb 2021 05:21:05 +0800
Subject: [PATCH] libsodium: Enables UTs for ESP32-S2 & C3

---
 .gitlab/ci/target-test.yml                    | 9 ++++++++-
 components/libsodium/port/randombytes_esp32.c | 6 +++---
 components/libsodium/test/test_sodium.c       | 2 --
 tools/unit-test-app/configs/libsodium_c3      | 4 ++++
 tools/unit-test-app/configs/libsodium_s2      | 6 ++++++
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 tools/unit-test-app/configs/libsodium_c3
 create mode 100644 tools/unit-test-app/configs/libsodium_s2

diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index d872f3eae7..eaf1d76124 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -549,9 +549,16 @@ UT_046:
     - ESP32_IDF
     - UT_T1_GPIO
 
+UT_047:
+  extends: .unit_test_esp32s2_template
+  parallel: 2
+  tags:
+    - ESP32S2_IDF
+    - UT_T1_1
+
 UT_C3:
   extends: .unit_test_esp32c3_template
-  parallel: 29
+  parallel: 30
   tags:
     - ESP32C3_IDF
     - UT_T1_1
diff --git a/components/libsodium/port/randombytes_esp32.c b/components/libsodium/port/randombytes_esp32.c
index a35a99dec0..572a4275c4 100644
--- a/components/libsodium/port/randombytes_esp32.c
+++ b/components/libsodium/port/randombytes_esp32.c
@@ -14,9 +14,9 @@
 #include "randombytes_default.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().
 */
 const struct randombytes_implementation randombytes_esp32_implementation = {
-    .implementation_name = randombytes_esp32_implementation_name,
+    .implementation_name = randombytes_esp32xx_implementation_name,
     .random = esp_random,
     .stir = NULL,
     .uniform = NULL,
diff --git a/components/libsodium/test/test_sodium.c b/components/libsodium/test/test_sodium.c
index 470007b9a8..f7f37d509f 100644
--- a/components/libsodium/test/test_sodium.c
+++ b/components/libsodium/test/test_sodium.c
@@ -37,7 +37,6 @@ TEST_CASE("box tests", "[libsodium]")
     TEST_ASSERT_EQUAL(0, box2_xmain());
 }
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2)
 extern int ed25519_convert_xmain(void);
 
 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");
     TEST_ASSERT_EQUAL(0, ed25519_convert_xmain() );
 }
-#endif
 
 extern int sign_xmain(void);
 
diff --git a/tools/unit-test-app/configs/libsodium_c3 b/tools/unit-test-app/configs/libsodium_c3
new file mode 100644
index 0000000000..672d21cce5
--- /dev/null
+++ b/tools/unit-test-app/configs/libsodium_c3
@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32c3"
+TEST_COMPONENTS=libsodium
+TEST_EXCLUDE_COMPONENTS=bt app_update
+CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
diff --git a/tools/unit-test-app/configs/libsodium_s2 b/tools/unit-test-app/configs/libsodium_s2
new file mode 100644
index 0000000000..1d3d7d9ba6
--- /dev/null
+++ b/tools/unit-test-app/configs/libsodium_s2
@@ -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