Remove now-extraneous re-init of XDG dirs in tests

test_driver.sh is guaranteed to take care of them.
This commit is contained in:
Mahmoud Al-Qudsi 2021-03-23 10:23:57 -05:00 committed by Johannes Altmanninger
parent c82d1980bf
commit c35113aef1
3 changed files with 5 additions and 8 deletions

View File

@ -1,2 +1,2 @@
#RUN: env HOME="$(mktemp -d)" XDG_CONFIG_HOME="$(mktemp -d)" %fish --features '' -c 'string match --quiet "??" ab ; echo "qmarkon: $status"'
#RUN: env %fish --features '' -c 'string match --quiet "??" ab ; echo "qmarkon: $status"'
#CHECK: qmarkon: 0

View File

@ -1,4 +1,4 @@
# RUN: env XDG_CONFIG_HOME="$(mktemp -d)" FISH=%fish %fish %s
# RUN: env FISH=%fish %fish %s
# Environment variable tests
# Test if variables can be properly set
@ -476,7 +476,7 @@ echo "global-vs-universal 4: $__fish_test_global_vs_universal"
set -e -U __fish_test_global_vs_universal
echo "global-vs-universal 5: $__fish_test_global_vs_universal"
# CHECK: global-vs-universal 5:
# CHECK: global-vs-universal 5:
# Export local variables from all parent scopes (issue #6153).
function func
@ -711,14 +711,14 @@ true
set "" foo
#CHECKERR: set: Variable name '' is not valid. See `help identifiers`.
#CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: set "" foo
#CHECKERR: ^
#CHECKERR: (Type 'help set' for related documentation)
set --show ""
#CHECKERR: set: Variable name '' is not valid. See `help identifiers`.
#CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: set --show ""
#CHECKERR: ^
#CHECKERR: (Type 'help set' for related documentation)

View File

@ -1,10 +1,7 @@
#RUN: %fish -C 'set -g fish %fish' %s
set -gx XDG_CONFIG_HOME (mktemp -d)
set -gx XDG_DATA_HOME $XDG_CONFIG_HOME
mkdir -p $XDG_CONFIG_HOME/fish
# fish_variables
set -l target_file $XDG_CONFIG_HOME/fish/target_fish_variables
set -l fish_variables $XDG_CONFIG_HOME/fish/fish_variables