Add master branch change.
Change-Id: I8892b7102753d29fefb4e23a7a7cc67c01157560
diff --git a/mbtk/test/Makefile b/mbtk/test/Makefile
index d1a9726..89ccbdf 100755
--- a/mbtk/test/Makefile
+++ b/mbtk/test/Makefile
@@ -7,13 +7,8 @@
LIB_DIR +=
-LIBS += -lmbtk_lib -llynq_lib -lql_lib -lmbtk_mqtt_lib -laudio-apu -lcutils -ltinyalsa -lacm -lubus -lubox
-
-ifeq ($(BUILD_PLATFORM), asr1803)
-LIBS += -lpolarssl
-else
-LIBS += -lmbtk_audio_lib
-endif
+LIBS += -lmbtk_lib -llynq_lib -lql_lib -lmbtk_mqtt -laudio-apu -lcutils -ltinyalsa -lacm -lubus -lubox -lmbtk_fota -lmbtk_audio -lmbtk_ril -lmbtk_factory -lmbtk_net -lmbtk_gnss -lmbtk_http -lmbtk_ftp -lmbtk_tcpip \
+ -lmbtk_coap
CFLAGS +=
diff --git a/mbtk/test/asr1806/qser_data_call_test.c b/mbtk/test/asr1806/qser_data_call_test.c
old mode 100644
new mode 100755
index 5d6ba59..42ee643
--- a/mbtk/test/asr1806/qser_data_call_test.c
+++ b/mbtk/test/asr1806/qser_data_call_test.c
@@ -144,7 +144,8 @@
else
{
printf("cnt: %d.\n", apn_list.cnt);
- for(int i = 0; i < apn_list.cnt; i++)
+ int i = 0;
+ for(i = 0; i < apn_list.cnt; i++)
{
printf("APN : %d, %d, %s, %s, %s, %d, %s.\n", apn_list.apn[i].profile_idx, apn_list.apn[i].pdp_type, apn_list.apn[i].apn_name, apn_list.apn[i].username, apn_list.apn[i].password, apn_list.apn[i].auth_proto, apn_list.apn[i].apn_type);
}
@@ -426,7 +427,11 @@
if(!err) {
printf("cid : %d, ip_type : %d\n", info.profile_idx, info.ip_family);
if(info.v4.state) {
- printf("%s: %s, %s, %s\n", info.v4.name, inet_ntoa(info.v4.addr.ip), inet_ntoa(info.v4.addr.pri_dns), inet_ntoa(info.v4.addr.sec_dns));
+ LOGE("[qser_data_call] IP: 0x%08x pri_DNS: 0x%08x sec_DNS: 0x%08x.", info.v4.addr.ip.s_addr, info.v4.addr.pri_dns.s_addr, info.v4.addr.sec_dns.s_addr);
+ //printf("%s: %s, %s, %s\n", info.v4.name, inet_ntoa(info.v4.addr.ip), inet_ntoa(info.v4.addr.pri_dns), inet_ntoa(info.v4.addr.sec_dns));
+ printf("%s: %s ", info.v4.name, inet_ntoa(info.v4.addr.ip));
+ printf("%s ", inet_ntoa(info.v4.addr.pri_dns));
+ printf("%s\n", inet_ntoa(info.v4.addr.sec_dns));
} else {
printf("IPV4 not available.\n");
}
diff --git a/mbtk/test/lynq_log_test.c b/mbtk/test/lynq_log_test.c
index fe749ec..b611e3f 100755
--- a/mbtk/test/lynq_log_test.c
+++ b/mbtk/test/lynq_log_test.c
@@ -99,6 +99,7 @@
}
case 6://test write log
{
+ puts(lynq_read_log_version());
for(i=0;i<10;i++)
{
LYVERBLOG("LYNQ: Test LYVERBLOG\n");
@@ -106,6 +107,13 @@
LYWARNLOG("LYNQ: Test LYWARNLOG\n");
LYINFLOG("LYNQ: Test LYINFLOG\n");
LYDBGLOG("LYNQ: Test LYDBGLOG\n");
+ lynq_log_global_output(LOG_VERBOSE, "LOG_VERBOSE test");
+ lynq_log_global_output(LOG_ERROR, "LOG_ERROR test");
+ lynq_log_global_output(LOG_WARNING, "LOG_WARNING test");
+ lynq_log_global_output(LOG_INFO, "LOG_INFO test");
+ lynq_log_global_output(LOG_DEBUG, "LOG_DEBUG test");
+ lynq_log_global_output(LOG_UNSET, "LOG_UNSET test");
+ lynq_log_global_output(LOG_LEVEL_MAX, "LOG_LEVEL_MAX test");
}
printf("test write log end\n");