From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH v4 10/12] test: Store pcap files in $LOGDIR instead of /tmp
Date: Fri, 09 Sep 2022 13:30:26 +1000 [thread overview]
Message-ID: <20220909033028.570161-11-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220909033028.570161-1-david@gibson.dropbear.id.au>
[-- Attachment #1: Type: text/plain, Size: 3460 bytes --]
The capture files are more or less a different form of log output from the
tests, so place them in $LOGDIR.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
test/lib/setup | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/lib/setup b/test/lib/setup
index b0420fb..87eb05a 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -47,7 +47,7 @@ setup_passt() {
# 10003 | as server
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -94,7 +94,7 @@ setup_pasta() {
# 10003 spliced to init | as server
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -124,7 +124,7 @@ setup_passt_in_ns() {
# 10031 as server | forwarded to guest |
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta_with_passt.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_with_passt.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -142,7 +142,7 @@ setup_passt_in_ns() {
context_run ns "/sbin/dhclient -6 --no-pid ${__ifname}"
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt_in_pasta.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_in_pasta.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -194,7 +194,7 @@ setup_two_guests() {
# 10005 | | | as server | to ns #2
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta_1.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
context_run_bg pasta_1 "./pasta ${__opts} -P pasta_1.pid -t 10001,10002 -T 10003,10004 -u 10001,10002 -U 10003,10004 ${NSHOLDER} ns1.hold hold"
@@ -202,7 +202,7 @@ setup_two_guests() {
context_setup_nsenter passt_1 -U -n -p --preserve-credentials -t ${__ns1_pid}
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta_2.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_2.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
context_run_bg pasta_2 "./pasta ${__opts} -P pasta_2.pid -t 10004,10005 -T 10003,10001 -u 10004,10005 -U 10003,10001 ${NSHOLDER} ns2.hold hold"
@@ -220,7 +220,7 @@ setup_two_guests() {
context_run qemu_2 "/sbin/dhclient -6 --no-pid ${__ifname}"
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt_1.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -228,7 +228,7 @@ setup_two_guests() {
sleep 1
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt_2.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_2.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
--
@@ -47,7 +47,7 @@ setup_passt() {
# 10003 | as server
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -94,7 +94,7 @@ setup_pasta() {
# 10003 spliced to init | as server
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -124,7 +124,7 @@ setup_passt_in_ns() {
# 10031 as server | forwarded to guest |
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta_with_passt.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_with_passt.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -142,7 +142,7 @@ setup_passt_in_ns() {
context_run ns "/sbin/dhclient -6 --no-pid ${__ifname}"
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt_in_pasta.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_in_pasta.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -194,7 +194,7 @@ setup_two_guests() {
# 10005 | | | as server | to ns #2
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta_1.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
context_run_bg pasta_1 "./pasta ${__opts} -P pasta_1.pid -t 10001,10002 -T 10003,10004 -u 10001,10002 -U 10003,10004 ${NSHOLDER} ns1.hold hold"
@@ -202,7 +202,7 @@ setup_two_guests() {
context_setup_nsenter passt_1 -U -n -p --preserve-credentials -t ${__ns1_pid}
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/pasta_2.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_2.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
context_run_bg pasta_2 "./pasta ${__opts} -P pasta_2.pid -t 10004,10005 -T 10003,10001 -u 10004,10005 -U 10003,10001 ${NSHOLDER} ns2.hold hold"
@@ -220,7 +220,7 @@ setup_two_guests() {
context_run qemu_2 "/sbin/dhclient -6 --no-pid ${__ifname}"
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt_1.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
@@ -228,7 +228,7 @@ setup_two_guests() {
sleep 1
__opts=
- [ ${PCAP} -eq 1 ] && __opts="${__opts} -p /tmp/passt_2.pcap"
+ [ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_2.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
--
2.37.3
next prev parent reply other threads:[~2022-09-09 3:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 3:30 [PATCH v4 00/12] Improve handling of test temporary files David Gibson
2022-09-09 3:30 ` [PATCH v4 01/12] test: Group tests by context then protocol, rather than the reverse David Gibson
2022-09-09 3:30 ` [PATCH v4 02/12] test: Remove unused variable FFMPEG_PID_FILE David Gibson
2022-09-09 3:30 ` [PATCH v4 03/12] test: Actually run cleanup function David Gibson
2022-09-09 3:30 ` [PATCH v4 04/12] test: Create common state directories for temporary files David Gibson
2022-09-09 3:30 ` [PATCH v4 05/12] test: Move passt_test_log_pipe to state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 06/12] test: Move context temporary files to state dir David Gibson
2022-09-09 3:30 ` [PATCH v4 07/12] test: Dont regnerate small test file in pasta/tcp David Gibson
2022-09-09 3:30 ` [PATCH v4 08/12] test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives David Gibson
2022-09-09 15:00 ` Stefano Brivio
2022-09-10 7:44 ` David Gibson
2022-09-10 20:41 ` Stefano Brivio
2022-09-09 3:30 ` [PATCH v4 09/12] test: Move pause temporary file to state directory David Gibson
2022-09-09 3:30 ` David Gibson [this message]
2022-09-09 3:30 ` [PATCH v4 11/12] test: Move pidfiles and nsholder sockets into " David Gibson
2022-09-09 3:30 ` [PATCH v4 12/12] test: Move video processing files to $STATEBASE David Gibson
2022-09-09 15:00 ` Stefano Brivio
2022-09-10 7:45 ` David Gibson
2022-09-10 20:41 ` Stefano Brivio
2022-09-13 4:41 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220909033028.570161-11-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).