From e961e127eaffaa93183e7b65bf8458f65cb577b7 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Sun, 3 Nov 2024 17:59:52 -0500
Subject: [PATCH] fixup! test(a3p-integration): Try to get more insight into
 the failing test

---
 .github/workflows/integration.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 9fc260159b87..5250c90516de 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -289,8 +289,8 @@ jobs:
         working-directory: a3p-integration
       - name: run proposals tests
         run: |
-          if [ ":$SLOGFILE" != : -o ":$AGD_LOG_FILE" != : ]; then
-            echo "Overriding docker to inherit SLOGFILE ${SLOGFILE-} and/or AGD_LOG_FILE ${AGD_LOG_FILE-}"
+          if [ "$SLOGFILE:$AGD_LOG_FILE:$XXX_GIBSON" != :: ]; then
+            echo "Overriding docker to inherit SLOGFILE ${SLOGFILE-}, AGD_LOG_FILE ${AGD_LOG_FILE-}, XXX_GIBSON ${XXX_GIBSON-}"
             tmpbin="$HOME/tmpbin"
             mkdir -p "$tmpbin"
             printf >"$tmpbin/docker" '#!/bin/bash
@@ -304,10 +304,14 @@ jobs:
                 shift
                 echo "docker run with SLOGFILE ${SLOGFILE-}, AGD_LOG_FILE ${AGD_LOG_FILE-}, XXX_GIBSON ${XXX_GIBSON-}"
                 declare -a opts
-                for var in SLOGFILE AGD_LOG_FILE XXX_GIBSON; do
+                for var in SLOGFILE AGD_LOG_FILE; do
                   f="${!var-}"
                   [ -n "$f" ] && touch "$f" && opts+=("-e" "$var" "-v" "$f:$f")
                 done
+                for var in XXX_GIBSON; do
+                  f="${!var-}"
+                  [ -n "$f" ] && opts+=("-e" "$var")
+                done
                 "$cmd" run "${opts[@]}" "$@"
               fi
             ' "$(which docker)"