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();