From 3979aeb5d460d8044f175713c508e28413e9efcc Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 16 Nov 2017 18:18:55 +0000 Subject: It passes tests now. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11023 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- test/mfs/configuration.xml | 16 +++++++++------- test/mfs/source/test/mfs_test_sequence_001.c | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/mfs/configuration.xml b/test/mfs/configuration.xml index c1c459630..c715b6b93 100644 --- a/test/mfs/configuration.xml +++ b/test/mfs/configuration.xml @@ -795,18 +795,18 @@ mfsErase(&mfs1);]]> @@ -823,9 +823,9 @@ for (id = 1; id <= id_max; id++) { size_t size; mfs_id_t id; mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) / - (sizeof (mfs_data_header_t) + sizeof pattern512); + (sizeof (mfs_data_header_t) + (sizeof pattern512 / 2)); mfs_id_t n = ((mfscfg1.bank_size - sizeof (mfs_bank_header_t)) - - (id_max * (sizeof (mfs_data_header_t) + sizeof pattern512))) / + (id_max * (sizeof (mfs_data_header_t) + (sizeof pattern512 / 2)))) / sizeof (mfs_data_header_t); for (id = 1; id <= n; id++) { @@ -847,13 +847,15 @@ for (id = 1; id <= n; id++) { diff --git a/test/mfs/source/test/mfs_test_sequence_001.c b/test/mfs/source/test/mfs_test_sequence_001.c index c96109813..c0cc35730 100644 --- a/test/mfs/source/test/mfs_test_sequence_001.c +++ b/test/mfs/source/test/mfs_test_sequence_001.c @@ -711,18 +711,18 @@ static void mfs_test_001_007_execute(void) { { mfs_id_t id; mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) / - (sizeof (mfs_data_header_t) + sizeof pattern512); + (sizeof (mfs_data_header_t) + (sizeof pattern512 / 2)); for (id = 1; id <= id_max; id++) { mfs_error_t err; size_t size; - err = mfsWriteRecord(&mfs1, id, sizeof pattern512, pattern512); + err = mfsWriteRecord(&mfs1, id, (sizeof pattern512 / 2), pattern512); test_assert(err == MFS_NO_ERROR, "error creating the record"); size = sizeof mfs_buffer; err = mfsReadRecord(&mfs1, id, &size, mfs_buffer); test_assert(err == MFS_NO_ERROR, "record not found"); - test_assert(size == sizeof pattern512, "unexpected record length"); + test_assert(size == (sizeof pattern512 / 2), "unexpected record length"); test_assert(memcmp(pattern512, mfs_buffer, size) == 0, "wrong record content"); } } @@ -734,9 +734,9 @@ static void mfs_test_001_007_execute(void) { size_t size; mfs_id_t id; mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) / - (sizeof (mfs_data_header_t) + sizeof pattern512); + (sizeof (mfs_data_header_t) + (sizeof pattern512 / 2)); mfs_id_t n = ((mfscfg1.bank_size - sizeof (mfs_bank_header_t)) - - (id_max * (sizeof (mfs_data_header_t) + sizeof pattern512))) / + (id_max * (sizeof (mfs_data_header_t) + (sizeof pattern512 / 2)))) / sizeof (mfs_data_header_t); for (id = 1; id <= n; id++) { @@ -755,13 +755,15 @@ static void mfs_test_001_007_execute(void) { { mfs_error_t err; size_t size; + mfs_id_t id_max = (mfscfg1.bank_size - sizeof (mfs_bank_header_t)) / + (sizeof (mfs_data_header_t) + (sizeof pattern512 / 2)); test_assert(mfs1.current_counter == 1, "not first instance"); - err = mfsEraseRecord(&mfs1, MFS_CFG_MAX_RECORDS / 2); + err = mfsEraseRecord(&mfs1, id_max); test_assert(err == MFS_WARN_GC, "error erasing the record"); test_assert(mfs1.current_counter == 2, "not second instance"); size = sizeof mfs_buffer; - err = mfsReadRecord(&mfs1, MFS_CFG_MAX_RECORDS / 2, &size, mfs_buffer); + err = mfsReadRecord(&mfs1, id_max, &size, mfs_buffer); test_assert(err == MFS_ERR_NOT_FOUND, "record not erased"); test_assert(mfs1.current_bank == MFS_BANK_1, "unexpected bank"); test_assert(bank_verify_erased(MFS_BANK_0) == FLASH_NO_ERROR, "bank 0 not erased"); -- cgit v1.2.3