commit e90a4e42dd61e5a5230db693de141ca8645533b7
author Etienne Carriere <etienne.carriere@linaro.org> Mon Mar 02 12:04:08 2020 +0100
committer Jérôme Forissier <jerome@forissier.org> Thu Mar 05 16:37:17 2020 +0100
tree f552821f8451b368331e703d66abf1d62b681a78
parent fa7e34f85327d44bacaf09022d289629c51de1a3

pkcs11 1001: split in sub tests

Define ADBG sub tests per tested API for the friendly traces generated by
xtest.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

host/xtest/pkcs11_1000.c

diff --git a/host/xtest/pkcs11_1000.c b/host/xtest/pkcs11_1000.c
index a3edb8f..13ae404 100644
--- a/host/xtest/pkcs11_1000.c
+++ b/host/xtest/pkcs11_1000.c
@@ -66,6 +66,8 @@
 	if (!ADBG_EXPECT_CK_OK(c, rv))
 		return;
 
+	Do_ADBG_BeginSubCase(c, "Test C_GetFunctionList()");
+
 	rv = C_GetFunctionList(&ckfunc_list);
 	if (!ADBG_EXPECT_CK_OK(c, rv))
 		goto out;
@@ -75,10 +77,16 @@
 	    !ADBG_EXPECT_NOT_NULL(c, ckfunc_list->C_GetSlotInfo))
 		goto out;
 
+	Do_ADBG_EndSubCase(c, "Test C_GetFunctionList()");
+	Do_ADBG_BeginSubCase(c, "Test C_GetInfo()");
+
 	rv = C_GetInfo(&lib_info);
 	if (!ADBG_EXPECT_CK_OK(c, rv))
 		goto out;
 
+	Do_ADBG_EndSubCase(c, "Test C_GetInfo()");
+	Do_ADBG_BeginSubCase(c, "Test C_GetSlotList()");
+
 	rv = C_GetSlotList(0, NULL, &slot_count);
 	if (!ADBG_EXPECT_CK_OK(c, rv))
 		goto out;
@@ -107,6 +115,9 @@
 	if (!ADBG_EXPECT_CK_OK(c, rv))
 		goto out;
 
+	Do_ADBG_EndSubCase(c, "Test C_GetSlotList()");
+	Do_ADBG_BeginSubCase(c, "Test C_GetSlotInfo()");
+
 	for (i = 0; i < slot_count; i++) {
 		CK_SLOT_ID slot = slot_ids[i];
 
@@ -118,7 +129,9 @@
 			max_slot_id = slot;
 	}
 
-	/* Test invalid slot/token IDs */
+	Do_ADBG_EndSubCase(c, "Test C_GetSlotInfo()");
+	Do_ADBG_BeginSubCase(c, "Test C_Get*Info() with invalid reference");
+
 	rv = C_GetSlotInfo(max_slot_id + 1, &slot_info);
 	if (!ADBG_EXPECT_CK_RESULT(c, CKR_SLOT_ID_INVALID, rv))
 		goto out;
@@ -128,6 +141,7 @@
 		goto out;
 
 out:
+	Do_ADBG_EndSubCase(c, NULL);
 	free(slot_ids);
 
 	rv = C_Finalize(NULL);