Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/asio_consistent_example_names' into 'master'

Browse source 
Renamed examples to be consistent no matter which build system used

See merge request idf/esp-idf!3257
This commit is contained in:
Ivan Grokhotkov 2018-10-19 10:25:47 +08:00
parent c76f71cd5f 9784df1c3a
commit c02e218da1
18 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/bluetooth/ble_throughput/throughput_server/Makefile
View file

@ -3,7 +3,7 @@
# project subdirectory.
#
PROJECT_NAME := throughput_server_demos
PROJECT_NAME := throughput_server_demo
COMPONENT_ADD_INCLUDEDIRS := components/include

2
examples/mesh/internal_communication/CMakeLists.txt
View file

@ -3,4 +3,4 @@
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(internal_transceiver)
project(internal_communication)

2
examples/mesh/manual_networking/CMakeLists.txt
View file

@ -3,4 +3,4 @@
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(internal_transceiver)
project(manual_networking)

2
examples/protocols/asio/chat_client/Makefile
View file

@ -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

6
examples/protocols/asio/chat_client/asio_chat_client_test.py
View file

@ -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,))

2
examples/protocols/asio/chat_server/Makefile
View file

@ -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

6
examples/protocols/asio/chat_server/asio_chat_server_test.py
View file

@ -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

2
examples/protocols/asio/tcp_echo_server/Makefile
View file

@ -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

6
examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py
View file

@ -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

2
examples/protocols/asio/udp_echo_server/Makefile
View file

@ -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

6
examples/protocols/asio/udp_echo_server/asio_udp_server_test.py
View file

@ -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

2
examples/protocols/aws_iot/subscribe_publish/Makefile
View file

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

2
examples/protocols/aws_iot/thing_shadow/Makefile
View file

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

2
examples/protocols/https_request/Makefile
View file

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

2
examples/protocols/https_request/example_test.py
View file

@ -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)

2
examples/system/cpp_exceptions/CMakeLists.txt
View file

@ -3,4 +3,4 @@
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(console)
project(cpp_exceptions_example)

2
examples/system/select/Makefile
View file

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

2
examples/wifi/getting_started/softAP/CMakeLists.txt
View file

@ -3,4 +3,4 @@
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(simple_wifi)
project(wifi_softAP)