Skip to content
Snippets Groups Projects
Commit 4db07276 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

[-] No recursive submodule init for tests

[+] Checks for already initialized submodules
[*] Submodules updates
[*] Fixes in tests
parent 4fcd0960
No related branches found
No related tags found
1 merge request!24Support 3689
[submodule "libdap"] [submodule "libdap"]
path = libdap path = libdap
url = https://github.com/kelvinblockchain/libdap url = https://github.com/cellframe/libdap
branch = master branch = master
[submodule "libdap-server-core"] [submodule "libdap-server-core"]
path = libdap-server-core path = libdap-server-core
url = https://github.com/kelvinblockchain/libdap-server-core url = https://github.com/cellframe/libdap-server-core
branch = master branch = master
[submodule "test/libdap-test"] [submodule "test/libdap-test"]
path = test/libdap-test path = test/libdap-test
url = https://github.com/kelvinblockchain/libdap-test url = https://github.com/cellframe/libdap-test
branch = master branch = master
[submodule "libdap-server-udp"] [submodule "libdap-server-udp"]
path = libdap-server-udp path = libdap-server-udp
url = https://github.com/kelvinblockchain/libdap-server-udp url = https://github.com/cellframe/libdap-server-udp
branch = master branch = master
[submodule "libdap-crypto"]
path = libdap-crypto
url = https://github.com/cellframe/libdap-crypto
branch = master
...@@ -7,7 +7,7 @@ notifications: ...@@ -7,7 +7,7 @@ notifications:
before_install: before_install:
- git submodule init - git submodule init
- git submodule update --recursive - git submodule update
script: script:
- mkdir build - mkdir build
......
...@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.0) ...@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.0)
if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
add_subdirectory(libdap) add_subdirectory(libdap)
add_subdirectory(libdap-crypto)
add_subdirectory(libdap-server-core) add_subdirectory(libdap-server-core)
add_subdirectory(libdap-server-udp) # add_subdirectory(libdap-server-udp)
enable_testing() enable_testing()
add_subdirectory(test) add_subdirectory(test)
endif() endif()
......
Subproject commit ff63d762657f9687173db825705b8bf4b958abee
Subproject commit e5bb9b75237cd702c5980b4070da9842d1f101e2 Subproject commit 8db5287183350877e1b002603d121b69cffe0964
Subproject commit 7137a1d8256eb9dee23010ad8b8d9c15541b6e97 Subproject commit 2a075869bf2e4a00e98af0f1178d7cd2efcae0cb
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
int main(void) { int main(void) {
// switch off debug info from library // switch off debug info from library
set_log_level(L_CRITICAL); dap_log_level_set(L_CRITICAL);
return 0; return 0;
} }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
int main(void) { int main(void) {
// switch off debug info from library // switch off debug info from library
set_log_level(L_CRITICAL); dap_log_level_set(L_CRITICAL);
dap_http_user_agent_test_run(); dap_http_user_agent_test_run();
dap_http_http_simple_test_run(); dap_http_http_simple_test_run();
return 0; return 0;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
int main(void) { int main(void) {
// switch off debug info from library // switch off debug info from library
set_log_level(L_CRITICAL); dap_log_level_set(L_CRITICAL);
dap_traffic_track_tests_run(); dap_traffic_track_tests_run();
return 0; return 0;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment