From 4db072769dfa8f187926ae64ef3c732ba27ecb96 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Tue, 4 Jun 2019 14:41:52 +0700
Subject: [PATCH] [-] No recursive submodule init for tests [+] Checks for
already initialized submodules [*] Submodules updates [*] Fixes in tests
---
.gitmodules | 12 ++++++++----
.travis.yml | 2 +-
CMakeLists.txt | 3 ++-
libdap-crypto | 1 +
libdap-server-core | 2 +-
libdap-server-udp | 2 +-
test/enc_server/main.c | 2 +-
test/http_server/main.c | 2 +-
test/main.c | 2 +-
9 files changed, 17 insertions(+), 11 deletions(-)
create mode 160000 libdap-crypto
diff --git a/.gitmodules b/.gitmodules
index 1d6e685..f349be6 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,20 @@
[submodule "libdap"]
path = libdap
- url = https://github.com/kelvinblockchain/libdap
+ url = https://github.com/cellframe/libdap
branch = master
[submodule "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
[submodule "test/libdap-test"]
path = test/libdap-test
- url = https://github.com/kelvinblockchain/libdap-test
+ url = https://github.com/cellframe/libdap-test
branch = master
[submodule "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
+[submodule "libdap-crypto"]
+ path = libdap-crypto
+ url = https://github.com/cellframe/libdap-crypto
+ branch = master
diff --git a/.travis.yml b/.travis.yml
index b593aaa..5a3e4ae 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ notifications:
before_install:
- git submodule init
- - git submodule update --recursive
+ - git submodule update
script:
- mkdir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80d81b3..3245416 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.0)
if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
add_subdirectory(libdap)
+ add_subdirectory(libdap-crypto)
add_subdirectory(libdap-server-core)
- add_subdirectory(libdap-server-udp)
+# add_subdirectory(libdap-server-udp)
enable_testing()
add_subdirectory(test)
endif()
diff --git a/libdap-crypto b/libdap-crypto
new file mode 160000
index 0000000..ff63d76
--- /dev/null
+++ b/libdap-crypto
@@ -0,0 +1 @@
+Subproject commit ff63d762657f9687173db825705b8bf4b958abee
diff --git a/libdap-server-core b/libdap-server-core
index e5bb9b7..8db5287 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit e5bb9b75237cd702c5980b4070da9842d1f101e2
+Subproject commit 8db5287183350877e1b002603d121b69cffe0964
diff --git a/libdap-server-udp b/libdap-server-udp
index 7137a1d..2a07586 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 7137a1d8256eb9dee23010ad8b8d9c15541b6e97
+Subproject commit 2a075869bf2e4a00e98af0f1178d7cd2efcae0cb
diff --git a/test/enc_server/main.c b/test/enc_server/main.c
index d015aec..6527055 100755
--- a/test/enc_server/main.c
+++ b/test/enc_server/main.c
@@ -2,6 +2,6 @@
int main(void) {
// switch off debug info from library
- set_log_level(L_CRITICAL);
+ dap_log_level_set(L_CRITICAL);
return 0;
}
diff --git a/test/http_server/main.c b/test/http_server/main.c
index ed0833b..6e56c0e 100755
--- a/test/http_server/main.c
+++ b/test/http_server/main.c
@@ -4,7 +4,7 @@
int main(void) {
// 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_http_simple_test_run();
return 0;
diff --git a/test/main.c b/test/main.c
index bb9cdaf..807d95c 100755
--- a/test/main.c
+++ b/test/main.c
@@ -3,7 +3,7 @@
int main(void) {
// switch off debug info from library
- set_log_level(L_CRITICAL);
+ dap_log_level_set(L_CRITICAL);
dap_traffic_track_tests_run();
return 0;
}
--
GitLab