Fix intermittent config store tests failures

Make the journal object in cfstore_test_startup static since the call
to FlashJournal_initialize keep a copy of this for future use. This fixes
an intermittent crash start started showing up when optimizations
were set to "-os".
pull/2250/head
Russ Butler 2016-07-21 20:39:36 -05:00
parent bf1ac0d50c
commit 1799ace8ba
3 changed files with 3 additions and 3 deletions

View File

@ -273,7 +273,7 @@ static int32_t cfstore_test_startup(void)
#ifdef CFSTORE_CONFIG_BACKEND_FLASH_ENABLED #ifdef CFSTORE_CONFIG_BACKEND_FLASH_ENABLED
int32_t ret = ARM_DRIVER_ERROR; int32_t ret = ARM_DRIVER_ERROR;
FlashJournal_t jrnl; static FlashJournal_t jrnl;
extern ARM_DRIVER_STORAGE ARM_Driver_Storage_(0); extern ARM_DRIVER_STORAGE ARM_Driver_Storage_(0);
const ARM_DRIVER_STORAGE *drv = &ARM_Driver_Storage_(0); const ARM_DRIVER_STORAGE *drv = &ARM_Driver_Storage_(0);

View File

@ -166,7 +166,7 @@ int32_t cfstore_test_startup(void)
#ifdef CFSTORE_CONFIG_BACKEND_FLASH_ENABLED #ifdef CFSTORE_CONFIG_BACKEND_FLASH_ENABLED
int32_t ret = ARM_DRIVER_ERROR; int32_t ret = ARM_DRIVER_ERROR;
FlashJournal_t jrnl; static FlashJournal_t jrnl;
extern ARM_DRIVER_STORAGE ARM_Driver_Storage_(0); extern ARM_DRIVER_STORAGE ARM_Driver_Storage_(0);
const ARM_DRIVER_STORAGE *drv = &ARM_Driver_Storage_(0); const ARM_DRIVER_STORAGE *drv = &ARM_Driver_Storage_(0);

View File

@ -256,7 +256,7 @@ int32_t cfstore_test_startup(void)
#ifdef CFSTORE_CONFIG_BACKEND_FLASH_ENABLED #ifdef CFSTORE_CONFIG_BACKEND_FLASH_ENABLED
FlashJournal_t jrnl; static FlashJournal_t jrnl;
extern ARM_DRIVER_STORAGE ARM_Driver_Storage_(0); extern ARM_DRIVER_STORAGE ARM_Driver_Storage_(0);
const ARM_DRIVER_STORAGE *drv = &ARM_Driver_Storage_(0); const ARM_DRIVER_STORAGE *drv = &ARM_Driver_Storage_(0);