Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a build issue with replacing init_spi_flash() in the host tests

Browse source
This commit is contained in:
Anton Maklakov 2019-08-01 11:23:41 +07:00
parent 12403e39b4
commit ec94ee80f7
11 changed files with 8 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/fatfs/test_fatfs_host/Makefile
View file

@ -81,7 +81,6 @@ $(foreach cxxfile, $(CPPFILES), $(eval $(call COMPILE_CPP, $(cxxfile))))
TEST_SOURCE_FILES = \
test_fatfs.cpp \
main.cpp \
test_utils.c
TEST_OBJ_FILES = $(filter %.o, $(TEST_SOURCE_FILES:.cpp=.o) $(TEST_SOURCE_FILES:.c=.o))

4
components/fatfs/test_fatfs_host/test_fatfs.cpp
View file

@ -9,11 +9,11 @@
#include "catch.hpp"
extern "C" void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
extern "C" void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
TEST_CASE("create volume, open file, write and read back data", "[fatfs]")
{
init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
_spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
FRESULT fr_result;
BYTE pdrv;

7
components/fatfs/test_fatfs_host/test_utils.c
View file

@ -1,7 +0,0 @@
#include "esp_spi_flash.h"
#include "esp_partition.h"
void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
{
spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
}

7
components/spi_flash/sim/flash_mock_util.c
View file

@ -4,13 +4,6 @@
#include "esp_err.h"
#include "esp32/rom/spi_flash.h"
extern void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
void spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
{
_spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
}
bool spi_flash_check_and_flush_cache(size_t start_addr, size_t length)
{
return true;

4
components/spi_flash/sim/stubs/freertos/include/freertos/FreeRTOS.h
View file

@ -2,7 +2,3 @@
#include "projdefs.h"
#include "semphr.h"
// Avoid redefinition compile error. Put here since this is included
// in flash_ops.c.
#define spi_flash_init() overriden_spi_flash_init()

1
components/spiffs/test_spiffs_host/Makefile
View file

@ -79,7 +79,6 @@ $(foreach cxxfile, $(CPPFILES), $(eval $(call COMPILE_CPP, $(cxxfile))))
TEST_SOURCE_FILES = \
test_spiffs.cpp \
main.cpp \
test_utils.c
TEST_OBJ_FILES = $(filter %.o, $(TEST_SOURCE_FILES:.cpp=.o) $(TEST_SOURCE_FILES:.c=.o))

6
components/spiffs/test_spiffs_host/test_spiffs.cpp
View file

@ -12,7 +12,7 @@
#include "catch.hpp"
extern "C" void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
extern "C" void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
static void init_spiffs(spiffs *fs, uint32_t max_files)
{
@ -152,7 +152,7 @@ static void check_spiffs_files(spiffs *fs, const char *base_path, char* cur_path
TEST_CASE("format disk, open file, write and read file", "[spiffs]")
{
init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
_spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
spiffs fs;
s32_t spiffs_res;
@ -204,7 +204,7 @@ TEST_CASE("format disk, open file, write and read file", "[spiffs]")
TEST_CASE("can read spiffs image", "[spiffs]")
{
init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
_spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
spiffs fs;
s32_t spiffs_res;

7
components/spiffs/test_spiffs_host/test_utils.c
View file

@ -1,7 +0,0 @@
#include "esp_spi_flash.h"
#include "esp_partition.h"
void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
{
spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
}

1
components/wear_levelling/test_wl_host/Makefile
View file

@ -80,7 +80,6 @@ $(foreach cxxfile, $(CPPFILES), $(eval $(call COMPILE_CPP, $(cxxfile))))
TEST_SOURCE_FILES = \
test_wl.cpp \
main.cpp \
test_utils.c
TEST_OBJ_FILES = $(filter %.o, $(TEST_SOURCE_FILES:.cpp=.o) $(TEST_SOURCE_FILES:.c=.o))

7
components/wear_levelling/test_wl_host/test_utils.c
View file

@ -1,7 +0,0 @@
#include "esp_spi_flash.h"
#include "esp_partition.h"
void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin)
{
spi_flash_init(chip_size, block_size, sector_size, page_size, partition_bin);
}

6
components/wear_levelling/test_wl_host/test_wl.cpp
View file

@ -12,14 +12,14 @@
#include "sdkconfig.h"
extern "C" void init_spi_flash(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
extern "C" void _spi_flash_init(const char* chip_size, size_t block_size, size_t sector_size, size_t page_size, const char* partition_bin);
extern SpiFlash spiflash;
#define TEST_COUNT_MAX 100
TEST_CASE("write and read back data", "[wear_levelling]")
{
init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
_spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
esp_err_t result;
wl_handle_t wl_handle;
@ -92,7 +92,7 @@ TEST_CASE("write and read back data", "[wear_levelling]")
TEST_CASE("power down test", "[wear_levelling]")
{
init_spi_flash(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
_spi_flash_init(CONFIG_ESPTOOLPY_FLASHSIZE, CONFIG_WL_SECTOR_SIZE * 16, CONFIG_WL_SECTOR_SIZE, CONFIG_WL_SECTOR_SIZE, "partition_table.bin");
esp_err_t result;
wl_handle_t wl_handle;