subshell

robur-coop · Jun 25, 2024 · 98ef1a8 · 98ef1a8
1 parent 7e55313
commit 98ef1a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -39,5 +39,6 @@ jobs:
           opam exec -- dune runtest --instrument-with bisect_ppx
           opam exec -- dune exec bench/bench_engine.exe
           sudo ip tuntap add mode tun e2e-test
-          cd test/e2e && sudo ./test-server.sh e2e-test && sudo ./test-client.sh e2e-test && cd ../..
+          ( cd test/e2e && sudo ./test-client.sh e2e-test; )
+          ( cd test/e2e && sudo ./test-server.sh e2e-test; )
           opam exec -- ./coverage.sh
diff --git a/test/e2e/miragevpn-server.sh b/test/e2e/miragevpn-server.sh
@@ -21,7 +21,7 @@ pidfile="/tmp/miragevpn-e2e.pid"
 
 # kill openvpn client
 cleanup () {
-	{ cat "$pidfile" || true; } | xargs -r kill
+	{ cat "$pidfile" 2>/dev/null || true; } | xargs -r kill
 	rm -f "$pidfile"
 }
 trap cleanup EXIT