X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/a2290fb189bee1da5e985d785e044d1681401ff7..4a82be40d532c3916b54453b9e238b09721b7994:/tests/multi-update.sh diff --git a/tests/multi-update.sh b/tests/multi-update.sh index d6a6d54..cd6e90b 100755 --- a/tests/multi-update.sh +++ b/tests/multi-update.sh @@ -15,10 +15,9 @@ python3 ./pinch.py pin "$conf2" actual_env_command=`python3 ./pinch.py update --dry-run "$conf" "$conf2"` -foo_cleanup rm -rf "$conf2" -expected_env_command_RE='^nix-env --profile /nix/var/nix/profiles/per-user/[^/]+/channels --show-trace --file '\'''\'' --install --from-expression '\''f: f \{ name = "(repo-[0-9]{10}-[0-9a-f]{11})"; channelName = "bar"; src = builtins.storePath "/nix/store/.{32}-\1.tar.xz"; \}'\'' '\''f: f \{ name = "\1"; channelName = "foo"; src = builtins.storePath "/nix/store/.{32}-\1.tar.xz"; \}'\''$' +expected_env_command_RE='^nix-env --profile /nix/var/nix/profiles/per-user/[^/]+/channels --show-trace --file '\'''\'' --install --from-expression '\''f: f \{ name = "(repo-[0-9]{10}-[0-9a-f]{11})"; channelName = "bar"; src = builtins.storePath "'"$NIX_STORE_DIR"'/.{32}-\1.tar.xz"; \}'\'' '\''f: f \{ name = "\1"; channelName = "foo"; src = builtins.storePath "'"$NIX_STORE_DIR"'/.{32}-\1.tar.xz"; \}'\''$' if echo "$actual_env_command" | egrep "$expected_env_command_RE" > /dev/null;then echo PASS