From 86d107635bf7802de30bdbb8eb87f0d2a9d22a80 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 * Original commit: espressif/esp-idf@9784df1c3a52592ecfd14a30d75cbad934dffa2e --- 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 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/protocols/asio/chat_client/Makefile b/examples/protocols/asio/chat_client/Makefile index 8f651a3eb..924891a67 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 f38c3f673..c8b9aacc6 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 c69f109c9..0b0ed1fc5 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 9f3e1408b..ac90a9261 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 2a2839a54..ef5b79670 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 3514bbc2c..ad93a5596 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 c659aeae0..a23a5c9ac 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 7b20b95ca..44a577369 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