diff options
| -rw-r--r-- | common/online_calibration.c | 8 | ||||
| -rwxr-xr-x | firmware_builder.py | 5 | ||||
| -rw-r--r-- | test/build.mk | 3 | ||||
| -rw-r--r-- | test/usb_prl_old.c | 8 | ||||
| -rw-r--r-- | test/usb_sm_checks.c | 10 |
5 files changed, 19 insertions, 15 deletions
diff --git a/common/online_calibration.c b/common/online_calibration.c index 3bc56f85c7..6ff46f4714 100644 --- a/common/online_calibration.c +++ b/common/online_calibration.c @@ -201,11 +201,9 @@ void online_calibration_init(void) struct motion_sensor_t *s = motion_sensors + i; void *type_specific_data = NULL; - if (s->online_calib_data) { - s->online_calib_data->last_temperature = -1; - type_specific_data = - s->online_calib_data->type_specific_data; - } + s->online_calib_data->last_temperature = -1; + type_specific_data = + s->online_calib_data->type_specific_data; if (!type_specific_data) continue; diff --git a/firmware_builder.py b/firmware_builder.py index 1a7b6c8749..6b5d094edf 100755 --- a/firmware_builder.py +++ b/firmware_builder.py @@ -211,6 +211,11 @@ def test(opts): print(f"# Running {' '.join(cmd)}.") subprocess.run(cmd, cwd=os.path.dirname(__file__), check=True) + # Verify the tests pass with ASan also + cmd = ['make', 'TEST_ASAN=y', target, f'-j{opts.cpus}'] + print(f"# Running {' '.join(cmd)}.") + subprocess.run(cmd, cwd=os.path.dirname(__file__), check=True) + def main(args): """Builds, bundles, or tests all of the EC targets. diff --git a/test/build.mk b/test/build.mk index 3184f0a8f1..fac9544ca4 100644 --- a/test/build.mk +++ b/test/build.mk @@ -47,7 +47,10 @@ test-list-host += inductive_charging # test-list-host += interrupt test-list-host += irq_locking test-list-host += is_enabled +ifeq ($(TEST_ASAN),) +# is_enabled_error fails with TEST_ASAN test-list-host += is_enabled_error +endif test-list-host += kasa test-list-host += kb_8042 test-list-host += kb_mkbp diff --git a/test/usb_prl_old.c b/test/usb_prl_old.c index c4a8991bd6..a6ae6acb0e 100644 --- a/test/usb_prl_old.c +++ b/test/usb_prl_old.c @@ -208,7 +208,7 @@ static void cycle_through_state_machine(int port, uint32_t num, uint32_t time) } } -static int simulate_request_chunk(int port, enum pd_data_msg_type msg_type, +static int simulate_request_chunk(int port, enum pd_ext_msg_type msg_type, int chunk_num, int len) { uint16_t header = PD_HEADER(msg_type, get_partner_power_role(port), @@ -568,7 +568,7 @@ static int verify_data_msg_transmission(int port, } static int simulate_send_data_msg_request_from_pe(int port, - enum tcpci_msg_type type, enum pd_ctrl_msg_type msg_type, int len) + enum tcpci_msg_type type, enum pd_data_msg_type msg_type, int len) { int i; uint8_t *buf = tx_emsg[port].buf; @@ -590,7 +590,7 @@ static int simulate_send_data_msg_request_from_pe(int port, } static int verify_extended_data_msg_transmission(int port, - enum pd_data_msg_type msg_type, int len) + enum pd_ext_msg_type msg_type, int len) { int i; int j; @@ -703,7 +703,7 @@ static int verify_extended_data_msg_transmission(int port, } static int simulate_send_extended_data_msg(int port, - enum tcpci_msg_type type, enum pd_ctrl_msg_type msg_type, + enum tcpci_msg_type type, enum pd_ext_msg_type msg_type, int len) { int i; diff --git a/test/usb_sm_checks.c b/test/usb_sm_checks.c index 468e6f0254..49b2dbae28 100644 --- a/test/usb_sm_checks.c +++ b/test/usb_sm_checks.c @@ -116,7 +116,7 @@ __override void print_current_state(const int port) state_printed = 1; } -static int test_all_states_named(const struct test_sm_data * const sm_data) +static int test_all_states_named(const struct test_sm_data *const sm_data) { int i; @@ -125,12 +125,10 @@ static int test_all_states_named(const struct test_sm_data * const sm_data) state_printed = 0; - if (current->entry) + if (current->entry && + (i >= sm_data->names_size || sm_data->names[i] == NULL)) { current->entry(0); - - if (state_printed) { - if (i >= sm_data->names_size || - sm_data->names[i] == NULL) { + if (state_printed) { ccprintf("State %d does not have a name!\n", i); TEST_ASSERT(0); } |