Add test for compiling in release mode, fix warnings and errors which appeared

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd4049358a8051bbb8e6b1a61ebc42533a4e6e9d..aff9bea8d1eb0eed91bafc5bd3b77415d7d472c9 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,12 @@ build_template_app:
     # branch
     - git checkout ${CI_BUILD_REF_NAME} || echo "Using esp-idf-template default branch..."
     - make defconfig
+    # Test debug build (default)
+    - make all V=1
+    # Now test release build
+    - make clean
+    - sed -i.bak -e's/CONFIG_OPTIMIZATION_LEVEL_DEBUG\=y/CONFIG_OPTIMIZATION_LEVEL_RELEASE=y/' sdkconfig
+    - make defconfig
     - make all V=1
 
 

diff --git a/components/nghttp/library/nghttp2_session.c b/components/nghttp/library/nghttp2_session.c
index f93cd1729ba22d7895b9364095c662f11abb560d..0100dd32c44cce41d236a25123561970cc240528 100644 (file)
--- a/components/nghttp/library/nghttp2_session.c
+++ b/components/nghttp/library/nghttp2_session.c
@@ -7177,7 +7177,7 @@ uint32_t nghttp2_session_get_remote_settings(nghttp2_session *session,
     return session->remote_settings.max_header_list_size;
   }
 
-  assert(0);
+  abort();
 }
 
 static int nghttp2_session_upgrade_internal(nghttp2_session *session,

diff --git a/components/nvs_flash/src/nvs_page.cpp b/components/nvs_flash/src/nvs_page.cpp
index 4f6a198c612838884a8131439363ea9627a80403..f4fc5430cdaa594375740acc908f54dd19536f21 100644 (file)
--- a/components/nvs_flash/src/nvs_page.cpp
+++ b/components/nvs_flash/src/nvs_page.cpp
@@ -769,7 +769,7 @@ void Page::invalidateCache()
 
 void Page::debugDump() const
 {
-    printf("state=%x addr=%x seq=%d\nfirstUsed=%d nextFree=%d used=%d erased=%d\n", mState, mBaseAddress, mSeqNumber, static_cast<int>(mFirstUsedEntry), static_cast<int>(mNextFreeEntry), mUsedEntryCount, mErasedEntryCount);
+    printf("state=%x addr=%x seq=%d\nfirstUsed=%d nextFree=%d used=%d erased=%d\n", (int) mState, mBaseAddress, mSeqNumber, static_cast<int>(mFirstUsedEntry), static_cast<int>(mNextFreeEntry), mUsedEntryCount, mErasedEntryCount);
     size_t skip = 0;
     for (size_t i = 0; i < ENTRY_COUNT; ++i) {
         printf("%3d: ", static_cast<int>(i));

diff --git a/components/nvs_flash/src/nvs_pagemanager.cpp b/components/nvs_flash/src/nvs_pagemanager.cpp
index 790ab7e19f8b15211c9de198832c93037c1ab887..f4d02a7d4056165868602803440c3633898464c7 100644 (file)
--- a/components/nvs_flash/src/nvs_pagemanager.cpp
+++ b/components/nvs_flash/src/nvs_pagemanager.cpp
@@ -49,7 +49,7 @@ esp_err_t PageManager::load(uint32_t baseSector, uint32_t sectorCount)
         return activatePage();
     } else {
         uint32_t lastSeqNo;
-        assert(mPageList.back().getSeqNumber(lastSeqNo) == ESP_OK);
+        ESP_ERROR_CHECK( mPageList.back().getSeqNumber(lastSeqNo) );
         mSeqNumber = lastSeqNo + 1;
     }
 
@@ -142,7 +142,9 @@ esp_err_t PageManager::requestNewPage()
     Page* newPage = &mPageList.back();
 
     Page* erasedPage = maxErasedItemsPageIt;
+#ifndef NDEBUG
     size_t usedEntries = erasedPage->getUsedEntryCount();
+#endif
     err = erasedPage->markFreeing();
     if (err != ESP_OK) {
         return err;

diff --git a/components/nvs_flash/src/nvs_storage.cpp b/components/nvs_flash/src/nvs_storage.cpp
index 4a217ebe18d7c0e8c549d9238b6ec58cb646f5ba..eb90cac5bc2a76a6f3d84e4bda4b5bbd23743839 100644 (file)
--- a/components/nvs_flash/src/nvs_storage.cpp
+++ b/components/nvs_flash/src/nvs_storage.cpp
@@ -123,8 +123,7 @@ esp_err_t Storage::writeItem(uint8_t nsIndex, ItemType datatype, const char* key
     if (findPage) {
         if (findPage->state() == Page::PageState::UNINITIALIZED ||
                 findPage->state() == Page::PageState::INVALID) {
-            auto err = findItem(nsIndex, datatype, key, findPage, item);
-            assert(err == ESP_OK);
+            ESP_ERROR_CHECK( findItem(nsIndex, datatype, key, findPage, item) );
         }
         err = findPage->eraseItem(nsIndex, datatype, key);
         if (err == ESP_ERR_FLASH_OP_FAIL) {