From 5152f6534ddf570d4bac21db8512f74525a4e010 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sun, 28 Apr 2024 10:15:02 +0200 Subject: [PATCH] Fix test_functions.fish for Ubuntu Noble Numbat Docker build vared.fish is installed at /home/fishuser/fish-build/test/buildroot/usr/local/share/fish/functions/vared.fish as oppposed to being sourced from share/functions/. I'm not 100% sure why this happens but it doesn't seem wrong. --- tests/checks/functions.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/checks/functions.fish b/tests/checks/functions.fish index 4ed058ea7..23c7969e0 100644 --- a/tests/checks/functions.fish +++ b/tests/checks/functions.fish @@ -30,7 +30,7 @@ functions -D f2 # function that could be autoloaded but isn't currently loaded. set x (functions -D vared) if test (count $x) -ne 1 - or not string match -q '*/share/functions/vared.fish' "$x" + or not string match -rq '.*/share(/fish)?/functions/vared\.fish' "$x" echo "Unexpected output for 'functions -D vared': $x" >&2 end @@ -39,7 +39,7 @@ end # function that was autoloaded. set x (functions -v -D vared) if test (count $x) -ne 5 - or not string match -q '*/share/functions/vared.fish' $x[1] + or not string match -rq '.*/share(/fish)?/functions/vared\.fish' $x[1] or test $x[2] != autoloaded or test $x[3] != 6 or test $x[4] != scope-shadowing