From 9784df1c3a52592ecfd14a30d75cbad934dffa2e Mon Sep 17 00:00:00 2001 From: David Cermak Date: Wed, 12 Sep 2018 15:52:38 +0200 Subject: [PATCH] asio: examples renamed to have consistent binary names when build in make and CMake --- .../bluetooth/ble_throughput/throughput_server/Makefile | 2 +- examples/mesh/internal_communication/CMakeLists.txt | 2 +- examples/mesh/manual_networking/CMakeLists.txt | 2 +- examples/protocols/asio/chat_client/Makefile | 2 +- .../protocols/asio/chat_client/asio_chat_client_test.py | 6 +++--- examples/protocols/asio/chat_server/Makefile | 2 +- .../protocols/asio/chat_server/asio_chat_server_test.py | 6 +++--- examples/protocols/asio/tcp_echo_server/Makefile | 2 +- .../protocols/asio/tcp_echo_server/asio_tcp_server_test.py | 6 +++--- examples/protocols/asio/udp_echo_server/Makefile | 2 +- .../protocols/asio/udp_echo_server/asio_udp_server_test.py | 6 +++--- examples/protocols/aws_iot/subscribe_publish/Makefile | 2 +- examples/protocols/aws_iot/thing_shadow/Makefile | 2 +- examples/protocols/https_request/Makefile | 2 +- examples/protocols/https_request/example_test.py | 2 +- examples/system/cpp_exceptions/CMakeLists.txt | 2 +- examples/system/select/Makefile | 2 +- examples/wifi/getting_started/softAP/CMakeLists.txt | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/bluetooth/ble_throughput/throughput_server/Makefile b/examples/bluetooth/ble_throughput/throughput_server/Makefile index 952790fa02..66f62011a0 100644 --- a/examples/bluetooth/ble_throughput/throughput_server/Makefile +++ b/examples/bluetooth/ble_throughput/throughput_server/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := throughput_server_demos +PROJECT_NAME := throughput_server_demo COMPONENT_ADD_INCLUDEDIRS := components/include diff --git a/examples/mesh/internal_communication/CMakeLists.txt b/examples/mesh/internal_communication/CMakeLists.txt index d0cf18781a..21386ed2b7 100644 --- a/examples/mesh/internal_communication/CMakeLists.txt +++ b/examples/mesh/internal_communication/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(internal_transceiver) +project(internal_communication) diff --git a/examples/mesh/manual_networking/CMakeLists.txt b/examples/mesh/manual_networking/CMakeLists.txt index d0cf18781a..49e1398037 100644 --- a/examples/mesh/manual_networking/CMakeLists.txt +++ b/examples/mesh/manual_networking/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(internal_transceiver) +project(manual_networking) diff --git a/examples/protocols/asio/chat_client/Makefile b/examples/protocols/asio/chat_client/Makefile index 8f651a3eb3..924891a67c 100644 --- a/examples/protocols/asio/chat_client/Makefile +++ b/examples/protocols/asio/chat_client/Makefile @@ -2,6 +2,6 @@ # This is a project Makefile. It is assumed the directory this Makefile resides in is a # project subdirectory. # -PROJECT_NAME := asio_chatclient +PROJECT_NAME := asio_chat_client include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/asio/chat_client/asio_chat_client_test.py b/examples/protocols/asio/chat_client/asio_chat_client_test.py index f38c3f6732..c8b9aacc62 100644 --- a/examples/protocols/asio/chat_client/asio_chat_client_test.py +++ b/examples/protocols/asio/chat_client/asio_chat_client_test.py @@ -67,10 +67,10 @@ def test_examples_protocol_asio_chat_client(env, extra_data): test_msg="ABC" dut1 = env.get_dut("chat_client", "examples/protocols/asio/chat_client") # check and log bin size - binary_file = os.path.join(dut1.app.binary_path, "asio_chatclient.bin") + binary_file = os.path.join(dut1.app.binary_path, "asio_chat_client.bin") bin_size = os.path.getsize(binary_file) - IDF.log_performance("asio_chatclient_size", "{}KB".format(bin_size//1024)) - IDF.check_performance("asio_chatclient_size", bin_size//1024) + IDF.log_performance("asio_chat_client_size", "{}KB".format(bin_size//1024)) + IDF.check_performance("asio_chat_client_size", bin_size//1024) # 1. start a tcp server on the host host_ip = get_my_ip() thread1 = Thread(target = chat_server_sketch, args = (host_ip,)) diff --git a/examples/protocols/asio/chat_server/Makefile b/examples/protocols/asio/chat_server/Makefile index c69f109c9e..0b0ed1fc57 100644 --- a/examples/protocols/asio/chat_server/Makefile +++ b/examples/protocols/asio/chat_server/Makefile @@ -2,6 +2,6 @@ # This is a project Makefile. It is assumed the directory this Makefile resides in is a # project subdirectory. # -PROJECT_NAME := asio_chatserver +PROJECT_NAME := asio_chat_server include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/asio/chat_server/asio_chat_server_test.py b/examples/protocols/asio/chat_server/asio_chat_server_test.py index 9f3e1408b5..ac90a92614 100644 --- a/examples/protocols/asio/chat_server/asio_chat_server_test.py +++ b/examples/protocols/asio/chat_server/asio_chat_server_test.py @@ -30,10 +30,10 @@ def test_examples_protocol_asio_chat_server(env, extra_data): test_msg=" 4ABC\n" dut1 = env.get_dut("chat_server", "examples/protocols/asio/chat_server") # check and log bin size - binary_file = os.path.join(dut1.app.binary_path, "asio_chatserver.bin") + binary_file = os.path.join(dut1.app.binary_path, "asio_chat_server.bin") bin_size = os.path.getsize(binary_file) - IDF.log_performance("asio_chatserver_bin_size", "{}KB".format(bin_size//1024)) - IDF.check_performance("asio_chatserver_size", bin_size//1024) + IDF.log_performance("asio_chat_server_bin_size", "{}KB".format(bin_size//1024)) + IDF.check_performance("asio_chat_server_size", bin_size//1024) # 1. start test dut1.start_app() # 2. get the server IP address diff --git a/examples/protocols/asio/tcp_echo_server/Makefile b/examples/protocols/asio/tcp_echo_server/Makefile index 2a2839a54e..ef5b796704 100644 --- a/examples/protocols/asio/tcp_echo_server/Makefile +++ b/examples/protocols/asio/tcp_echo_server/Makefile @@ -2,6 +2,6 @@ # This is a project Makefile. It is assumed the directory this Makefile resides in is a # project subdirectory. # -PROJECT_NAME := asio_tcp_echoserver +PROJECT_NAME := asio_tcp_echo_server include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py b/examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py index 3514bbc2c2..ad93a55968 100644 --- a/examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py +++ b/examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py @@ -31,10 +31,10 @@ def test_examples_protocol_asio_tcp_server(env, extra_data): test_msg="echo message from client to server" dut1 = env.get_dut("tcp_echo_server", "examples/protocols/asio/tcp_echo_server") # check and log bin size - binary_file = os.path.join(dut1.app.binary_path, "asio_tcp_echoserver.bin") + binary_file = os.path.join(dut1.app.binary_path, "asio_tcp_echo_server.bin") bin_size = os.path.getsize(binary_file) - IDF.log_performance("asio_tcp_echoserver_bin_size", "{}KB".format(bin_size//1024)) - IDF.check_performance("asio_tcp_echoserver_size", bin_size//1024) + IDF.log_performance("asio_tcp_echo_server_bin_size", "{}KB".format(bin_size//1024)) + IDF.check_performance("asio_tcp_echo_server_size", bin_size//1024) # 1. start test dut1.start_app() # 2. get the server IP address diff --git a/examples/protocols/asio/udp_echo_server/Makefile b/examples/protocols/asio/udp_echo_server/Makefile index c659aeae0a..a23a5c9acc 100644 --- a/examples/protocols/asio/udp_echo_server/Makefile +++ b/examples/protocols/asio/udp_echo_server/Makefile @@ -2,6 +2,6 @@ # This is a project Makefile. It is assumed the directory this Makefile resides in is a # project subdirectory. # -PROJECT_NAME := asio_udp_echoserver +PROJECT_NAME := asio_udp_echo_server include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/asio/udp_echo_server/asio_udp_server_test.py b/examples/protocols/asio/udp_echo_server/asio_udp_server_test.py index 7b20b95ca1..44a5773697 100644 --- a/examples/protocols/asio/udp_echo_server/asio_udp_server_test.py +++ b/examples/protocols/asio/udp_echo_server/asio_udp_server_test.py @@ -31,10 +31,10 @@ def test_examples_protocol_asio_udp_server(env, extra_data): test_msg="echo message from client to server" dut1 = env.get_dut("udp_echo_server", "examples/protocols/asio/udp_echo_server") # check and log bin size - binary_file = os.path.join(dut1.app.binary_path, "asio_udp_echoserver.bin") + binary_file = os.path.join(dut1.app.binary_path, "asio_udp_echo_server.bin") bin_size = os.path.getsize(binary_file) - IDF.log_performance("asio_udp_echoserver_bin_size", "{}KB".format(bin_size//1024)) - IDF.check_performance("asio_udp_echoserver_size", bin_size//1024) + IDF.log_performance("asio_udp_echo_server_bin_size", "{}KB".format(bin_size//1024)) + IDF.check_performance("asio_udp_echo_server_size", bin_size//1024) # 1. start test dut1.start_app() # 2. get the server IP address diff --git a/examples/protocols/aws_iot/subscribe_publish/Makefile b/examples/protocols/aws_iot/subscribe_publish/Makefile index 4f0d138201..fe96023354 100644 --- a/examples/protocols/aws_iot/subscribe_publish/Makefile +++ b/examples/protocols/aws_iot/subscribe_publish/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := aws_iot_subpub +PROJECT_NAME := subscribe_publish include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/aws_iot/thing_shadow/Makefile b/examples/protocols/aws_iot/thing_shadow/Makefile index dac75a3194..c29d0206ce 100644 --- a/examples/protocols/aws_iot/thing_shadow/Makefile +++ b/examples/protocols/aws_iot/thing_shadow/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := aws_iot_thing_shadow +PROJECT_NAME := thing_shadow include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/https_request/Makefile b/examples/protocols/https_request/Makefile index e9382bd03d..55c5f943f1 100644 --- a/examples/protocols/https_request/Makefile +++ b/examples/protocols/https_request/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := https-request +PROJECT_NAME := https_request include $(IDF_PATH)/make/project.mk diff --git a/examples/protocols/https_request/example_test.py b/examples/protocols/https_request/example_test.py index e362a25121..3f2116a65f 100644 --- a/examples/protocols/https_request/example_test.py +++ b/examples/protocols/https_request/example_test.py @@ -24,7 +24,7 @@ def test_examples_protocol_https_request(env, extra_data): """ dut1 = env.get_dut("https_request", "examples/protocols/https_request") # check and log bin size - binary_file = os.path.join(dut1.app.binary_path, "https-request.bin") + binary_file = os.path.join(dut1.app.binary_path, "https_request.bin") bin_size = os.path.getsize(binary_file) IDF.log_performance("https_request_bin_size", "{}KB".format(bin_size//1024)) IDF.check_performance("https_request_bin_size", bin_size//1024) diff --git a/examples/system/cpp_exceptions/CMakeLists.txt b/examples/system/cpp_exceptions/CMakeLists.txt index d3f354f7fc..2ce110362b 100644 --- a/examples/system/cpp_exceptions/CMakeLists.txt +++ b/examples/system/cpp_exceptions/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(console) +project(cpp_exceptions_example) diff --git a/examples/system/select/Makefile b/examples/system/select/Makefile index 0b30811ee2..a48defb38a 100644 --- a/examples/system/select/Makefile +++ b/examples/system/select/Makefile @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_NAME := select-example +PROJECT_NAME := select include $(IDF_PATH)/make/project.mk diff --git a/examples/wifi/getting_started/softAP/CMakeLists.txt b/examples/wifi/getting_started/softAP/CMakeLists.txt index 83a0f1dbc4..e05fb18d95 100644 --- a/examples/wifi/getting_started/softAP/CMakeLists.txt +++ b/examples/wifi/getting_started/softAP/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(simple_wifi) +project(wifi_softAP)