commit c0011585be5b877e233612abf5883f50ce11cf0f
author Marko Kiiskila <marko@runtime.io> Wed Jun 06 11:46:08 2018 +0300
committer mkiiskila <marko@runtime.io> Thu Jun 14 23:19:06 2018 +0300
tree 9b6ff773885d7bffd05ce58cd710d8bf29ecffb3
parent ce50ab064876e00f80289770adc060ccdc6c103a

boot_serial; fix mynewt unit test.

Signed-off-by: Marko Kiiskila <marko@runtime.io>

boot/boot_serial/test/pkg.yml

diff --git a/boot/boot_serial/test/pkg.yml b/boot/boot_serial/test/pkg.yml
index 7bd3d43..f7f5a4b 100644
--- a/boot/boot_serial/test/pkg.yml
+++ b/boot/boot_serial/test/pkg.yml
@@ -24,6 +24,7 @@
 
 pkg.deps:
     - "@mcuboot/boot/boot_serial"
+    - "@mcuboot/boot/bootutil"
     - "@apache-mynewt-core/test/testutil"
 
 pkg.deps.SELFTEST:

boot/boot_serial/test/src/boot_test.c

diff --git a/boot/boot_serial/test/src/boot_test.c b/boot/boot_serial/test/src/boot_test.c
index 88a2706..3beb379 100644
--- a/boot/boot_serial/test/src/boot_test.c
+++ b/boot/boot_serial/test/src/boot_test.c
@@ -65,8 +65,7 @@
 int
 main(void)
 {
-    ts_config.ts_print_results = 1;
-    tu_init();
+    sysinit();
 
     boot_serial_test();
 

boot/boot_serial/test/src/testcases/boot_serial_empty_img_msg.c

diff --git a/boot/boot_serial/test/src/testcases/boot_serial_empty_img_msg.c b/boot/boot_serial/test/src/testcases/boot_serial_empty_img_msg.c
index ff69324..a5e7174 100644
--- a/boot/boot_serial/test/src/testcases/boot_serial_empty_img_msg.c
+++ b/boot/boot_serial/test/src/testcases/boot_serial_empty_img_msg.c
@@ -27,7 +27,7 @@
     memset(hdr, 0, sizeof(*hdr));
     hdr->nh_op = NMGR_OP_WRITE;
     hdr->nh_group = htons(MGMT_GROUP_ID_IMAGE);
-    hdr->nh_id = IMGMGR_NMGR_OP_UPLOAD;
+    hdr->nh_id = IMGMGR_NMGR_ID_UPLOAD;
     hdr->nh_len = htons(2);
     strcpy((char *)(hdr + 1), "{}");
 

boot/boot_serial/test/src/testcases/boot_serial_img_msg.c

diff --git a/boot/boot_serial/test/src/testcases/boot_serial_img_msg.c b/boot/boot_serial/test/src/testcases/boot_serial_img_msg.c
index c978650..a1aaf2f 100644
--- a/boot/boot_serial/test/src/testcases/boot_serial_img_msg.c
+++ b/boot/boot_serial/test/src/testcases/boot_serial_img_msg.c
@@ -50,7 +50,7 @@
     memset(hdr, 0, sizeof(*hdr));
     hdr->nh_op = NMGR_OP_WRITE;
     hdr->nh_group = htons(MGMT_GROUP_ID_IMAGE);
-    hdr->nh_id = IMGMGR_NMGR_OP_UPLOAD;
+    hdr->nh_id = IMGMGR_NMGR_ID_UPLOAD;
 
     memcpy(hdr + 1, payload, sizeof payload);
     hdr->nh_len = htons(sizeof payload);

boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c

diff --git a/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c b/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c
index 9f326b8..1f4aa09 100644
--- a/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c
+++ b/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c
@@ -83,7 +83,7 @@
         memset(hdr, 0, sizeof(*hdr));
         hdr->nh_op = NMGR_OP_WRITE;
         hdr->nh_group = htons(MGMT_GROUP_ID_IMAGE);
-        hdr->nh_id = IMGMGR_NMGR_OP_UPLOAD;
+        hdr->nh_id = IMGMGR_NMGR_ID_UPLOAD;
 
         if (off) {
             memcpy(buf + payload_off, payload_next, sizeof payload_next);

boot/boot_serial/test/syscfg.yml

diff --git a/boot/boot_serial/test/syscfg.yml b/boot/boot_serial/test/syscfg.yml
index c982db5..ff841d6 100644
--- a/boot/boot_serial/test/syscfg.yml
+++ b/boot/boot_serial/test/syscfg.yml
@@ -19,3 +19,5 @@
 # Package: boot/boot_serial/test
 
 syscfg.vals:
+    # This is here to work around the $notnull syscfg restriction.
+    BOOT_SERIAL_DETECT_PIN: 0