aboutgitcodebugslistschat
diff options
context:
space:
mode:
-rw-r--r--test/demo/passt5
-rw-r--r--test/demo/pasta9
2 files changed, 6 insertions, 8 deletions
diff --git a/test/demo/passt b/test/demo/passt
index 16dcea3..c6c3bcc 100644
--- a/test/demo/passt
+++ b/test/demo/passt
@@ -70,7 +70,7 @@ say 'pasta' demo above.
sleep 3
passt cd __TEMPDIR__/passt
-passtb ./pasta
+passtb ./pasta -P /tmp/pasta.pid
sleep 3
passt /sbin/dhclient -4 --no-pid
sleep 2
@@ -83,8 +83,7 @@ say Now let's run 'passt' in the new namespace, and
nl
say enter this namespace from the guest terminal too.
sleep 3
-guest pstree -p | grep pasta
-gout TARGET_PID pstree -p | grep pasta | sed -n 's/.*(\([0-9].*\))$/\1/p'
+gout TARGET_PID pgrep -P $(cat /tmp/pasta.pid)
sleep 1
passtb ./passt -f -t 5201,5203
diff --git a/test/demo/pasta b/test/demo/pasta
index f4b7da2..be117b3 100644
--- a/test/demo/pasta
+++ b/test/demo/pasta
@@ -48,7 +48,7 @@ nl
say without PID, it will create a namespace.
sleep 3
passt cd __TEMPDIR__/passt
-passtb ./pasta
+passtb ./pasta -P /tmp/pasta.pid
sleep 3
nl
@@ -57,8 +57,7 @@ say For convenience, let's enter this namespace
nl
say from another terminal.
sleep 3
-ns pstree -p | grep pasta
-nsout TARGET_PID pstree -p | grep pasta | sed -n 's/.*(\([0-9].*\))$/\1/p'
+nsout TARGET_PID pgrep -P $(cat /tmp/pasta.pid)
sleep 1
ns nsenter -t __TARGET_PID__ -U -n --preserve-credentials
@@ -171,10 +170,10 @@ passt exit
passt make clean
passt CFLAGS="-g" make
sleep 2
-passtb perf record -g ./pasta
+passtb perf record -g ./pasta -P /tmp/pasta.pid
sleep 2
-nsout TARGET_PID pstree -p | grep pasta | sed -n 's/.*(\([0-9].*\))$/\1/p'
+nsout TARGET_PID pgrep -P $(cat /tmp/pasta.pid)
sleep 1
ns nsenter -t __TARGET_PID__ -U -n --preserve-credentials
sleep 5