From ed25e33899cb55377b1bc1f4f47625889bb52fa7 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Thu, 18 Oct 2018 10:39:18 +0200 Subject: replaced ncurses ui sleep&ipc_msgcount check with ipc_msgrecv to fix issues with multithreading/multiprocess handling Signed-off-by: Toni Uhlig --- luks_test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'luks_test.sh') diff --git a/luks_test.sh b/luks_test.sh index 98be5ea..0f9d0f8 100755 --- a/luks_test.sh +++ b/luks_test.sh @@ -25,11 +25,12 @@ if [ ! -w ${FILE} ] || [ `file ${FILE} | grep -qoE 'LUKS encrypted file' && echo /sbin/cryptsetup luksFormat ${FILE} fi +CS_OPEN_ARGS="-q -T1 open ${FILE} ${NAME}" if [ "x${DEBUG}" != "x" ]; then - sudo valgrind --log-file=valgrind.log src/naskpass -f ./${NAME}.fifo -c "/sbin/cryptsetup open ${FILE} ${NAME}" 2>./${NAME}_err.log || true - sudo valgrind --tool=helgrind --log-file=helgrind.log src/naskpass -f ./${NAME}.fifo -c "/sbin/cryptsetup open ${FILE} ${NAME}" 2>./${NAME}_err_hell.log || true + sudo valgrind --log-file=valgrind.log src/naskpass -f ./${NAME}.fifo -c "/sbin/cryptsetup ${CS_OPEN_ARGS}" 2>./${NAME}_err.log || true + sudo valgrind --tool=helgrind --log-file=helgrind.log src/naskpass -f ./${NAME}.fifo -c "/sbin/cryptsetup ${CS_OPEN_ARGS}" 2>./${NAME}_err_hell.log || true else - sudo src/naskpass -f ./${NAME}.fifo -c "/sbin/cryptsetup open ${FILE} ${NAME}" 2>./${NAME}_err.log + sudo src/naskpass -f ./${NAME}.fifo -c "/sbin/cryptsetup ${CS_OPEN_ARGS}" 2>./${NAME}_err.log fi set +e -- cgit v1.2.3