Преглед изворни кода

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

David Cermak пре 7 година
родитељ
комит
9784df1c3a

+ 1 - 1
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
 

+ 1 - 1
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)

+ 1 - 1
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)

+ 1 - 1
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

+ 3 - 3
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,))

+ 1 - 1
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

+ 3 - 3
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

+ 1 - 1
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

+ 3 - 3
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

+ 1 - 1
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

+ 3 - 3
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

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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)

+ 1 - 1
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)

+ 1 - 1
examples/system/select/Makefile

@@ -3,7 +3,7 @@
 # project subdirectory.
 #
 
-PROJECT_NAME := select-example
+PROJECT_NAME := select
 
 include $(IDF_PATH)/make/project.mk
 

+ 1 - 1
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)