From af23d173883f47fd02a9a380c719e4428370b484 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 7 Mar 2023 04:13:04 +0100
Subject: test: move oldtests to test directory (#22536)

The new oldtest directory is in test/old/testdir. The reason for this is
that many tests have hardcoded the parent directory name to be
'testdir'.
---
 test/old/testdir/test_nested_function.vim | 63 +++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 test/old/testdir/test_nested_function.vim

(limited to 'test/old/testdir/test_nested_function.vim')

diff --git a/test/old/testdir/test_nested_function.vim b/test/old/testdir/test_nested_function.vim
new file mode 100644
index 0000000000..afaaea6ceb
--- /dev/null
+++ b/test/old/testdir/test_nested_function.vim
@@ -0,0 +1,63 @@
+"Tests for nested functions
+"
+func NestedFunc()
+  func! Func1()
+    let g:text .= 'Func1 '
+  endfunc
+  call Func1()
+  func! s:func2()
+    let g:text .= 's:func2 '
+  endfunc
+  call s:func2()
+  func! s:_func3()
+    let g:text .= 's:_func3 '
+  endfunc
+  call s:_func3()
+  let fn = 'Func4'
+  func! {fn}()
+    let g:text .= 'Func4 '
+  endfunc
+  call {fn}()
+  let fn = 'func5'
+  func! s:{fn}()
+    let g:text .= 's:func5'
+  endfunc
+  call s:{fn}()
+endfunc
+
+func Test_nested_functions()
+  let g:text = ''
+  call NestedFunc()
+  call assert_equal('Func1 s:func2 s:_func3 Func4 s:func5', g:text)
+endfunction
+
+func Test_nested_argument()
+  func g:X()
+    let g:Y = function('sort')
+  endfunc
+  let g:Y = function('sort')
+  echo g:Y([], g:X())
+  delfunc g:X
+  unlet g:Y
+endfunc
+
+func Recurse(count)
+  if a:count > 0
+    call Recurse(a:count - 1)
+  endif
+endfunc
+
+func Test_max_nesting()
+  let call_depth_here = 2
+  let ex_depth_here = 5
+  set mfd&
+
+  call Recurse(99 - call_depth_here)
+  call assert_fails('call Recurse(' . (100 - call_depth_here) . ')', 'E132:')
+
+  set mfd=210
+  call Recurse(209 - ex_depth_here)
+  call assert_fails('call Recurse(' . (210 - ex_depth_here) . ')', 'E169:')
+
+  set mfd&
+endfunc
-- 
cgit 


From d7965293ec18314df284ef53c363b73c2f3c1db8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 09:29:41 +0800
Subject: vim-patch:8.2.3786: test fails because of using Vim9 syntax in legacy
 function

Problem:    Test fails because of using Vim9 syntax in legacy function.
Solution:   Add "call".

https://github.com/vim/vim/commit/4f16e9de985c5178e9cf15d69facfec6f15a5e09

Add test_nested_function.vim changes from patches 8.{0.0141,2.1432}.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 test/old/testdir/test_nested_function.vim | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'test/old/testdir/test_nested_function.vim')

diff --git a/test/old/testdir/test_nested_function.vim b/test/old/testdir/test_nested_function.vim
index afaaea6ceb..5599655461 100644
--- a/test/old/testdir/test_nested_function.vim
+++ b/test/old/testdir/test_nested_function.vim
@@ -1,5 +1,7 @@
-"Tests for nested functions
-"
+" Tests for nested functions
+
+source check.vim
+
 func NestedFunc()
   func! Func1()
     let g:text .= 'Func1 '
@@ -48,6 +50,9 @@ func Recurse(count)
 endfunc
 
 func Test_max_nesting()
+  " TODO: why does this fail on Windows?  Runs out of stack perhaps?
+  CheckNotMSWindows
+
   let call_depth_here = 2
   let ex_depth_here = 5
   set mfd&
@@ -61,3 +66,5 @@ func Test_max_nesting()
 
   set mfd&
 endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
-- 
cgit