laantungir/fips
1
0
Fork 0
mirror of https://github.com/jmcorgan/fips.git synced 2026-10-05 11:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge maint into master, carrying the mesh-lab empty-array fix

Browse Source 
The mesh-lab rekey loop expands its env_args array in a form bash 3.2 accepts when the array is empty, so the plain rekey variant runs on macOS instead of skipping setup and reporting a false rekey failure. run-loop.sh is identical on both lines, so the change applies unchanged.
This commit is contained in:
Johnathan Corgan
2026-09-12 13:16:42 +00:00
parent 21faff5269 31ebec6208
commit 38622e5dac
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/mesh-lab/run-loop.sh
+6 -3
View File
@@ -163,6 +163,9 @@ run_rekey_family() {
local variant="$1" # rekey, rekey-accept-off, rekey-outbound-only
local REP_DIR="$2"
local compose_profile="$variant"
# Expanded below as ${env_args[@]+"${env_args[@]}"}: under set -u,
# bash 3.2 (macOS /bin/bash) rejects "${env_args[@]}" on an empty
# array, and the plain rekey variant leaves it empty.
local env_args=()
case "$variant" in
@@ -203,9 +206,9 @@ run_rekey_family() {
(
cd "$REPO_ROOT" || exit 1
env "${env_args[@]}" bash testing/static/scripts/generate-configs.sh "$variant" \
env ${env_args[@]+"${env_args[@]}"} bash testing/static/scripts/generate-configs.sh "$variant" \
>>"$REP_DIR/setup.log" 2>&1
env "${env_args[@]}" bash testing/static/scripts/rekey-test.sh inject-config \
env ${env_args[@]+"${env_args[@]}"} bash testing/static/scripts/rekey-test.sh inject-config \
>>"$REP_DIR/setup.log" 2>&1
docker compose "${compose_args[@]}" up -d \
>>"$REP_DIR/setup.log" 2>&1
@@ -240,7 +243,7 @@ run_rekey_family() {
local rc=0
(
cd "$REPO_ROOT" || exit 1
env "${env_args[@]}" bash testing/static/scripts/rekey-test.sh
env ${env_args[@]+"${env_args[@]}"} bash testing/static/scripts/rekey-test.sh
) >"$REP_DIR/test-output.log" 2>&1 || rc=$?
# Capture container logs before teardown