feat: print file and line number if `expect` fails
This makes debugging a failed expect easier.
Change-Id: I53a2b3cd1866c14f3983a2e36b94707a94f12ef3
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 141f1fe..b39f138 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -318,10 +318,10 @@
/* FFA_SECONDARY_EP_REGISTER interface is not supported for UP SP. */
if (ffa_id == (SPM_VM_ID_FIRST + 2)) {
- expect(ffa_func_id(ret), FFA_ERROR);
- expect(ffa_error_code(ret), FFA_ERROR_NOT_SUPPORTED);
+ EXPECT(ffa_func_id(ret), FFA_ERROR);
+ EXPECT(ffa_error_code(ret), FFA_ERROR_NOT_SUPPORTED);
} else {
- expect(ffa_func_id(ret), FFA_SUCCESS_SMC32);
+ EXPECT(ffa_func_id(ret), FFA_SUCCESS_SMC32);
}
discover_managed_exit_interrupt_id();
diff --git a/spm/cactus/cactus_tests/cactus_test_interrupts.c b/spm/cactus/cactus_tests/cactus_test_interrupts.c
index 2e0249c..c589119 100644
--- a/spm/cactus/cactus_tests/cactus_test_interrupts.c
+++ b/spm/cactus/cactus_tests/cactus_test_interrupts.c
@@ -36,7 +36,7 @@
static void check_sec_wdog_interrupt_triggered(void)
{
handle_sec_wdog_interrupt();
- expect(flag_set, 0);
+ EXPECT(flag_set, 0);
flag_set = 1;
}
@@ -233,7 +233,7 @@
static void sec_interrupt_test_espi_handled(void)
{
- expect(test_espi_handled, false);
+ EXPECT(test_espi_handled, false);
test_espi_handled = true;
NOTICE("Interrupt handler for test espi interrupt called\n");
diff --git a/spm/cactus/cactus_tests/cactus_test_memory_sharing.c b/spm/cactus/cactus_tests/cactus_test_memory_sharing.c
index 15df77d..811c79f 100644
--- a/spm/cactus/cactus_tests/cactus_test_memory_sharing.c
+++ b/spm/cactus/cactus_tests/cactus_test_memory_sharing.c
@@ -122,7 +122,7 @@
: FFA_INSTRUCTION_ACCESS_NX,
0, NULL);
- expect(memory_retrieve(mb, &m, handle, source, &receiver, 1,
+ EXPECT(memory_retrieve(mb, &m, handle, source, &receiver, 1,
retrv_flags),
true);