atria-soft/enet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to future lutin 2.0

Browse Source
This commit is contained in:
Edouard DUPIN 2016-09-08 21:35:02 +02:00
parent 8d9800b3e8
commit 62f305cf89
9 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lutin_enet-test-client-http.py
View File

@ -26,8 +26,8 @@ def get_maintainer():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_export_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__), export=True)
my_module.add_module_depend(['enet', 'gtest', 'test-debug']) my_module.add_depend(['enet', 'gtest', 'test-debug'])
my_module.add_src_file([ my_module.add_src_file([
'test/main-client-http.cpp' 'test/main-client-http.cpp'
]) ])

4
lutin_enet-test-client-websocket.py
View File

@ -26,8 +26,8 @@ def get_maintainer():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_export_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__), export=True)
my_module.add_module_depend(['enet', 'gtest', 'test-debug']) my_module.add_depend(['enet', 'gtest', 'test-debug'])
my_module.add_src_file([ my_module.add_src_file([
'test/main-client-websocket.cpp' 'test/main-client-websocket.cpp'
]) ])

4
lutin_enet-test-client.py
View File

@ -26,8 +26,8 @@ def get_maintainer():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_export_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__), export=True)
my_module.add_module_depend(['enet', 'gtest', 'test-debug']) my_module.add_depend(['enet', 'gtest', 'test-debug'])
my_module.add_src_file([ my_module.add_src_file([
'test/main-client.cpp' 'test/main-client.cpp'
]) ])

4
lutin_enet-test-server-http.py
View File

@ -26,8 +26,8 @@ def get_maintainer():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_export_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__), export=True)
my_module.add_module_depend(['enet', 'gtest', 'test-debug']) my_module.add_depend(['enet', 'gtest', 'test-debug'])
my_module.add_src_file([ my_module.add_src_file([
'test/main-server-http.cpp' 'test/main-server-http.cpp'
]) ])

4
lutin_enet-test-server-websocket.py
View File

@ -26,8 +26,8 @@ def get_maintainer():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_export_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__), export=True)
my_module.add_module_depend(['enet', 'gtest', 'test-debug']) my_module.add_depend(['enet', 'gtest', 'test-debug'])
my_module.add_src_file([ my_module.add_src_file([
'test/main-server-websocket.cpp' 'test/main-server-websocket.cpp'
]) ])

4
lutin_enet-test-server.py
View File

@ -26,8 +26,8 @@ def get_maintainer():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_export_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__), export=True)
my_module.add_module_depend(['enet', 'gtest', 'test-debug']) my_module.add_depend(['enet', 'gtest', 'test-debug'])
my_module.add_src_file([ my_module.add_src_file([
'test/main-server.cpp' 'test/main-server.cpp'
]) ])

4
lutin_enet.py
View File

@ -26,12 +26,12 @@ def get_version():
def create(target, module_name): def create(target, module_name):
my_module = module.Module(__file__, module_name, get_type()) my_module = module.Module(__file__, module_name, get_type())
my_module.add_module_depend(['etk', 'ememory', 'algue']) my_module.add_depend(['etk', 'ememory', 'algue'])
my_module.add_src_file([ my_module.add_src_file([
'enet/debug.cpp' 'enet/debug.cpp'
]) ])
my_module.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
if target.name == "Windows": if "Windows" in target.get_type():
return my_module return my_module
my_module.add_src_file([ my_module.add_src_file([
'enet/Udp.cpp', 'enet/Udp.cpp',

13
test/main-client.cpp
View File

@ -6,6 +6,7 @@
#include <test-debug/debug.h> #include <test-debug/debug.h>
#include <enet/Tcp.h> #include <enet/Tcp.h>
#include <enet/TcpClient.h>
#include <enet/Http.h> #include <enet/Http.h>
#include <etk/etk.h> #include <etk/etk.h>
@ -28,17 +29,15 @@ int main(int _argc, const char *_argv[]) {
TEST_INFO("=================================="); TEST_INFO("==================================");
#ifndef __TARGET_OS__Windows #ifndef __TARGET_OS__Windows
// client mode ... // client mode ...
enet::Tcp connection; // connect on TCP server:
connection.setHostNane("127.0.0.1"); enet::Tcp connection = std::move(enet::connectTcpClient("127.0.0.1", 12345));
connection.setPort(31235);
connection.setServer(false);
TEST_INFO("CLIENT connect ..."); TEST_INFO("CLIENT connect ...");
if (connection.link() == false) { if (connection.getConnectionStatus() != enet::Tcp::status::link) {
TEST_ERROR("can not link to the socket..."); TEST_ERROR("can not link to the socket...");
return -1; return -1;
} }
int32_t iii = 0; int32_t iii = 0;
while ( connection.getConnectionStatus() == enet::Tcp::statusLink while ( connection.getConnectionStatus() == enet::Tcp::status::link
&& iii<10000) { && iii<10000) {
char data[1024]; char data[1024];
int32_t len = connection.read(data, 1024); int32_t len = connection.read(data, 1024);
@ -51,7 +50,7 @@ int main(int _argc, const char *_argv[]) {
} }
if (iii>=10000) { if (iii>=10000) {
TEST_INFO("auto disconnected"); TEST_INFO("auto disconnected");
} else if (connection.getConnectionStatus() != enet::Tcp::statusLink) { } else if (connection.getConnectionStatus() != enet::Tcp::status::link) {
TEST_INFO("server disconnected"); TEST_INFO("server disconnected");
} else { } else {
TEST_INFO("ERROR disconnected"); TEST_INFO("ERROR disconnected");

4
test/main-server.cpp
View File

@ -41,7 +41,7 @@ int main(int _argc, const char *_argv[]) {
interface.unlink(); interface.unlink();
int32_t iii = 0; int32_t iii = 0;
while (tcpConnection.isAlive() == true) { while (tcpConnection.getConnectionStatus() == enet::Tcp::status::link) {
int32_t len = tcpConnection.write("plop" + etk::to_string(iii)); int32_t len = tcpConnection.write("plop" + etk::to_string(iii));
TEST_INFO("write len=" << len); TEST_INFO("write len=" << len);
char data[1024]; char data[1024];
@ -53,7 +53,7 @@ int main(int _argc, const char *_argv[]) {
} }
if (iii>=1000000) { if (iii>=1000000) {
TEST_INFO("auto disconnected"); TEST_INFO("auto disconnected");
} else if (tcpConnection.isAlive() != true) { } else if (tcpConnection.getConnectionStatus() != enet::Tcp::status::link) {
TEST_INFO("server disconnected"); TEST_INFO("server disconnected");
} else { } else {
TEST_INFO("ERROR disconnected"); TEST_INFO("ERROR disconnected");