From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH 11/12] test: Store pcap files in $LOGDIR instead of /tmp
Date: Wed, 07 Sep 2022 23:03:06 +1000
Message-ID: <20220907130307.1166467-12-david@gibson.dropbear.id.au>
In-Reply-To: <20220907130307.1166467-1-david@gibson.dropbear.id.au>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4962467378836137204=="

--===============4962467378836137204==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/passt.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/passt.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__opts} --trace"
=20
@@ -94,7 +94,7 @@ setup_pasta() {
 	#  10003   spliced to init  |      as server
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/pasta.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/pasta.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__opts} --trace"
=20
@@ -124,7 +124,7 @@ setup_passt_in_ns() {
 	#  10031    as server  | forwarded to guest |
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/pasta_with_passt.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/pasta_with_passt.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__opts} --trace"
=20
@@ -142,7 +142,7 @@ setup_passt_in_ns() {
 	context_run ns "/sbin/dhclient -6 --no-pid ${__ifname}"
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/passt_in_pasta.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/passt_in_pasta.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__opts} --trace"
=20
@@ -194,7 +194,7 @@ setup_two_guests() {
 	#  10005            |           |           |  as server |  to ns #2
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/pasta_1.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/pasta_1.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__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_pi=
d}
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/pasta_2.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/pasta_2.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__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}"
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/passt_1.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/passt_1.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__opts} --trace"
=20
@@ -228,7 +228,7 @@ setup_two_guests() {
 	sleep 1
=20
 	__opts=3D
-	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p /tmp/passt_2.pcap"
+	[ ${PCAP} -eq 1 ] && __opts=3D"${__opts} -p ${LOGDIR}/passt_2.pcap"
 	[ ${DEBUG} -eq 1 ] && __opts=3D"${__opts} -d"
 	[ ${TRACE} -eq 1 ] && __opts=3D"${__opts} --trace"
=20
--=20
2.37.3


--===============4962467378836137204==--