aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-13 14:35:27 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-13 11:12:41 +0200
commitec6af08ca778aa51517c49d69bc9acda08666790 (patch)
treeeaef2ce2f3558b7ea22ff5e507e5663ac8f8aa67
parentd81366010718733df82edd4baebb814597d088ba (diff)
downloadpasst-ec6af08ca778aa51517c49d69bc9acda08666790.tar
passt-ec6af08ca778aa51517c49d69bc9acda08666790.tar.gz
passt-ec6af08ca778aa51517c49d69bc9acda08666790.tar.bz2
passt-ec6af08ca778aa51517c49d69bc9acda08666790.tar.lz
passt-ec6af08ca778aa51517c49d69bc9acda08666790.tar.xz
passt-ec6af08ca778aa51517c49d69bc9acda08666790.tar.zst
passt-ec6af08ca778aa51517c49d69bc9acda08666790.zip
demo: Move pidfiles to state directory
Avoiding putting them in bare /tmp means they will be automatically cleaned up with everything else. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--test/demo/passt5
-rw-r--r--test/demo/pasta10
2 files changed, 8 insertions, 7 deletions
diff --git a/test/demo/passt b/test/demo/passt
index dd6a119..eb9b856 100644
--- a/test/demo/passt
+++ b/test/demo/passt
@@ -69,7 +69,7 @@ say 'pasta' demo above.
sleep 3
passt cd __STATEDIR__/passt
-passtb ./pasta -P /tmp/pasta.pid
+passtb ./pasta -P pasta.pid
sleep 3
passt /sbin/dhclient -4 --no-pid
sleep 2
@@ -82,7 +82,8 @@ say Now let's run 'passt' in the new namespace, and
nl
say enter this namespace from the guest terminal too.
sleep 3
-gout TARGET_PID pgrep -P $(cat /tmp/pasta.pid)
+guest cd __STATEDIR__/passt
+gout TARGET_PID pgrep -P $(cat pasta.pid)
sleep 1
passtb ./passt -f -t 5201,5203
diff --git a/test/demo/pasta b/test/demo/pasta
index 22479f8..02a2ba2 100644
--- a/test/demo/pasta
+++ b/test/demo/pasta
@@ -47,7 +47,7 @@ nl
say without PID, it will create a namespace.
sleep 3
passt cd __STATEDIR__/passt
-passtb ./pasta -P /tmp/pasta.pid
+passtb ./pasta -P pasta.pid
sleep 3
nl
@@ -56,7 +56,8 @@ say For convenience, let's enter this namespace
nl
say from another terminal.
sleep 3
-nsout TARGET_PID pgrep -P $(cat /tmp/pasta.pid)
+ns cd __STATEDIR__/passt
+nsout TARGET_PID pgrep -P $(cat pasta.pid)
sleep 1
ns nsenter -t __TARGET_PID__ -U -n --preserve-credentials
@@ -168,10 +169,10 @@ passt exit
passt make clean
passt CFLAGS="-g" make
sleep 2
-passtb perf record -g ./pasta -P /tmp/pasta.pid
+passtb perf record -g ./pasta -P pasta.pid
sleep 2
-nsout TARGET_PID pgrep -P $(cat /tmp/pasta.pid)
+nsout TARGET_PID pgrep -P $(cat pasta.pid)
sleep 1
ns nsenter -t __TARGET_PID__ -U -n --preserve-credentials
sleep 5
@@ -255,7 +256,6 @@ sleep 2
killp PASST
killp HOST
sleep 2
-ns cd __STATEDIR__/passt
nsb perf report -g --max-stack 3
sleep 10