Skip to content

Let the podman test runner be sourced like run-tests.sh #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markmnl merged 1 commit into from
Oct 15, 2026
Merged

Let the podman test runner be sourced like run-tests.sh #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions test/run-tests-podman.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
# ./test/run-tests-podman.sh
# ./test/run-tests-podman.sh --no-start
# ./test/run-tests-podman.sh cleanup
#
# It can also be sourced, like run-tests.sh, by callers that need the URLs and
# keys run-tests.sh exports (fmsg-mcp's end-to-end runner does this). The shim
# then stays on PATH; the caller removes $FMSG_PODMAN_SHIM_DIR when done.
# =============================================================
set -euo pipefail

Expand All @@ -44,7 +48,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
command -v podman &>/dev/null || { echo "podman not found on PATH" >&2; exit 1; }

SHIM_DIR="$(mktemp -d)"
trap 'rm -rf "$SHIM_DIR"' EXIT

cat > "$SHIM_DIR/resolve-compose-vars.py" <<'EOF'
import os
Expand Down Expand Up @@ -162,4 +165,12 @@ chmod +x "$SHIM_DIR/docker"

export PATH="$SHIM_DIR:$PATH"

exec "$SCRIPT_DIR/run-tests.sh" "$@"
if [[ "${BASH_SOURCE[0]}" != "$0" ]]; then
export FMSG_PODMAN_SHIM_DIR="$SHIM_DIR"
# shellcheck source=run-tests.sh
source "$SCRIPT_DIR/run-tests.sh" "$@"
return
fi

trap 'rm -rf "$SHIM_DIR"' EXIT
"$SCRIPT_DIR/run-tests.sh" "$@"
Loading