Make helper write titles to provider debug file

Makes it easier to check what operations each test sends to the token by writing the title of "PARA" sections to the provider's debug file. Signed-off-by: Simo Sorce <[email protected]>
simo5 · Aug 1, 2024 · 4d42717 · 4d42717
1 parent 49f4697
commit 4d42717
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/tests/helpers.sh b/tests/helpers.sh
@@ -23,6 +23,9 @@ title()
         shift 1
         echo ""
         echo "## $*"
+        if [ -f "${PPDBGFILE}" ]; then
+            echo "[TEST]: $*" >> "${PPDBGFILE}"
+        fi
         ;;
     "LINE")
         shift 1

diff --git a/tests/setup-kryoptic.sh b/tests/setup-kryoptic.sh
@@ -403,6 +403,7 @@ title LINE "Export test variables to ${TMPPDIR}/testvars"
 cat >> "${TMPPDIR}/testvars" <<DBGSCRIPT
 export P11LIB=${P11LIB}
 export PKCS11_PROVIDER_MODULE=${P11LIB}
+export PPDBGFILE=${TMPPDIR}/p11prov-debug.log
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export OPENSSL_CONF="${OPENSSL_CONF}"
 export KRYOPTIC_CONF="${TMPPDIR}/tokens/kryoptic.sql"

diff --git a/tests/setup-softhsm.sh b/tests/setup-softhsm.sh
@@ -395,6 +395,7 @@ title LINE "Export test variables to ${TMPPDIR}/testvars"
 cat >> "${TMPPDIR}/testvars" <<DBGSCRIPT
 export P11LIB=${P11LIB}
 export PKCS11_PROVIDER_MODULE=${P11LIB}
+export PPDBGFILE=${TMPPDIR}/p11prov-debug.log
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export OPENSSL_CONF="${OPENSSL_CONF}"
 export SOFTHSM2_CONF=${TMPPDIR}/softhsm.conf

diff --git a/tests/setup-softokn.sh b/tests/setup-softokn.sh
@@ -173,6 +173,7 @@ sed -e "s|@libtoollibs@|${LIBSPATH}|g" \
 
 title LINE "Export tests variables to ${TMPPDIR}/testvars"
 cat > "${TMPPDIR}/testvars" <<DBGSCRIPT
+export PPDBGFILE=${TMPPDIR}/p11prov-debug.log
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export PKCS11_PROVIDER_MODULE="${SOFTOKNPATH%%/}/libsoftokn3${SHARED_EXT}"
 export OPENSSL_CONF="${OPENSSL_CONF}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,9 @@ title() @@
             shift 1
             echo ""
             echo "## $*"
+            if [ -f "${PPDBGFILE}" ]; then
+                echo "[TEST]: $*" >> "${PPDBGFILE}"
+            fi
             ;;
         "LINE")
             shift 1
@@ Expand Down @@