We use this fifo to send messages to the information pane. Put it in the
state directory so it doesn't need its own cleanup.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
test/lib/layout | 16 ++++++++--------
test/lib/term | 12 ++++++------
test/run | 7 ++-----
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/test/lib/layout b/test/lib/layout
index cc7c688..cf319bf 100644
--- a/test/lib/layout
+++ b/test/lib/layout
@@ -27,7 +27,7 @@ layout_host() {
get_info_cols
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T "test log"
@@ -61,7 +61,7 @@ layout_pasta() {
get_info_cols
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T "test log"
@@ -92,7 +92,7 @@ layout_passt() {
get_info_cols
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T "test log"
@@ -128,7 +128,7 @@ layout_passt_in_pasta() {
pane_watch_contexts ${PANE_GUEST} "guest" qemu guest
pane_watch_contexts ${PANE_NS} "namespace" ns
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T "test log"
@@ -171,7 +171,7 @@ layout_two_guests() {
pane_watch_contexts ${PANE_GUEST_1} "guest #1 in namespace #1" qemu_1 guest_1
pane_watch_contexts ${PANE_GUEST_2} "guest #2 in namespace #2" qemu_2 guest_2
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T "test log"
@@ -207,7 +207,7 @@ layout_demo_pasta() {
tmux pipe-pane -O -t ${PANE_NS} "cat >> ${LOGDIR}/pane_ns.log"
tmux select-pane -t ${PANE_NS} -T "namespace"
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T ""
@@ -243,7 +243,7 @@ layout_demo_passt() {
tmux pipe-pane -O -t ${PANE_GUEST} "cat >> ${LOGDIR}/pane_guest.log"
tmux select-pane -t ${PANE_GUEST} -T "guest"
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T ""
@@ -282,7 +282,7 @@ layout_demo_podman() {
tmux pipe-pane -O -t ${PANE_NS2} "cat >> ${LOGDIR}/pane_ns2.log"
tmux select-pane -t ${PANE_NS2} -T "Podman with pasta"
- tmux send-keys -l -t ${PANE_INFO} 'while cat /tmp/.passt_test_log_pipe; do :;
done'
+ tmux send-keys -l -t ${PANE_INFO} 'while cat
'"$STATEBASE/log_pipe"'; do :; done'
tmux send-keys -t ${PANE_INFO} -N 100 C-m
tmux select-pane -t ${PANE_INFO} -T ""
diff --git a/test/lib/term b/test/lib/term
index 8b8ad56..9a3ef7f 100755
--- a/test/lib/term
+++ b/test/lib/term
@@ -31,7 +31,7 @@ PR_DELAY_INIT=100 # ms
# $@: Message to print
info() {
tmux select-pane -t ${PANE_INFO}
- echo "${@}" >> /tmp/.passt_test_log_pipe
+ echo "${@}" >> $STATEBASE/log_pipe
echo "${@}" >> "${LOGFILE}"
}
@@ -39,7 +39,7 @@ info() {
# $@: Message to print
info_n() {
tmux select-pane -t ${PANE_INFO}
- printf "${@}" >> /tmp/.passt_test_log_pipe
+ printf "${@}" >> $STATEBASE/log_pipe
printf "${@}" >> "${LOGFILE}"
}
@@ -47,7 +47,7 @@ info_n() {
# $@: Message to print
info_nolog() {
tmux select-pane -t ${PANE_INFO}
- echo "${@}" >> /tmp/.passt_test_log_pipe
+ echo "${@}" >> $STATEBASE/log_pipe
}
# info_nolog() - Print message to log file
@@ -365,7 +365,7 @@ status_test_start() {
info_check() {
switch_pane ${PANE_INFO}
- printf "${PR_YELLOW}?${PR_NC} ${@}" >> /tmp/.passt_test_log_pipe
+ printf "${PR_YELLOW}?${PR_NC} ${@}" >> $STATEBASE/log_pipe
printf "? ${@}" >> "${LOGFILE}"
}
@@ -373,7 +373,7 @@ info_check() {
info_check_passed() {
switch_pane ${PANE_INFO}
- printf "\n" >> /tmp/.passt_test_log_pipe
+ printf "\n" >> $STATEBASE/log_pipe
printf "\n" >> ${LOGFILE}
}
@@ -381,7 +381,7 @@ info_check_passed() {
info_check_failed() {
switch_pane ${PANE_INFO}
- printf " ${PR_RED}!${PR_NC}\n" >> /tmp/.passt_test_log_pipe
+ printf " ${PR_RED}!${PR_NC}\n" >> $STATEBASE/log_pipe
printf " < failed.\n" >> "${LOGFILE}"
}
diff --git a/test/run b/test/run
index 58d9b49..4bb9cd8 100755
--- a/test/run
+++ b/test/run
@@ -49,13 +49,11 @@ COMMIT="$(git log --oneline --no-decorate -1)"
# cleanup() - Remove temporary files
cleanup() {
[ ${DEBUG} -eq 1 ] || rm -rf "${STATEBASE}"
- rm -f /tmp/.passt_test_log_pipe
}
# run() - Call setup functions, run tests, handle exit from test session
run() {
- rm -f /tmp/.passt_test_log_pipe
- mkfifo /tmp/.passt_test_log_pipe
+ mkfifo $STATEBASE/log_pipe
term
perf_init
@@ -131,8 +129,7 @@ run() {
# demo() - Simpler path for demo purposes
demo() {
- rm -f /tmp/.passt_test_log_pipe
- mkfifo /tmp/.passt_test_log_pipe
+ mkfifo $STATEBASE/log_pipe
FAST=0
--
2.37.3