From 9b43dcdbff4fd9418a66a4b356e3cb8a11762971 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 27 Jan 2023 09:48:00 +0000
Subject: fix(test): unset XDG_CONFIG_HOME when running oldtest

- also fix test_taglist.vim for users running with a tags file created
  in runtime/doc
---
 src/nvim/testdir/runnvim.sh       | 3 +++
 src/nvim/testdir/test_taglist.vim | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/nvim')

diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh
index 322265737a..3a0a94b6bf 100755
--- a/src/nvim/testdir/runnvim.sh
+++ b/src/nvim/testdir/runnvim.sh
@@ -30,6 +30,9 @@ main() {(
   . "$CI_DIR/common/suite.sh"
   . "$CI_DIR/common/test.sh"
 
+  # Redirect XDG_CONFIG_HOME so users local config doesn't interfere
+  export XDG_CONFIG_HOME="$root"
+
   export VIMRUNTIME="$root/runtime"
   if ! "$nvim_prg" \
     -u NONE -i NONE \
diff --git a/src/nvim/testdir/test_taglist.vim b/src/nvim/testdir/test_taglist.vim
index 0387ef2bd8..75d28c3ec4 100644
--- a/src/nvim/testdir/test_taglist.vim
+++ b/src/nvim/testdir/test_taglist.vim
@@ -105,8 +105,8 @@ func Test_tagfiles()
   help
   let tf = tagfiles()
   " Nvim: expectation(s) based on tags in build dir (added to &rtp).
-  "       Filter out the (non-existing) '../../../runtime/doc/tags'.
-  call filter(tf, 'filereadable(v:val)')
+  "       Filter out the '../../../runtime/doc/tags'.
+  call filter(tf, 'v:val != "../../../runtime/doc/tags"')
   call assert_equal(1, len(tf))
   call assert_equal(fnamemodify(expand('$BUILD_DIR/runtime/doc/tags'), ':p:gs?\\?/?'),
 	\           fnamemodify(tf[0], ':p:gs?\\?/?'))
-- 
cgit