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

Merge branch 'bugfix/add_ut_job' into 'master'

Browse source 
ci: add UT job

See merge request espressif/esp-idf!8251
This commit is contained in:
Ivan Grokhotkov 2020-04-03 22:47:15 +08:00
commit 7693226efe
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/driver/spi_bus_lock.c
View file

@ -224,7 +224,7 @@ struct spi_bus_lock_dev_t {
uint32_t mask; ///< Bitwise OR-ed mask of the REQ, PEND, LOCK bits of this device uint32_t mask; ///< Bitwise OR-ed mask of the REQ, PEND, LOCK bits of this device
}; };
static const char TAG[] = "bus_lock"; DRAM_ATTR static const char TAG[] = "bus_lock";
#define LOCK_CHECK(a, str, ret_val, ...) \ #define LOCK_CHECK(a, str, ret_val, ...) \
if (!(a)) { \ if (!(a)) { \
@ -656,8 +656,10 @@ IRAM_ATTR bool spi_bus_lock_touch(spi_bus_lock_dev_handle_t dev_handle)
{ {
spi_bus_lock_dev_t* last_dev = dev_handle->parent->last_dev; spi_bus_lock_dev_t* last_dev = dev_handle->parent->last_dev;
dev_handle->parent->last_dev = dev_handle; dev_handle->parent->last_dev = dev_handle;
ESP_EARLY_LOGD(TAG, "SPI dev changed from %d to %d", if (last_dev) {
dev_lock_get_id(last_dev), dev_lock_get_id(dev_handle)); ESP_DRAM_LOGD(TAG, "SPI dev changed from %d to %d",
dev_lock_get_id(last_dev), dev_lock_get_id(dev_handle));
}
return (dev_handle != last_dev); return (dev_handle != last_dev);
} }
@ -679,7 +681,7 @@ IRAM_ATTR esp_err_t spi_bus_lock_acquire_start(spi_bus_lock_dev_t *dev_handle, T
if (err != ESP_OK) return err; if (err != ESP_OK) return err;
} }
ESP_LOGV(TAG, "dev %d acquired.", dev_lock_get_id(dev_handle)); ESP_DRAM_LOGV(TAG, "dev %d acquired.", dev_lock_get_id(dev_handle));
BUS_LOCK_DEBUG_EXECUTE_CHECK(lock->acquiring_dev == dev_handle); BUS_LOCK_DEBUG_EXECUTE_CHECK(lock->acquiring_dev == dev_handle);
//When arrives at here, requests of this device should already be handled //When arrives at here, requests of this device should already be handled

2
tools/ci/config/target-test.yml
View file

@ -495,7 +495,7 @@ UT_034:
UT_035: UT_035:
extends: .unit_test_s2_template extends: .unit_test_s2_template
parallel: 32 parallel: 33
tags: tags:
- ESP32S2_IDF - ESP32S2_IDF
- UT_T1_1 - UT_T1_1