asio: examples renamed to have consistent binary names when build in make and CMake

diff --git a/examples/bluetooth/ble_throughput/throughput_server/Makefile b/examples/bluetooth/ble_throughput/throughput_server/Makefile
index 952790fa025d549819b7b915636ae75319ccb844..66f62011a081e34c7338fd82c0a8aca974323275 100644 (file)
--- 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 d0cf18781a32941a343a19151a0067501a0bcc77..21386ed2b7e06723f3835e3a3fbf850a02842266 100644 (file)
--- 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 d0cf18781a32941a343a19151a0067501a0bcc77..49e1398037826ac6910c6969d3f0af38340ba36c 100644 (file)
--- 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 8f651a3eb36ed75aa990849c6f662a43852ce0cd..924891a67ce31e65f8198102426feb242ebb0049 100644 (file)
--- 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 f38c3f67327dafa9fd435eca948e0a6e99b1d507..c8b9aacc621cc4379396ee41b0bf5a93fad79201 100644 (file)
--- 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 c69f109c9e105b3df79fdfb0d266201553680e2f..0b0ed1fc573def384adc9f37cd493026386f2c07 100644 (file)
--- 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 9f3e1408b5db1bbf1b07e73720dfea6ede5dcb75..ac90a926149adbe1e43a76ad476f4a5bbf3f2c8e 100644 (file)
--- 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 2a2839a54e2bbb625f7dc65249a892246a0461c3..ef5b796704a36704fd0f136aebcb80851d1e9464 100644 (file)
--- 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 3514bbc2c20204b6f854b5420a0fe94195534f30..ad93a55968601f1658dd60d61cf7d1b341326ce3 100644 (file)
--- 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 c659aeae0a0b6199e10ce9269711b5d6ca7e6990..a23a5c9acc6e226f829a06a1b9f7349ef790d7e7 100644 (file)
--- 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 7b20b95ca128c06cf44509af44c62f0bf6eb26f0..44a5773697cf9f44a275f7025445116710b4b3a0 100644 (file)
--- 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 4f0d13820178a6370221bf2929d55d03964f4182..fe96023354a510a3091968fe2940d4a200a25ddc 100644 (file)
--- 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 dac75a3194cf5abe34ac6f1176430a7e3cea15cb..c29d0206cea33de84d4671cacca6461db4d2a7b1 100644 (file)
--- 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 e9382bd03d3eb17cb2dc6618adf523ea1a569166..55c5f943f14ee2b38ad16b9d6ea3724f6dc7b54b 100644 (file)
--- 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 e362a25121cdc101901ffa29675b04a2b5862ba1..3f2116a65f10e2e6a035d4972b406ebeb08bff0c 100644 (file)
--- 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 d3f354f7fc993d3925b5a763501aaf30e4c3e8a7..2ce110362ba153b6ae3b2ba3bbecee1f374cc675 100644 (file)
--- 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 0b30811ee29775ae92c57ef614c1f0e211c6a140..a48defb38aa85a64f92d63fbbb79177eedba6df7 100644 (file)
--- 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 83a0f1dbc4de4e889b4548d44501090d267dfc34..e05fb18d95c570052f4535fad7505e482f93ce1d 100644 (file)
--- 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)