aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Fabian Homborg <FHomborg@gmail.com>2015-09-09 20:55:04 +0200
committerGravatar Fabian Homborg <FHomborg@gmail.com>2015-09-09 20:55:04 +0200
commitb85a8bbbfed56f603dca5d6da85858f9c973b669 (patch)
treeaaca0722b25cff9d5e2ea5b46ad6e7dc59d9ec6d /tests
parent925f4517739ed564edcac6dd5ed29c2835461da9 (diff)
Rename sgrep to __fish_sgrep
Makes it harder to cause issues with aliases, see fish-shell#2245
Diffstat (limited to 'tests')
-rw-r--r--tests/test3.in6
-rw-r--r--tests/test9.in2
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/test3.in b/tests/test3.in
index fe20928c..ee1b8575 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -151,7 +151,7 @@ end
set -Ue __fish_test_universal_variables_variable_foo
# Should no longer be in environment (#2046)
-env | sgrep __fish_test_universal_variables_variable_foo
+env | __fish_sgrep __fish_test_universal_variables_variable_foo
set -Ux __fish_test_universal_variables_variable_foo bar
set -U __fish_test_universal_variables_variable_foo baz
@@ -229,10 +229,10 @@ end
# Test that shadowing with a non-exported variable works
set -gx __fish_test_env17 UNSHADOWED
-env | sgrep __fish_test_env17
+env | __fish_sgrep __fish_test_env17
function __fish_test_shadow
set -l __fish_test_env17
- env | sgrep __fish_test_env17 ; or echo SHADOWED
+ env | __fish_sgrep __fish_test_env17 ; or echo SHADOWED
end
__fish_test_shadow
diff --git a/tests/test9.in b/tests/test9.in
index b7ca78d8..962fae8c 100644
--- a/tests/test9.in
+++ b/tests/test9.in
@@ -115,7 +115,7 @@ try_unbalanced_block 'if false'
# BOM checking (see #1518)
# But only in UTF8
-if locale | sgrep -q -i utf-8
+if locale | __fish_sgrep -q -i utf-8
echo \uFEFF"echo bom_test" | source
else
echo "echo bom_test" | source