aboutsummaryrefslogtreecommitdiff
path: root/luks_test.sh
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2018-10-18 10:39:18 +0200
committerToni Uhlig <matzeton@googlemail.com>2018-10-18 10:39:18 +0200
commited25e33899cb55377b1bc1f4f47625889bb52fa7 (patch)
tree9fff3babcce7d79c9cd5d3f768adb25ac262944b /luks_test.sh
parenta182509960b87569402df5fec10700b163787d5c (diff)
replaced ncurses ui sleep&ipc_msgcount check with ipc_msgrecv to fix issues with multithreading/multiprocess handling
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'luks_test.sh')
-rwxr-xr-xluks_test.sh7
1 files changed, 4 insertions, 3 deletions
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