diff --git a/tests/expansion.err b/tests/expansion.err index 2669e59ef..753d83cf8 100644 --- a/tests/expansion.err +++ b/tests/expansion.err @@ -1,13 +1,13 @@ #################### # Slices -../test/root/bin/fish: Invalid index value +fish: Invalid index value echo "$foo[d]" ^ -../test/root/bin/fish: Invalid index value +fish: Invalid index value echo $foo[d] ^ -../test/root/bin/fish: Invalid index value +fish: Invalid index value echo ()[d] ^ @@ -16,7 +16,7 @@ echo ()[d] #################### # Catch your breath -../test/root/bin/fish: $) is not a valid variable in fish. +fish: $) is not a valid variable in fish. echo $$paren ^ diff --git a/tests/function.err b/tests/function.err index a5edfc560..2d69cbb05 100644 --- a/tests/function.err +++ b/tests/function.err @@ -7,13 +7,13 @@ #################### # Testing -V with changed variables -../test/root/bin/fish: function: Illegal function name '-a' +fish: function: Illegal function name '-a' function -a arg1 arg2 name2 ; end ^ -../test/root/bin/fish: function: Illegal function name '--argument-names' +fish: function: Illegal function name '--argument-names' function --argument-names arg1 arg2 name4 ; end ^ -../test/root/bin/fish: function: Unexpected positional argument 'abc' +fish: function: Unexpected positional argument 'abc' function name5 abc --argument-names def ; end ^ @@ -25,7 +25,7 @@ function name5 abc --argument-names def ; end #################### # Checking reserved names -../test/root/bin/fish: function: The name 'test' is reserved, +fish: function: The name 'test' is reserved, and can not be used as a function name function test; echo banana; end ^ diff --git a/tests/status.err b/tests/status.err index 51db920e5..855655277 100644 --- a/tests/status.err +++ b/tests/status.err @@ -1,4 +1,4 @@ - ../test/root/bin/fish: An error occurred while redirecting file '.' + fish: An error occurred while redirecting file '.' open: Is a directory status: Invalid combination of options, you cannot do both 'is-interactive' and 'is-login' in the same invocation diff --git a/tests/test1.err b/tests/test1.err index 19d04f4c7..5e9cda705 100644 --- a/tests/test1.err +++ b/tests/test1.err @@ -34,7 +34,7 @@ #################### # For loops with read-only vars is an error (#4342) -../test/root/bin/fish: You cannot use read-only variable 'status' in a for loop +fish: You cannot use read-only variable 'status' in a for loop for status in a b c ^ diff --git a/tests/test5.err b/tests/test5.err index f0ecd5749..f0a464ce3 100644 --- a/tests/test5.err +++ b/tests/test5.err @@ -1,3 +1,3 @@ -../test/root/bin/fish: No matches for wildcard '*ee*'. See `help expand`. +fish: No matches for wildcard '*ee*'. See `help expand`. case *ee* ^ diff --git a/tests/test_cmdsub.err b/tests/test_cmdsub.err index 88c21e336..1d39d0ae7 100644 --- a/tests/test_cmdsub.err +++ b/tests/test_cmdsub.err @@ -4,14 +4,14 @@ #################### # Command sub at the limit should fail -../test/root/bin/fish: Too much data emitted by command substitution so it was discarded +fish: Too much data emitted by command substitution so it was discarded set b (string repeat -n 512 x) ^ #################### # Command sub over the limit should fail -../test/root/bin/fish: Too much data emitted by command substitution so it was discarded +fish: Too much data emitted by command substitution so it was discarded set -l x (string repeat -n $argv x) ^ @@ -28,7 +28,7 @@ in command substitution #################### # Same builtin in a command substitution is affected -../test/root/bin/fish: Too much data emitted by command substitution so it was discarded +fish: Too much data emitted by command substitution so it was discarded echo this will fail (string repeat --max 513 b) to output anything ^ diff --git a/tests/vars_as_commands.err b/tests/vars_as_commands.err index 23b2152df..c1eefbf52 100644 --- a/tests/vars_as_commands.err +++ b/tests/vars_as_commands.err @@ -1,6 +1,6 @@ -../test/root/bin/fish: The expanded command was empty. +fish: The expanded command was empty. $EMPTY_VARIABLE ^ -../test/root/bin/fish: The expanded command was empty. +fish: The expanded command was empty. "$EMPTY_VARIABLE" ^ diff --git a/tests/zero_based_array.err b/tests/zero_based_array.err index 742274180..08ed84e77 100644 --- a/tests/zero_based_array.err +++ b/tests/zero_based_array.err @@ -1,9 +1,9 @@ -../test/root/bin/fish: array indices start at 1, not 0. +fish: array indices start at 1, not 0. echo $foo[0] ^ -../test/root/bin/fish: array indices start at 1, not 0. +fish: array indices start at 1, not 0. echo $foo[ 0 ] ^ -../test/root/bin/fish: array indices start at 1, not 0. +fish: array indices start at 1, not 0. echo $foo[ 00 ] ^