incubator-mynewt-core git commit: bootutil - Remove broken obsolete test code.

[cc...@apache.org]

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop 201dfeb86 -> 549d2b209


bootutil - Remove broken obsolete test code.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/549d2b20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/549d2b20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/549d2b20

Branch: refs/heads/develop
Commit: 549d2b2091a7626962d3717bdbb6f9fa224ac4c2
Parents: 201dfeb
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Sep 27 15:40:01 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Sep 27 15:40:01 2016 -0700

----------------------------------------------------------------------
 libs/bootutil/test/pkg.yml         |  3 ---
 libs/bootutil/test/src/boot_test.c | 34 ---------------------------------
 2 files changed, 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/549d2b20/libs/bootutil/test/pkg.yml
----------------------------------------------------------------------
diff --git a/libs/bootutil/test/pkg.yml b/libs/bootutil/test/pkg.yml
index f5bb9d5..6f6718b 100644
--- a/libs/bootutil/test/pkg.yml
+++ b/libs/bootutil/test/pkg.yml
@@ -28,6 +28,3 @@ pkg.deps:
 
 pkg.deps.SELFTEST:
     - libs/console/stub
-
-pkg.syscfg_vals:
-    BOOTUTIL_NFFS: 1

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/549d2b20/libs/bootutil/test/src/boot_test.c
----------------------------------------------------------------------
diff --git a/libs/bootutil/test/src/boot_test.c b/libs/bootutil/test/src/boot_test.c
index 94c8554..10cd045 100644
--- a/libs/bootutil/test/src/boot_test.c
+++ b/libs/bootutil/test/src/boot_test.c
@@ -27,9 +27,6 @@
 #include "testutil/testutil.h"
 #include "hal/hal_flash.h"
 #include "hal/flash_map.h"
-#include "fs/fs.h"
-#include "nffs/nffs.h"
-#include "config/config_file.h"
 #include "bootutil/image.h"
 #include "bootutil/loader.h"
 #include "bootutil/bootutil_misc.h"
@@ -67,12 +64,6 @@ static struct {
 
 #define BOOT_TEST_AREA_IDX_SCRATCH 6
 
-#define MY_CONF_PATH "/cfg/run"
-
-static struct conf_file my_conf = {
-    .cf_name = MY_CONF_PATH
-};
-
 static uint8_t
 boot_test_util_byte_at(int img_msb, uint32_t image_offset)
 {
@@ -90,8 +81,6 @@ boot_test_util_init_flash(void)
 {
     const struct flash_area *area_desc;
     int rc;
-    struct nffs_area_desc nffs_descs[32];
-    int cnt;
 
     rc = hal_flash_init();
     TEST_ASSERT(rc == 0);
@@ -103,17 +92,6 @@ boot_test_util_init_flash(void)
         rc = flash_area_erase(area_desc, 0, area_desc->fa_size);
         TEST_ASSERT(rc == 0);
     }
-    cnt = 32;
-
-    rc = nffs_misc_desc_from_flash_area(FLASH_AREA_NFFS, &cnt, nffs_descs);
-    TEST_ASSERT(rc == 0);
-
-    rc = nffs_init();
-    TEST_ASSERT(rc == 0);
-    rc = nffs_format(nffs_descs);
-    TEST_ASSERT(rc == 0);
-
-    fs_mkdir("/cfg");
 }
 
 static void
@@ -397,17 +375,6 @@ boot_test_util_verify_flash(const struct image_header *hdr0, int orig_slot_0,
     }
 }
 
-TEST_CASE(boot_test_setup)
-{
-    int rc;
-
-    rc = conf_file_src(&my_conf);
-    assert(rc == 0);
-    rc = conf_file_dst(&my_conf);
-    assert(rc == 0);
-
-}
-
 TEST_CASE(boot_test_nv_ns_10)
 {
     struct boot_rsp rsp;
@@ -1160,7 +1127,6 @@ TEST_CASE(boot_test_invalid_hash)
 
 TEST_SUITE(boot_test_main)
 {
-    boot_test_setup();
     boot_test_nv_ns_10();
     boot_test_nv_ns_01();
     boot_test_nv_ns_11();