Browse Source

Merge branch 'bugfix/fatfs_unit_tests_linker_issue' into 'master'

ut: Workaround RISC-V linker issue with c3 unit tests

See merge request espressif/esp-idf!13053
Angus Gratton 4 years ago
parent
commit
6abe0c6db9

+ 0 - 5
components/esp_event/test/CMakeLists.txt

@@ -1,8 +1,3 @@
 idf_component_register(SRC_DIRS "."
                        PRIV_INCLUDE_DIRS . ../private_include
                        PRIV_REQUIRES cmock test_utils esp_event driver)
-
-if(CONFIG_IDF_TARGET_ARCH_RISCV)
-    # Temporary workaround for a linker issue on RISC-V that should be resolved in binutils 2.35 (internal ref: GCC-101)
-    target_compile_options(${COMPONENT_LIB} PRIVATE -mno-relax)
-endif()

+ 1 - 1
tools/unit-test-app/configs/default_2_c3

@@ -1,3 +1,3 @@
 # This config is split between targets since different component needs to be excluded (esp32, esp32s2)
 CONFIG_IDF_TARGET="esp32c3"
-TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32c3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon esp-tls
+TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32c3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon esp-tls test_utils