From 10b29564e5e8dc4caf628cce5c9f1fa8cc3fb30a Mon Sep 17 00:00:00 2001
From: Caleb Cox <canac@users.noreply.github.com>
Date: Tue, 19 Mar 2024 20:18:48 -0500
Subject: [PATCH] Split run commands and add debugging

---
 .github/workflows/e2e.yml | 11 +++++------
 e2e/test_bash.bash        |  2 +-
 e2e/test_zsh.zsh          |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 872b632..c0c5806 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -15,9 +15,8 @@ jobs:
         with:
           command: install
           args: --path .
-      - run: |
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          ./e2e/setup.sh
-          ./e2e/test_bash.bash
-          ./e2e/test_fish.fish
-          ./e2e/test_zsh.zsh
+      - run: eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+      - run: ./e2e/setup.sh
+      - run: ./e2e/test_bash.bash
+      - run: ./e2e/test_fish.fish
+      - run: ./e2e/test_zsh.zsh
diff --git a/e2e/test_bash.bash b/e2e/test_bash.bash
index 36eb541..c0cee2a 100755
--- a/e2e/test_bash.bash
+++ b/e2e/test_bash.bash
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 eval "$(portman init bash)"
 # Test shell integration setting port
diff --git a/e2e/test_zsh.zsh b/e2e/test_zsh.zsh
index 950418b..b9f45ba 100755
--- a/e2e/test_zsh.zsh
+++ b/e2e/test_zsh.zsh
@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-set -e
+set -ex
 
 eval "$(portman init zsh)"
 # Test shell integration setting port
@@ -19,7 +19,7 @@ cd ../portman2
 test -n "$PORT"
 test -z "$PORTMAN_LINKED_PORT"
 test portman2 = "$PORTMAN_PROJECT"
-MESSAGE=portman2 python3 ~/dev/portman/e2e/echo_server.py &
+MESSAGE=portman2 python3 e2e/echo_server.py &
 server2_pid=$!
 sleep 1
 curl --silent --show-error https://portman2.localhost | grep portman2