tests: mqtt_packet: run in user mode

Various globals for the test cases have been moved to
the ztest memory domain data section via ZTEST_DMEM tags
so that user mode can access them.

Some anonymous arrays whose address was being placed in
the msg_subackX structs have been split out so they
are in ztest memory domain.

Signed-off-by: Andrew Boie <[email protected]>

Author: Andrew Boie

tests/net/lib/mqtt_packet/src/mqtt_packet.c

@@ -24,44 +24,44 @@
 
 #define BUFFER_SIZE 128
 
-static u8_t rx_buffer[BUFFER_SIZE];
-static u8_t tx_buffer[BUFFER_SIZE];
-static struct mqtt_client client;
+static ZTEST_DMEM u8_t rx_buffer[BUFFER_SIZE];
+static ZTEST_DMEM u8_t tx_buffer[BUFFER_SIZE];
+static ZTEST_DMEM struct mqtt_client client;
 
-static struct mqtt_topic topic_qos_0 = {
+static ZTEST_DMEM struct mqtt_topic topic_qos_0 = {
 	.qos = 0,
 	.topic.utf8 = TOPIC,
 	.topic.size = TOPIC_LEN
 };
-static struct mqtt_topic topic_qos_1 = {
+static ZTEST_DMEM struct mqtt_topic topic_qos_1 = {
 	.qos = 1,
 	.topic.utf8 = TOPIC,
 	.topic.size = TOPIC_LEN
 };
-static struct mqtt_topic topic_qos_2 = {
+static ZTEST_DMEM struct mqtt_topic topic_qos_2 = {
 	.qos = 2,
 	.topic.utf8 = TOPIC,
 	.topic.size = TOPIC_LEN
 };
-static struct mqtt_topic will_topic_qos_0 = {
+static ZTEST_DMEM struct mqtt_topic will_topic_qos_0 = {
 	.qos = 0,
 	.topic.utf8 = WILL_TOPIC,
 	.topic.size = WILL_TOPIC_LEN
 };
-static struct mqtt_topic will_topic_qos_1 = {
+static ZTEST_DMEM struct mqtt_topic will_topic_qos_1 = {
 	.qos = 1,
 	.topic.utf8 = WILL_TOPIC,
 	.topic.size = WILL_TOPIC_LEN
 };
-static struct mqtt_utf8 will_msg = {
+static ZTEST_DMEM struct mqtt_utf8 will_msg = {
 	.utf8 = WILL_MSG,
 	.size = WILL_MSG_LEN
 };
-static struct mqtt_utf8 username = {
+static ZTEST_DMEM struct mqtt_utf8 username = {
 	.utf8 = USERNAME,
 	.size = USERNAME_LEN
 };
-static struct mqtt_utf8 password = {
+static ZTEST_DMEM struct mqtt_utf8 password = {
 	.utf8 = PASSWORD,
 	.size = PASSWORD_LEN
 };
@@ -219,12 +219,12 @@ static void print_array(const u8_t *a, u16_t size);
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors
  */
-static
+static ZTEST_DMEM
 u8_t connect1[] = {0x10, 0x12, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x02, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72};
 
-static struct mqtt_client client_connect1 = {
+static ZTEST_DMEM struct mqtt_client client_connect1 = {
 	.clean_session = 1, .client_id.utf8 = CLIENTID,
 	.client_id.size = CLIENTID_LEN,
 	.will_retain = 0, .will_topic = NULL,
@@ -242,14 +242,14 @@ static struct mqtt_client client_connect1 = {
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors --will-topic quitting \
  * --will-qos 0 --will-payload bye
  */
-static
+static ZTEST_DMEM
 u8_t connect2[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x06, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
 		   0x62, 0x79, 0x65};
 
-static struct mqtt_client client_connect2 = {
+static ZTEST_DMEM struct mqtt_client client_connect2 = {
 	.clean_session = 1, .client_id.utf8 = CLIENTID,
 	.client_id.size = CLIENTID_LEN,
 	.will_retain = 0, .will_topic = &will_topic_qos_0,
@@ -265,14 +265,14 @@ static struct mqtt_client client_connect2 = {
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors --will-topic quitting \
  * --will-qos 0 --will-payload bye  --will-retain
  */
-static
+static ZTEST_DMEM
 u8_t connect3[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x26, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
 		   0x62, 0x79, 0x65};
 
-static struct mqtt_client client_connect3 = {
+static ZTEST_DMEM struct mqtt_client client_connect3 = {
 	.clean_session = 1, .client_id.utf8 = CLIENTID,
 	.client_id.size = CLIENTID_LEN,
 	.will_retain = 1, .will_topic = &will_topic_qos_0,
@@ -288,14 +288,14 @@ static struct mqtt_client client_connect3 = {
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors --will-topic quitting \
  * --will-qos 1 --will-payload bye
  */
-static
+static ZTEST_DMEM
 u8_t connect4[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x0e, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
 		   0x62, 0x79, 0x65};
 
-static struct mqtt_client client_connect4 = {
+static ZTEST_DMEM struct mqtt_client client_connect4 = {
 	.clean_session = 1, .client_id.utf8 = CLIENTID,
 	.client_id.size = CLIENTID_LEN,
 	.will_retain = 0, .will_topic = &will_topic_qos_1,
@@ -311,14 +311,14 @@ static struct mqtt_client client_connect4 = {
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors --will-topic quitting \
  * --will-qos 1 --will-payload bye --will-retain
  */
-static
+static ZTEST_DMEM
 u8_t connect5[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x2e, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
 		   0x62, 0x79, 0x65};
 
-static struct mqtt_client client_connect5 = {
+static ZTEST_DMEM struct mqtt_client client_connect5 = {
 	.clean_session = 1, .client_id.utf8 = CLIENTID,
 	.client_id.size = CLIENTID_LEN,
 	.will_retain = 1, .will_topic = &will_topic_qos_1,
@@ -334,7 +334,7 @@ static struct mqtt_client client_connect5 = {
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors --will-topic quitting \
  * --will-qos 1 --will-payload bye --will-retain -u zephyr1 -P password
  */
-static
+static ZTEST_DMEM
 u8_t connect6[] = {0x10, 0x34, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		  0x04, 0xee, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		  0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
@@ -343,15 +343,15 @@ u8_t connect6[] = {0x10, 0x34, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		  0x68, 0x79, 0x72, 0x31, 0x00, 0x08, 0x70, 0x61,
 		  0x73, 0x73, 0x77, 0x6f, 0x72, 0x64};
 
-static struct mqtt_client client_connect6 = {
+static ZTEST_DMEM struct mqtt_client client_connect6 = {
 	.clean_session = 1, .client_id.utf8 = CLIENTID,
 	.client_id.size = CLIENTID_LEN,
 	.will_retain = 1, .will_topic = &will_topic_qos_1,
 	.will_message = &will_msg, .user_name = &username,
 	.password = &password
 };
 
-static
+static ZTEST_DMEM
 u8_t disconnect1[] = {0xe0, 0x00};
 
 /*
@@ -361,11 +361,11 @@ u8_t disconnect1[] = {0xe0, 0x00};
  * Message can be generated by the following command:
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 0 -m "OK"
  */
-static
+static ZTEST_DMEM
 u8_t publish1[] = {0x30, 0x0b, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x4f, 0x4b};
 
-static struct mqtt_publish_param msg_publish1 = {
+static ZTEST_DMEM struct mqtt_publish_param msg_publish1 = {
 	.dup_flag = 0, .retain_flag = 0, .message_id = 0,
 	.message.topic.qos = 0,
 	.message.topic.topic.utf8 = TOPIC,
@@ -381,11 +381,11 @@ static struct mqtt_publish_param msg_publish1 = {
  * Message can be generated by the following command:
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 0 -m "OK" -r
  */
-static
+static ZTEST_DMEM
 u8_t publish2[] = {0x31, 0x0b, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x4f, 0x4b};
 
-static struct mqtt_publish_param msg_publish2 = {
+static ZTEST_DMEM struct mqtt_publish_param msg_publish2 = {
 	.dup_flag = 0, .retain_flag = 1, .message_id = 0,
 	.message.topic.qos = 0,
 	.message.topic.topic.utf8 = TOPIC,
@@ -401,11 +401,11 @@ static struct mqtt_publish_param msg_publish2 = {
  * Message can be generated by the following command:
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 1 -m "OK" -r
  */
-static
+static ZTEST_DMEM
 u8_t publish3[] = {0x33, 0x0d, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x00, 0x01, 0x4f, 0x4b};
 
-static struct mqtt_publish_param msg_publish3 = {
+static ZTEST_DMEM struct mqtt_publish_param msg_publish3 = {
 	.dup_flag = 0, .retain_flag = 1, .message_id = 1,
 	.message.topic.qos = 1,
 	.message.topic.topic.utf8 = TOPIC,
@@ -421,10 +421,10 @@ static struct mqtt_publish_param msg_publish3 = {
  * Message can be generated by the following command:
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 2 -m "OK"
  */
-static
+static ZTEST_DMEM
 u8_t publish4[] = {0x34, 0x0d, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x00, 0x01, 0x4f, 0x4b};
-static struct mqtt_publish_param msg_publish4 = {
+static ZTEST_DMEM struct mqtt_publish_param msg_publish4 = {
 	.dup_flag = 0, .retain_flag = 0, .message_id = 1,
 	.message.topic.qos = 2,
 	.message.topic.topic.utf8 = TOPIC,
@@ -440,10 +440,10 @@ static struct mqtt_publish_param msg_publish4 = {
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 0
  */
-static
+static ZTEST_DMEM
 u8_t subscribe1[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
 		     0x6e, 0x73, 0x6f, 0x72, 0x73, 0x00};
-static struct mqtt_subscription_list msg_subscribe1 = {
+static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe1 = {
 	.message_id = 1, .list_count = 1, .list = &topic_qos_0
 };
 
@@ -454,10 +454,10 @@ static struct mqtt_subscription_list msg_subscribe1 = {
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 1
  */
-static
+static ZTEST_DMEM
 u8_t subscribe2[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
 		     0x6e, 0x73, 0x6f, 0x72, 0x73, 0x01};
-static struct mqtt_subscription_list msg_subscribe2 = {
+static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe2 = {
 	.message_id = 1, .list_count = 1, .list = &topic_qos_1
 };
 
@@ -468,10 +468,10 @@ static struct mqtt_subscription_list msg_subscribe2 = {
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 2
  */
-static
+static ZTEST_DMEM
 u8_t subscribe3[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
 		     0x6e, 0x73, 0x6f, 0x72, 0x73, 0x02};
-static struct mqtt_subscription_list msg_subscribe3 = {
+static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe3 = {
 	.message_id = 1, .list_count = 1, .list = &topic_qos_2
 };
 
@@ -482,11 +482,12 @@ static struct mqtt_subscription_list msg_subscribe3 = {
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 0
  */
-static
+static ZTEST_DMEM
 u8_t suback1[] = {0x90, 0x03, 0x00, 0x01, 0x00};
-static struct mqtt_suback_param msg_suback1 = {
+static ZTEST_DMEM u8_t data_suback1[] = { MQTT_SUBACK_SUCCESS_QoS_0 };
+static ZTEST_DMEM struct mqtt_suback_param msg_suback1 = {
 	.message_id = 1, .return_codes.len = 1,
-	.return_codes.data = (u8_t[]){ MQTT_SUBACK_SUCCESS_QoS_0 }
+	.return_codes.data = data_suback1
 };
 
 /*
@@ -496,11 +497,12 @@ static struct mqtt_suback_param msg_suback1 = {
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 1
  */
-static
+static ZTEST_DMEM
 u8_t suback2[] = {0x90, 0x03, 0x00, 0x01, 0x01};
-static struct mqtt_suback_param msg_suback2 = {
+static ZTEST_DMEM u8_t data_suback2[] = { MQTT_SUBACK_SUCCESS_QoS_1 };
+static ZTEST_DMEM struct mqtt_suback_param msg_suback2 = {
 	.message_id = 1, .return_codes.len = 1,
-	.return_codes.data = (u8_t[]){ MQTT_SUBACK_SUCCESS_QoS_1 }
+	.return_codes.data = data_suback2
 };
 
 /*
@@ -510,37 +512,38 @@ static struct mqtt_suback_param msg_suback2 = {
  * Message can be generated by the following command:
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 2
  */
-static
+static ZTEST_DMEM
 u8_t suback3[] = {0x90, 0x03, 0x00, 0x01, 0x02};
-static struct mqtt_suback_param msg_suback3 = {
+static ZTEST_DMEM u8_t data_suback3[] = { MQTT_SUBACK_SUCCESS_QoS_2 };
+static ZTEST_DMEM struct mqtt_suback_param msg_suback3 = {
 	.message_id = 1, .return_codes.len = 1,
-	.return_codes.data = (u8_t[]){ MQTT_SUBACK_SUCCESS_QoS_2 }
+	.return_codes.data = data_suback3
 };
 
-static
+static ZTEST_DMEM
 u8_t pingreq1[] = {0xc0, 0x00};
 
-static
+static ZTEST_DMEM
 u8_t puback1[] = {0x40, 0x02, 0x00, 0x01};
-static struct mqtt_puback_param msg_puback1 = {.message_id = 1};
+static ZTEST_DMEM struct mqtt_puback_param msg_puback1 = {.message_id = 1};
 
-static
+static ZTEST_DMEM
 u8_t pubrec1[] = {0x50, 0x02, 0x00, 0x01};
-static struct mqtt_pubrec_param msg_pubrec1 = {.message_id = 1};
+static ZTEST_DMEM struct mqtt_pubrec_param msg_pubrec1 = {.message_id = 1};
 
-static
+static ZTEST_DMEM
 u8_t pubrel1[] = {0x62, 0x02, 0x00, 0x01};
-static struct mqtt_pubrel_param msg_pubrel1 = {.message_id = 1};
+static ZTEST_DMEM struct mqtt_pubrel_param msg_pubrel1 = {.message_id = 1};
 
-static
+static ZTEST_DMEM
 u8_t pubcomp1[] = {0x70, 0x02, 0x00, 0x01};
-static struct mqtt_pubcomp_param msg_pubcomp1 = {.message_id = 1};
+static ZTEST_DMEM struct mqtt_pubcomp_param msg_pubcomp1 = {.message_id = 1};
 
-static
+static ZTEST_DMEM
 u8_t unsuback1[] = {0xb0, 0x02, 0x00, 0x01};
-static struct mqtt_unsuback_param msg_unsuback1 = {.message_id = 1};
+static ZTEST_DMEM struct mqtt_unsuback_param msg_unsuback1 = {.message_id = 1};
 
-static
+static ZTEST_DMEM
 struct mqtt_test mqtt_tests[] = {
 
 	{.test_name = "CONNECT, new session, zeros",
@@ -1083,6 +1086,6 @@ void test_mqtt_packet(void)
 void test_main(void)
 {
 	ztest_test_suite(test_mqtt_packet_fn,
-		ztest_unit_test(test_mqtt_packet));
+		ztest_user_unit_test(test_mqtt_packet));
 	ztest_run_test_suite(test_mqtt_packet_fn);
 }