Merge #7903 'test/old: minor fixes for local invocation'

src/nvim/testdir/Makefile

@@ -7,12 +7,11 @@ ifeq ($(OS),Windows_NT)
 else
   NVIM_PRG ?= ../../../build/bin/nvim
 endif
-TMPDIR ?= Xtest-tmpdir
 SCRIPTSOURCE := ../../../runtime
 
 export SHELL := sh
 export NVIM_PRG := $(NVIM_PRG)
-export TMPDIR
+export TMPDIR := Xtest-tmpdir
 
 SCRIPTS_DEFAULT = \
            test14.out             \

src/nvim/testdir/shared.vim

@@ -9,8 +9,12 @@ func! Fix_truncated_tmpfile(fname)
   if $TMPDIR ==# ''
     throw '$TMPDIR is empty'
   endif
-  if a:fname !~# $TMPDIR
-    throw '$TMPDIR not in fname: '.a:fname
+  let tmpdir_tail = fnamemodify(substitute($TMPDIR, '[\/]\+$', '', 'g'), ':t')
+  if tmpdir_tail ==# ''
+    throw 'empty tmpdir_tail'
+  endif
+  if a:fname !~# tmpdir_tail
+    throw printf('$TMPDIR (%s) not in fname: %s', tmpdir_tail, a:fname)
   endif
   let last2segments = matchstr(a:fname, '[\/][^\/]\+[\/][^\/]\+$')
   return $TMPDIR.last2segments

src/nvim/testdir/test_normal.vim

@@ -1075,7 +1075,6 @@ func! Test_normal19_z_spell()
   if !has("spell") || !has('syntax')
     return
   endif
-  " let $TMPDIR=fnamemodify($TMPDIR, ':.')
   new
   call append(0, ['1 good', '2 goood', '3 goood'])
   set spell spellfile=./Xspellfile.add spelllang=en
@@ -1122,7 +1121,6 @@ func! Test_normal19_z_spell()
   " Test for zG
   let a=execute('unsilent norm! V$zG')
   call assert_match("Word '2 goood' added to .*", a)
-  set shortmess=
   let fname=matchstr(a, 'to\s\+\zs\f\+$')
   let fname=Fix_truncated_tmpfile(fname)
   let cnt=readfile(fname)