aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorregnat <rg@regnat.ovh>2022-01-26 12:49:16 +0100
committerregnat <rg@regnat.ovh>2022-01-26 14:15:03 +0100
commit3dc1418216d30274695c51ba47e05cf92789d4df (patch)
tree1a5d95e4855d120a4c7ff19038bb21bc7e037987
parentd139474f484ef16850e0d6d3f8706c5bd1f352d0 (diff)
Fix the `store ping` test
-rw-r--r--tests/store-ping.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/store-ping.sh b/tests/store-ping.sh
index 4e8c8b770..f9427cf0a 100644
--- a/tests/store-ping.sh
+++ b/tests/store-ping.sh
@@ -4,8 +4,9 @@ STORE_INFO=$(nix store ping 2>&1)
echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}"
-if isDaemonNewer "2.7pre20220126"; then
- echo "$STORE_INFO" | grep "Version: $($NIX_DAEMON_PACKAGE/bin/nix-daemon --version)"
+if [[ -v NIX_DAEMON_PACKAGE ]] && isDaemonNewer "2.7.0pre20220126"; then
+ DAEMON_VERSION=$($NIX_DAEMON_PACKAGE/bin/nix-daemon --version | cut -d' ' -f3)
+ echo "$STORE_INFO" | grep "Version: $DAEMON_VERSION"
fi
expect 127 NIX_REMOTE=unix:$PWD/store nix store ping || \