Fix typescript tests

The "tsserver" is rather slow and needs more time to be able to publish
diagnostics.

diff --git a/test/run_tests.sh b/test/run_tests.sh
index 112c704a139413108ab4249712c3cb0a5d2e10ca..d9dc265af7c875470949f4d6487b42d246b35705 100755 (executable)
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -10,7 +10,7 @@ fi
 
 VIM_CMD="$VIMPRG -u NONE -U NONE -i NONE --noplugin -N --not-a-term"
 
-TESTS="clangd_tests.vim"
+TESTS="tsserver_tests.vim clangd_tests.vim"
 
 for testfile in $TESTS
 do
@@ -24,8 +24,7 @@ do
 
     cat results.txt
 
-    grep -w FAIL results.txt >/dev/null 2>&1
-    if [ $? -eq 0 ]; then
+    if grep -qw FAIL results.txt; then
       echo "ERROR: Some test(s) in $testfile failed."
       exit 3
     fi

diff --git a/test/runner.vim b/test/runner.vim
index b120b211e69b45ce49b8a159b03b6aac722fb07d..797b0d2074263ed7a5e9a81ff4f8b07ba83544ce 100644 (file)
--- a/test/runner.vim
+++ b/test/runner.vim
@@ -84,7 +84,7 @@ endfunc
 # Wait for diagnostic messages from the LSP server
 def g:WaitForDiags(errCount: number)
   var retries = 0
-  while retries < 30
+  while retries < 150
     var d = lsp#lsp#ErrorCount()
     if d.Error == errCount
       break

diff --git a/test/tsserver_tests.vim b/test/tsserver_tests.vim
index 8abae7b876c23d16537022f946a2f18da670ddf1..6b5f359680f8adf4a24f3e21f87b6d21f23c281e 100644 (file)
--- a/test/tsserver_tests.vim
+++ b/test/tsserver_tests.vim
@@ -4,7 +4,7 @@ vim9script
 var lspServers = [{
       filetype: ['typescript', 'javascript'],
       path: exepath('typescript-language-server'),
-      args: ['--stdio', '--tsserver-path=' .. exepath('tsserver')]
+      args: ['--stdio']
   }]
 call LspAddServer(lspServers)
 echomsg systemlist($'{lspServers[0].path} --version')