Skip to content

fix(e2e): resolve the Darwin fixture path on bash 3.2 #3798

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SaiPisey2 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

fix(e2e): resolve the Darwin fixture path on bash 3.2 #3798

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
6 changes: 5 additions & 1 deletion end-to-end-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,10 @@ generated_metrics="${tmpdir}/e2e-output.txt"
for os in freebsd openbsd netbsd solaris dragonfly darwin; do
if [ "${GOHOSTOS}" = "${os}" ]; then
generated_metrics="${tmpdir}/e2e-output-${GOHOSTOS}.txt"
fixture_metrics="${fixture_metrics::-4}-${GOHOSTOS}.txt"
# Not "${fixture_metrics::-4}": a negative length needs bash 4.2, and macOS
# still ships bash 3.2, where the expansion fails and the Linux fixture is
# used instead.
fixture_metrics="${fixture_metrics%.txt}-${GOHOSTOS}.txt"
fi
done

Expand Down Expand Up @@ -390,6 +393,7 @@ non_deterministic_metrics=$(cat << METRICS
node_network_receive_bytes_total
node_network_receive_multicast_total
node_network_transmit_multicast_total
node_thermal_temperature_celsius
node_zfs_abdstats_linear_count_total
node_zfs_abdstats_linear_data_bytes
node_zfs_abdstats_scatter_chunk_waste_bytes
Expand Down