From 36367e4882a7278b347a5b8d1d55b67c3ecddc59 Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Tue, 27 Nov 2018 11:42:05 -0800 Subject: [PATCH] Update tests Fish is always executed as ../test/root/bin/fish in these expect tests --- tests/expansion.err | 8 ++++---- tests/function.err | 8 ++++---- tests/status.err | 2 +- tests/test1.err | 2 +- tests/test5.err | 2 +- tests/test_cmdsub.err | 6 +++--- tests/vars_as_commands.err | 4 ++-- tests/zero_based_array.err | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/expansion.err b/tests/expansion.err index 753d83cf8..2669e59ef 100644 --- a/tests/expansion.err +++ b/tests/expansion.err @@ -1,13 +1,13 @@ #################### # Slices -fish: Invalid index value +../test/root/bin/fish: Invalid index value echo "$foo[d]" ^ -fish: Invalid index value +../test/root/bin/fish: Invalid index value echo $foo[d] ^ -fish: Invalid index value +../test/root/bin/fish: Invalid index value echo ()[d] ^ @@ -16,7 +16,7 @@ echo ()[d] #################### # Catch your breath -fish: $) is not a valid variable in fish. +../test/root/bin/fish: $) is not a valid variable in fish. echo $$paren ^ diff --git a/tests/function.err b/tests/function.err index 2d69cbb05..a5edfc560 100644 --- a/tests/function.err +++ b/tests/function.err @@ -7,13 +7,13 @@ #################### # Testing -V with changed variables -fish: function: Illegal function name '-a' +../test/root/bin/fish: function: Illegal function name '-a' function -a arg1 arg2 name2 ; end ^ -fish: function: Illegal function name '--argument-names' +../test/root/bin/fish: function: Illegal function name '--argument-names' function --argument-names arg1 arg2 name4 ; end ^ -fish: function: Unexpected positional argument 'abc' +../test/root/bin/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 -fish: function: The name 'test' is reserved, +../test/root/bin/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 855655277..51db920e5 100644 --- a/tests/status.err +++ b/tests/status.err @@ -1,4 +1,4 @@ - fish: An error occurred while redirecting file '.' + ../test/root/bin/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 5e9cda705..19d04f4c7 100644 --- a/tests/test1.err +++ b/tests/test1.err @@ -34,7 +34,7 @@ #################### # For loops with read-only vars is an error (#4342) -fish: You cannot use read-only variable 'status' in a for loop +../test/root/bin/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 f0a464ce3..f0ecd5749 100644 --- a/tests/test5.err +++ b/tests/test5.err @@ -1,3 +1,3 @@ -fish: No matches for wildcard '*ee*'. See `help expand`. +../test/root/bin/fish: No matches for wildcard '*ee*'. See `help expand`. case *ee* ^ diff --git a/tests/test_cmdsub.err b/tests/test_cmdsub.err index 1d39d0ae7..88c21e336 100644 --- a/tests/test_cmdsub.err +++ b/tests/test_cmdsub.err @@ -4,14 +4,14 @@ #################### # Command sub at the limit should fail -fish: Too much data emitted by command substitution so it was discarded +../test/root/bin/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 -fish: Too much data emitted by command substitution so it was discarded +../test/root/bin/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 -fish: Too much data emitted by command substitution so it was discarded +../test/root/bin/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 c1eefbf52..23b2152df 100644 --- a/tests/vars_as_commands.err +++ b/tests/vars_as_commands.err @@ -1,6 +1,6 @@ -fish: The expanded command was empty. +../test/root/bin/fish: The expanded command was empty. $EMPTY_VARIABLE ^ -fish: The expanded command was empty. +../test/root/bin/fish: The expanded command was empty. "$EMPTY_VARIABLE" ^ diff --git a/tests/zero_based_array.err b/tests/zero_based_array.err index 08ed84e77..742274180 100644 --- a/tests/zero_based_array.err +++ b/tests/zero_based_array.err @@ -1,9 +1,9 @@ -fish: array indices start at 1, not 0. +../test/root/bin/fish: array indices start at 1, not 0. echo $foo[0] ^ -fish: array indices start at 1, not 0. +../test/root/bin/fish: array indices start at 1, not 0. echo $foo[ 0 ] ^ -fish: array indices start at 1, not 0. +../test/root/bin/fish: array indices start at 1, not 0. echo $foo[ 00 ] ^