From 8cc90bfbb15b9a392596c7949b77ec05f230c412 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 28 May 2019 11:48:10 +0800 Subject: [PATCH] esp_wifi: fix MD5 unit tests with CMake --- components/esp_wifi/test/CMakeLists.txt | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/components/esp_wifi/test/CMakeLists.txt b/components/esp_wifi/test/CMakeLists.txt index 26798f3f43..6f9211dcc6 100644 --- a/components/esp_wifi/test/CMakeLists.txt +++ b/components/esp_wifi/test/CMakeLists.txt @@ -5,24 +5,19 @@ set(COMPONENT_REQUIRES unity test_utils nvs_flash ulp esp_common) register_component() -idf_build_get_property(idf_path IDF_PATH) +idf_component_get_property(esp_wifi_dir esp_wifi COMPONENT_DIR) + # Calculate MD5 value of header file esp_wifi_os_adapter.h -execute_process(COMMAND md5sum ${idf_path}/components/esp_wifi/include/esp_wifi_os_adapter.h - COMMAND cut -c 1-7 - OUTPUT_VARIABLE WIFI_OS_ADAPTER_MD5 - OUTPUT_STRIP_TRAILING_WHITESPACE) +file(MD5 ${esp_wifi_dir}/include/esp_private/wifi_os_adapter.h WIFI_OS_ADAPTER_MD5) +string(SUBSTRING "${WIFI_OS_ADAPTER_MD5}" 0 7 WIFI_OS_ADAPTER_MD5) # Calculate MD5 value of header file esp_wifi_crypto_types.h -execute_process(COMMAND md5sum ${idf_path}/components/esp_wifi/include/esp_wifi_crypto_types.h - COMMAND cut -c 1-7 - OUTPUT_VARIABLE WIFI_CRYPTO_MD5 - OUTPUT_STRIP_TRAILING_WHITESPACE) +file(MD5 ${esp_wifi_dir}/include/esp_wifi_crypto_types.h WIFI_CRYPTO_MD5) +string(SUBSTRING "${WIFI_CRYPTO_MD5}" 0 7 WIFI_CRYPTO_MD5) # Calculate MD5 value of header file esp_coexist_adapter.h -execute_process(COMMAND md5sum ${idf_path}/components/esp_wifi/include/esp_coexist_adapter.h - COMMAND cut -c 1-7 - OUTPUT_VARIABLE COEX_ADAPTER_MD5 - OUTPUT_STRIP_TRAILING_WHITESPACE) +file(MD5 ${esp_wifi_dir}/include/esp_coexist_adapter.h COEX_ADAPTER_MD5) +string(SUBSTRING "${COEX_ADAPTER_MD5}" 0 7 COEX_ADAPTER_MD5) add_definitions(-DWIFI_OS_ADAPTER_MD5=\"${WIFI_OS_ADAPTER_MD5}\") add_definitions(-DWIFI_CRYPTO_MD5=\"${WIFI_CRYPTO_MD5}\")