test: simplify test path

Mu-L · Jan 8, 2021 · 830681a · 830681a
1 parent 8725d47
commit 830681a
Show file tree

Hide file tree

Showing 519 changed files with 116 additions and 117 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 doc/tags
 
-test/issues/*
-test/tests/test-compiler/latexrun
-test/tests/test-syntax/syntax/
-test/tests/test-textobj-targets/targets.vim/
+test/test-compiler/latexrun
+test/test-syntax/syntax/
+test/test-textobj-targets/targets.vim/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ When submitting code for vimtex, please adhere to the following standards:
 ## Running tests
 
 New functionality should be accompanied by tests. Tests can be run from the
-`test/tests` folder with `make`. The tests currently only run on Linux, and the
+`test` folder with `make`. The tests currently only run on Linux, and the
 following utilities are required to run all the tests:
 
 - `wget`

diff --git a/test/tests/Makefile → test/Makefile b/test/tests/Makefile → test/Makefile
diff --git a/test/tests/resources/huge.bib → test/common/huge.bib b/test/tests/resources/huge.bib → test/common/huge.bib
diff --git a/test/tests/resources/local1.bib → test/common/local1.bib b/test/tests/resources/local1.bib → test/common/local1.bib
diff --git a/test/tests/resources/local2.bib → test/common/local2.bib b/test/tests/resources/local2.bib → test/common/local2.bib
diff --git a/test/examples/book-multifile/appendix.tex → test/example-book-multifile/appendix.tex b/test/examples/book-multifile/appendix.tex → test/example-book-multifile/appendix.tex
diff --git a/test/examples/book-multifile/backmatter.tex → test/example-book-multifile/backmatter.tex b/test/examples/book-multifile/backmatter.tex → test/example-book-multifile/backmatter.tex
diff --git a/test/examples/book-multifile/book.bib → test/example-book-multifile/book.bib b/test/examples/book-multifile/book.bib → test/example-book-multifile/book.bib
diff --git a/test/examples/book-multifile/chapters.tex → test/example-book-multifile/chapters.tex b/test/examples/book-multifile/chapters.tex → test/example-book-multifile/chapters.tex
diff --git a/test/examples/book-multifile/frontmatter.tex → test/example-book-multifile/frontmatter.tex b/test/examples/book-multifile/frontmatter.tex → test/example-book-multifile/frontmatter.tex
diff --git a/test/examples/book-multifile/main.tex → test/example-book-multifile/main.tex b/test/examples/book-multifile/main.tex → test/example-book-multifile/main.tex
diff --git a/test/examples/book-multifile/minivimrc → test/example-book-multifile/minivimrc b/test/examples/book-multifile/minivimrc → test/example-book-multifile/minivimrc
diff --git a/test/examples/book-multifile/preamble.tex → test/example-book-multifile/preamble.tex b/test/examples/book-multifile/preamble.tex → test/example-book-multifile/preamble.tex
diff --git a/test/examples/book-multifile/sections.tex → test/example-book-multifile/sections.tex b/test/examples/book-multifile/sections.tex → test/example-book-multifile/sections.tex
diff --git a/test/examples/book-multifile/test.jpg → test/example-book-multifile/test.jpg b/test/examples/book-multifile/test.jpg → test/example-book-multifile/test.jpg
diff --git a/test/examples/book-multifile/test.tikz → test/example-book-multifile/test.tikz b/test/examples/book-multifile/test.tikz → test/example-book-multifile/test.tikz
diff --git a/test/examples/book/main.tex → test/example-book/main.tex b/test/examples/book/main.tex → test/example-book/main.tex
diff --git a/test/examples/minimal/main.tex → test/example-minimal/main.tex b/test/examples/minimal/main.tex → test/example-minimal/main.tex
diff --git a/test/examples/minimal/minivimrc → test/example-minimal/minivimrc b/test/examples/minimal/minivimrc → test/example-minimal/minivimrc
@@ -1,6 +1,6 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
-let &rtp .= ',../../../after'
+let &rtp = '../..,' . &rtp
+let &rtp .= ',../../after'
 filetype plugin indent on
 syntax enable
 

diff --git a/test/examples/quick-start/main.tex → test/example-quick-start/main.tex b/test/examples/quick-start/main.tex → test/example-quick-start/main.tex
diff --git a/test/examples/quickfix/main.log → test/example-quickfix/main.log b/test/examples/quickfix/main.log → test/example-quickfix/main.log
diff --git a/test/examples/quickfix/main.tex → test/example-quickfix/main.tex b/test/examples/quickfix/main.tex → test/example-quickfix/main.tex
diff --git a/test/examples/startup-timing/Makefile → test/example-startup-timing/Makefile b/test/examples/startup-timing/Makefile → test/example-startup-timing/Makefile
diff --git a/test/examples/startup-timing/minivimrc → test/example-startup-timing/minivimrc b/test/examples/startup-timing/minivimrc → test/example-startup-timing/minivimrc
diff --git a/test/examples/startup-timing/thesis.tex → test/example-startup-timing/thesis.tex b/test/examples/startup-timing/thesis.tex → test/example-startup-timing/thesis.tex
diff --git a/test/tests/test-cache/Makefile → test/test-cache/Makefile b/test/tests/test-cache/Makefile → test/test-cache/Makefile
diff --git a/test/tests/test-cache/test1.json → test/test-cache/test1.json b/test/tests/test-cache/test1.json → test/test-cache/test1.json
diff --git a/test/tests/test-cache/test1.vim → test/test-cache/test1.vim b/test/tests/test-cache/test1.vim → test/test-cache/test1.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-cache/test2.vim → test/test-cache/test2.vim b/test/tests/test-cache/test2.vim → test/test-cache/test2.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/test/tests/test-cache/test3.vim → test/test-cache/test3.vim b/test/tests/test-cache/test3.vim → test/test-cache/test3.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-cache/test4.json → test/test-cache/test4.json b/test/tests/test-cache/test4.json → test/test-cache/test4.json
diff --git a/test/tests/test-cache/test4.vim → test/test-cache/test4.vim b/test/tests/test-cache/test4.vim → test/test-cache/test4.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-cache/test5.vim → test/test-cache/test5.vim b/test/tests/test-cache/test5.vim → test/test-cache/test5.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-commands/Makefile → test/test-commands/Makefile b/test/tests/test-commands/Makefile → test/test-commands/Makefile
diff --git a/test/tests/test-commands/test-bulk.vim → test/test-commands/test-bulk.vim b/test/tests/test-commands/test-bulk.vim → test/test-commands/test-bulk.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 syntax on
 

diff --git a/test/tests/test-commands/test-toggles.vim → test/test-commands/test-toggles.vim b/test/tests/test-commands/test-toggles.vim → test/test-commands/test-toggles.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 syntax on
 

diff --git a/test/tests/test-compiler-pdfmode/Makefile → test/test-compiler-pdfmode/Makefile b/test/tests/test-compiler-pdfmode/Makefile → test/test-compiler-pdfmode/Makefile
diff --git a/...er-pdfmode/test-conflict-warning/Makefile → ...er-pdfmode/test-conflict-warning/Makefile b/...er-pdfmode/test-conflict-warning/Makefile → ...er-pdfmode/test-conflict-warning/Makefile
diff --git a/...r-pdfmode/test-conflict-warning/latexmkrc → ...r-pdfmode/test-conflict-warning/latexmkrc b/...r-pdfmode/test-conflict-warning/latexmkrc → ...r-pdfmode/test-conflict-warning/latexmkrc
diff --git a/...er-pdfmode/test-conflict-warning/main.tex → ...er-pdfmode/test-conflict-warning/main.tex b/...er-pdfmode/test-conflict-warning/main.tex → ...er-pdfmode/test-conflict-warning/main.tex
diff --git a/...er-pdfmode/test-conflict-warning/test.vim → ...er-pdfmode/test-conflict-warning/test.vim b/...er-pdfmode/test-conflict-warning/test.vim → ...er-pdfmode/test-conflict-warning/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../../..,' . &rtp
+let &rtp = '../../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...test-compiler-pdfmode/test-pdfps/Makefile → ...test-compiler-pdfmode/test-pdfps/Makefile b/...test-compiler-pdfmode/test-pdfps/Makefile → ...test-compiler-pdfmode/test-pdfps/Makefile
diff --git a/...est-compiler-pdfmode/test-pdfps/latexmkrc → ...est-compiler-pdfmode/test-pdfps/latexmkrc b/...est-compiler-pdfmode/test-pdfps/latexmkrc → ...est-compiler-pdfmode/test-pdfps/latexmkrc
diff --git a/...test-compiler-pdfmode/test-pdfps/main.tex → ...test-compiler-pdfmode/test-pdfps/main.tex b/...test-compiler-pdfmode/test-pdfps/main.tex → ...test-compiler-pdfmode/test-pdfps/main.tex
diff --git a/...test-compiler-pdfmode/test-pdfps/test.vim → ...test-compiler-pdfmode/test-pdfps/test.vim b/...test-compiler-pdfmode/test-pdfps/test.vim → ...test-compiler-pdfmode/test-pdfps/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../../..,' . &rtp
+let &rtp = '../../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-compiler-selected/Makefile → test/test-compiler-selected/Makefile b/test/tests/test-compiler-selected/Makefile → test/test-compiler-selected/Makefile
diff --git a/...ests/test-compiler-selected/inputfile.tex → test/test-compiler-selected/inputfile.tex b/...ests/test-compiler-selected/inputfile.tex → test/test-compiler-selected/inputfile.tex
diff --git a/...sts/test-compiler-selected/reference1.tex → test/test-compiler-selected/reference1.tex b/...sts/test-compiler-selected/reference1.tex → test/test-compiler-selected/reference1.tex
diff --git a/...sts/test-compiler-selected/reference2.tex → test/test-compiler-selected/reference2.tex b/...sts/test-compiler-selected/reference2.tex → test/test-compiler-selected/reference2.tex
diff --git a/...sts/test-compiler-selected/reference3.tex → test/test-compiler-selected/reference3.tex b/...sts/test-compiler-selected/reference3.tex → test/test-compiler-selected/reference3.tex
diff --git a/.../test-compiler-selected/test-template.tex → .../test-compiler-selected/test-template.tex b/.../test-compiler-selected/test-template.tex → .../test-compiler-selected/test-template.tex
diff --git a/test/tests/test-compiler-selected/test.tex → test/test-compiler-selected/test.tex b/test/tests/test-compiler-selected/test.tex → test/test-compiler-selected/test.tex
diff --git a/test/tests/test-compiler-selected/test.vim → test/test-compiler-selected/test.vim b/test/tests/test-compiler-selected/test.vim → test/test-compiler-selected/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/...est-compiler-selected/vimtex-template.tex → ...est-compiler-selected/vimtex-template.tex b/...est-compiler-selected/vimtex-template.tex → ...est-compiler-selected/vimtex-template.tex
diff --git a/test/tests/test-compiler/Makefile → test/test-compiler/Makefile b/test/tests/test-compiler/Makefile → test/test-compiler/Makefile
diff --git a/test/tests/test-compiler/test.vim → test/test-compiler/test.vim b/test/tests/test-compiler/test.vim → test/test-compiler/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/test/tests/test-completion-bibstyle/Makefile → test/test-completion-bibstyle/Makefile b/test/tests/test-completion-bibstyle/Makefile → test/test-completion-bibstyle/Makefile
diff --git a/test/tests/test-completion-bibstyle/main.tex → test/test-completion-bibstyle/main.tex b/test/tests/test-completion-bibstyle/main.tex → test/test-completion-bibstyle/main.tex
diff --git a/test/tests/test-completion-bibstyle/test.vim → test/test-completion-bibstyle/test.vim b/test/tests/test-completion-bibstyle/test.vim → test/test-completion-bibstyle/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/...sts/test-completion-bibtex-speed/Makefile → test/test-completion-bibtex-speed/Makefile b/...sts/test-completion-bibtex-speed/Makefile → test/test-completion-bibtex-speed/Makefile
diff --git a/test/test-completion-bibtex-speed/bibspeed.tex b/test/test-completion-bibtex-speed/bibspeed.tex
@@ -0,0 +1,18 @@
+\documentclass{article}
+% \usepackage[square,sort,comma,numbers]{natbib}
+
+\usepackage{biblatex}
+\addbibresource{../common/huge.bib}
+\addbibresource{../common/local1.bib}
+\addbibresource{/home/lervag/.vim/bundle/vimtex/test/common/local2.bib}
+\addbibresource{biblatex-examples.bib}
+
+\begin{document}
+
+Hello World!~\cite{AndersonHowCanHuman2009}
+
+% \bibliographystyle{elsarticle-num}
+% \bibliography{../common/huge.bib,../common/local1.bib,/home/lervag/.vim/bundle/vimtex/test/common/local2.bib,biblatex-examples.bib}
+\printbibliography
+
+\end{document}
diff --git a/...test-completion-bibtex-speed/bibspeed.vim → ...test-completion-bibtex-speed/bibspeed.vim b/...test-completion-bibtex-speed/bibspeed.vim → ...test-completion-bibtex-speed/bibspeed.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-completion-bibtex/.gitignore → test/test-completion-bibtex/.gitignore b/test/tests/test-completion-bibtex/.gitignore → test/test-completion-bibtex/.gitignore
diff --git a/test/tests/test-completion-bibtex/Makefile → test/test-completion-bibtex/Makefile b/test/tests/test-completion-bibtex/Makefile → test/test-completion-bibtex/Makefile
diff --git a/...s/test-completion-bibtex/test_backend.tex → test/test-completion-bibtex/test_backend.tex b/...s/test-completion-bibtex/test_backend.tex → test/test-completion-bibtex/test_backend.tex
@@ -2,8 +2,8 @@
 \usepackage[backend=biber,style=authoryear]{biblatex}
 
 \addbibresource{biblatex-examples.bib}
-\addbibresource{../resources/local1.bib}
-\addbibresource{~/.vim/bundle/vimtex/test/tests/resources/local2.bib}
+\addbibresource{../common/local1.bib}
+\addbibresource{~/.vim/bundle/vimtex/test/common/local2.bib}
 
 \begin{document}
 

diff --git a/...s/test-completion-bibtex/test_backend.vim → test/test-completion-bibtex/test_backend.vim b/...s/test-completion-bibtex/test_backend.vim → test/test-completion-bibtex/test_backend.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...st-completion-bibtex/test_custom_bibs.bib → ...st-completion-bibtex/test_custom_bibs.bib b/...st-completion-bibtex/test_custom_bibs.bib → ...st-completion-bibtex/test_custom_bibs.bib
diff --git a/...st-completion-bibtex/test_custom_bibs.tex → ...st-completion-bibtex/test_custom_bibs.tex b/...st-completion-bibtex/test_custom_bibs.tex → ...st-completion-bibtex/test_custom_bibs.tex
diff --git a/...st-completion-bibtex/test_custom_bibs.vim → ...st-completion-bibtex/test_custom_bibs.vim b/...st-completion-bibtex/test_custom_bibs.vim → ...st-completion-bibtex/test_custom_bibs.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...s/test-completion-bibtex/test_globbed.bib → test/test-completion-bibtex/test_globbed.bib b/...s/test-completion-bibtex/test_globbed.bib → test/test-completion-bibtex/test_globbed.bib
diff --git a/...s/test-completion-bibtex/test_globbed.tex → test/test-completion-bibtex/test_globbed.tex b/...s/test-completion-bibtex/test_globbed.tex → test/test-completion-bibtex/test_globbed.tex
diff --git a/...s/test-completion-bibtex/test_globbed.vim → test/test-completion-bibtex/test_globbed.vim b/...s/test-completion-bibtex/test_globbed.vim → test/test-completion-bibtex/test_globbed.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...s/test-completion-bibtex/test_jobname.bib → test/test-completion-bibtex/test_jobname.bib b/...s/test-completion-bibtex/test_jobname.bib → test/test-completion-bibtex/test_jobname.bib
diff --git a/...s/test-completion-bibtex/test_jobname.tex → test/test-completion-bibtex/test_jobname.tex b/...s/test-completion-bibtex/test_jobname.tex → test/test-completion-bibtex/test_jobname.tex
diff --git a/...s/test-completion-bibtex/test_jobname.vim → test/test-completion-bibtex/test_jobname.vim b/...s/test-completion-bibtex/test_jobname.vim → test/test-completion-bibtex/test_jobname.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...test-completion-bibtex/test_multicite.tex → ...test-completion-bibtex/test_multicite.tex b/...test-completion-bibtex/test_multicite.tex → ...test-completion-bibtex/test_multicite.tex
diff --git a/...test-completion-bibtex/test_multicite.vim → ...test-completion-bibtex/test_multicite.vim b/...test-completion-bibtex/test_multicite.vim → ...test-completion-bibtex/test_multicite.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...est-completion-bibtex/test_parser_bcf.bcf → ...est-completion-bibtex/test_parser_bcf.bcf b/...est-completion-bibtex/test_parser_bcf.bcf → ...est-completion-bibtex/test_parser_bcf.bcf
diff --git a/...est-completion-bibtex/test_parser_bcf.tex → ...est-completion-bibtex/test_parser_bcf.tex b/...est-completion-bibtex/test_parser_bcf.tex → ...est-completion-bibtex/test_parser_bcf.tex
diff --git a/...est-completion-bibtex/test_parser_bcf.vim → ...est-completion-bibtex/test_parser_bcf.vim b/...est-completion-bibtex/test_parser_bcf.vim → ...est-completion-bibtex/test_parser_bcf.vim
diff --git a/...est-completion-bibtex/test_parser_blg.blg → ...est-completion-bibtex/test_parser_blg.blg b/...est-completion-bibtex/test_parser_blg.blg → ...est-completion-bibtex/test_parser_blg.blg
diff --git a/...est-completion-bibtex/test_parser_blg.tex → ...est-completion-bibtex/test_parser_blg.tex b/...est-completion-bibtex/test_parser_blg.tex → ...est-completion-bibtex/test_parser_blg.tex
diff --git a/...est-completion-bibtex/test_parser_blg.vim → ...est-completion-bibtex/test_parser_blg.vim b/...est-completion-bibtex/test_parser_blg.vim → ...est-completion-bibtex/test_parser_blg.vim
diff --git a/...s/test-completion-bibtex/test_starred.tex → test/test-completion-bibtex/test_starred.tex b/...s/test-completion-bibtex/test_starred.tex → test/test-completion-bibtex/test_starred.tex
diff --git a/...s/test-completion-bibtex/test_starred.vim → test/test-completion-bibtex/test_starred.vim b/...s/test-completion-bibtex/test_starred.vim → test/test-completion-bibtex/test_starred.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-completion-commands/Makefile → test/test-completion-commands/Makefile b/test/tests/test-completion-commands/Makefile → test/test-completion-commands/Makefile
diff --git a/.../tests/test-completion-commands/test1.tex → test/test-completion-commands/test1.tex b/.../tests/test-completion-commands/test1.tex → test/test-completion-commands/test1.tex
diff --git a/.../tests/test-completion-commands/test1.vim → test/test-completion-commands/test1.vim b/.../tests/test-completion-commands/test1.vim → test/test-completion-commands/test1.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/.../tests/test-completion-commands/test2.cls → test/test-completion-commands/test2.cls b/.../tests/test-completion-commands/test2.cls → test/test-completion-commands/test2.cls
diff --git a/.../tests/test-completion-commands/test2.tex → test/test-completion-commands/test2.tex b/.../tests/test-completion-commands/test2.tex → test/test-completion-commands/test2.tex
diff --git a/.../tests/test-completion-commands/test2.vim → test/test-completion-commands/test2.vim b/.../tests/test-completion-commands/test2.vim → test/test-completion-commands/test2.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/.../tests/test-completion-commands/test3.cls → test/test-completion-commands/test3.cls b/.../tests/test-completion-commands/test3.cls → test/test-completion-commands/test3.cls
diff --git a/.../tests/test-completion-commands/test3.tex → test/test-completion-commands/test3.tex b/.../tests/test-completion-commands/test3.tex → test/test-completion-commands/test3.tex
diff --git a/.../tests/test-completion-commands/test3.vim → test/test-completion-commands/test3.vim b/.../tests/test-completion-commands/test3.vim → test/test-completion-commands/test3.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/...ts/test-completion-documentclass/Makefile → test/test-completion-documentclass/Makefile b/...ts/test-completion-documentclass/Makefile → test/test-completion-documentclass/Makefile
diff --git a/...ts/test-completion-documentclass/main.tex → test/test-completion-documentclass/main.tex b/...ts/test-completion-documentclass/main.tex → test/test-completion-documentclass/main.tex
diff --git a/...ts/test-completion-documentclass/test.vim → test/test-completion-documentclass/test.vim b/...ts/test-completion-documentclass/test.vim → test/test-completion-documentclass/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...sts/test-completion-environments/Makefile → test/test-completion-environments/Makefile b/...sts/test-completion-environments/Makefile → test/test-completion-environments/Makefile
diff --git a/...ts/test-completion-environments/test1.tex → test/test-completion-environments/test1.tex b/...ts/test-completion-environments/test1.tex → test/test-completion-environments/test1.tex
diff --git a/...ts/test-completion-environments/test1.vim → test/test-completion-environments/test1.vim b/...ts/test-completion-environments/test1.vim → test/test-completion-environments/test1.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...ts/test-completion-environments/test2.cls → test/test-completion-environments/test2.cls b/...ts/test-completion-environments/test2.cls → test/test-completion-environments/test2.cls
diff --git a/...ts/test-completion-environments/test2.tex → test/test-completion-environments/test2.tex b/...ts/test-completion-environments/test2.tex → test/test-completion-environments/test2.tex
diff --git a/...ts/test-completion-environments/test2.vim → test/test-completion-environments/test2.vim b/...ts/test-completion-environments/test2.vim → test/test-completion-environments/test2.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/...ts/test-completion-environments/test3.sty → test/test-completion-environments/test3.sty b/...ts/test-completion-environments/test3.sty → test/test-completion-environments/test3.sty
diff --git a/...ts/test-completion-environments/test3.tex → test/test-completion-environments/test3.tex b/...ts/test-completion-environments/test3.tex → test/test-completion-environments/test3.tex
diff --git a/...ts/test-completion-environments/test3.vim → test/test-completion-environments/test3.vim b/...ts/test-completion-environments/test3.vim → test/test-completion-environments/test3.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/.../tests/test-completion-filenames/Makefile → test/test-completion-filenames/Makefile b/.../tests/test-completion-filenames/Makefile → test/test-completion-filenames/Makefile
diff --git a/.../tests/test-completion-filenames/fig1.png → test/test-completion-filenames/fig1.png b/.../tests/test-completion-filenames/fig1.png → test/test-completion-filenames/fig1.png
diff --git a/...ompletion-filenames/figures/example.tikzz → ...ompletion-filenames/figures/example.tikzz b/...ompletion-filenames/figures/example.tikzz → ...ompletion-filenames/figures/example.tikzz
diff --git a/...ompletion-filenames/figures/example1.tikz → ...ompletion-filenames/figures/example1.tikz b/...ompletion-filenames/figures/example1.tikz → ...ompletion-filenames/figures/example1.tikz
diff --git a/...ompletion-filenames/figures/example2.TikZ → ...ompletion-filenames/figures/example2.TikZ b/...ompletion-filenames/figures/example2.TikZ → ...ompletion-filenames/figures/example2.TikZ
diff --git a/...ompletion-filenames/figures/example3.TIKZ → ...ompletion-filenames/figures/example3.TIKZ b/...ompletion-filenames/figures/example3.TIKZ → ...ompletion-filenames/figures/example3.TIKZ
diff --git a/...st-completion-filenames/figures/fig10.png → ...st-completion-filenames/figures/fig10.png b/...st-completion-filenames/figures/fig10.png → ...st-completion-filenames/figures/fig10.png
diff --git a/...st-completion-filenames/figures/fig11.eps → ...st-completion-filenames/figures/fig11.eps b/...st-completion-filenames/figures/fig11.eps → ...st-completion-filenames/figures/fig11.eps
diff --git a/...st-completion-filenames/figures/fig12.pdf → ...st-completion-filenames/figures/fig12.pdf b/...st-completion-filenames/figures/fig12.pdf → ...st-completion-filenames/figures/fig12.pdf
diff --git a/...st-completion-filenames/figures/fig13.jpg → ...st-completion-filenames/figures/fig13.jpg b/...st-completion-filenames/figures/fig13.jpg → ...st-completion-filenames/figures/fig13.jpg
diff --git a/...est-completion-filenames/figures/fig2.png → ...est-completion-filenames/figures/fig2.png b/...est-completion-filenames/figures/fig2.png → ...est-completion-filenames/figures/fig2.png
diff --git a/...est-completion-filenames/figures/fig3.png → ...est-completion-filenames/figures/fig3.png b/...est-completion-filenames/figures/fig3.png → ...est-completion-filenames/figures/fig3.png
diff --git a/...est-completion-filenames/figures/fig4.png → ...est-completion-filenames/figures/fig4.png b/...est-completion-filenames/figures/fig4.png → ...est-completion-filenames/figures/fig4.png
diff --git a/...est-completion-filenames/figures/fig5.png → ...est-completion-filenames/figures/fig5.png b/...est-completion-filenames/figures/fig5.png → ...est-completion-filenames/figures/fig5.png
diff --git a/...est-completion-filenames/figures/fig6.png → ...est-completion-filenames/figures/fig6.png b/...est-completion-filenames/figures/fig6.png → ...est-completion-filenames/figures/fig6.png
diff --git a/...est-completion-filenames/figures/fig7.png → ...est-completion-filenames/figures/fig7.png b/...est-completion-filenames/figures/fig7.png → ...est-completion-filenames/figures/fig7.png
diff --git a/...est-completion-filenames/figures/fig8.png → ...est-completion-filenames/figures/fig8.png b/...est-completion-filenames/figures/fig8.png → ...est-completion-filenames/figures/fig8.png
diff --git a/...est-completion-filenames/figures/fig9.png → ...est-completion-filenames/figures/fig9.png b/...est-completion-filenames/figures/fig9.png → ...est-completion-filenames/figures/fig9.png
diff --git a/.../tests/test-completion-filenames/main.tex → test/test-completion-filenames/main.tex b/.../tests/test-completion-filenames/main.tex → test/test-completion-filenames/main.tex
diff --git a/...pletion-filenames/my figures/new_fig1.jpg → ...pletion-filenames/my figures/new_fig1.jpg b/...pletion-filenames/my figures/new_fig1.jpg → ...pletion-filenames/my figures/new_fig1.jpg
diff --git a/...pletion-filenames/my figures/new_fig2.jpg → ...pletion-filenames/my figures/new_fig2.jpg b/...pletion-filenames/my figures/new_fig2.jpg → ...pletion-filenames/my figures/new_fig2.jpg
diff --git a/...pletion-filenames/my figures/new_fig3.jpg → ...pletion-filenames/my figures/new_fig3.jpg b/...pletion-filenames/my figures/new_fig3.jpg → ...pletion-filenames/my figures/new_fig3.jpg
diff --git a/...pletion-filenames/my figures/new_fig4.jpg → ...pletion-filenames/my figures/new_fig4.jpg b/...pletion-filenames/my figures/new_fig4.jpg → ...pletion-filenames/my figures/new_fig4.jpg
diff --git a/...pletion-filenames/my figures/new_fig5.jpg → ...pletion-filenames/my figures/new_fig5.jpg b/...pletion-filenames/my figures/new_fig5.jpg → ...pletion-filenames/my figures/new_fig5.jpg
diff --git a/...pletion-filenames/my figures/new_fig6.jpg → ...pletion-filenames/my figures/new_fig6.jpg b/...pletion-filenames/my figures/new_fig6.jpg → ...pletion-filenames/my figures/new_fig6.jpg
diff --git a/...pletion-filenames/my figures/new_fig7.jpg → ...pletion-filenames/my figures/new_fig7.jpg b/...pletion-filenames/my figures/new_fig7.jpg → ...pletion-filenames/my figures/new_fig7.jpg
diff --git a/...pletion-filenames/my figures/new_fig8.jpg → ...pletion-filenames/my figures/new_fig8.jpg b/...pletion-filenames/my figures/new_fig8.jpg → ...pletion-filenames/my figures/new_fig8.jpg
diff --git a/...pletion-filenames/my figures/new_fig9.jpg → ...pletion-filenames/my figures/new_fig9.jpg b/...pletion-filenames/my figures/new_fig9.jpg → ...pletion-filenames/my figures/new_fig9.jpg
diff --git a/.../tests/test-completion-filenames/test.vim → test/test-completion-filenames/test.vim b/.../tests/test-completion-filenames/test.vim → test/test-completion-filenames/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...ts/test-completion-filenames/tikz_pic.tex → test/test-completion-filenames/tikz_pic.tex b/...ts/test-completion-filenames/tikz_pic.tex → test/test-completion-filenames/tikz_pic.tex
diff --git a/...st-completion-glossary-texinputs/Makefile → ...st-completion-glossary-texinputs/Makefile b/...st-completion-glossary-texinputs/Makefile → ...st-completion-glossary-texinputs/Makefile
diff --git a/...st-completion-glossary-texinputs/test.vim → ...st-completion-glossary-texinputs/test.vim b/...st-completion-glossary-texinputs/test.vim → ...st-completion-glossary-texinputs/test.vim
@@ -1,6 +1,6 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
-let &rtp .= ',../../../after'
+let &rtp = '../..,' . &rtp
+let &rtp .= ',../../after'
 filetype plugin indent on
 syntax enable
 

diff --git a/...ion-glossary-texinputs/texinclude/inp.tex → ...ion-glossary-texinputs/texinclude/inp.tex b/...ion-glossary-texinputs/texinclude/inp.tex → ...ion-glossary-texinputs/texinclude/inp.tex
diff --git a/...on-glossary-texinputs/texwork/example.tex → ...on-glossary-texinputs/texwork/example.tex b/...on-glossary-texinputs/texwork/example.tex → ...on-glossary-texinputs/texwork/example.tex
diff --git a/test/tests/test-completion-glossary/Makefile → test/test-completion-glossary/Makefile b/test/tests/test-completion-glossary/Makefile → test/test-completion-glossary/Makefile
diff --git a/...ompletion-glossary/glossaries-extra-1.tex → ...ompletion-glossary/glossaries-extra-1.tex b/...ompletion-glossary/glossaries-extra-1.tex → ...ompletion-glossary/glossaries-extra-1.tex
diff --git a/...ompletion-glossary/glossaries-extra-2.tex → ...ompletion-glossary/glossaries-extra-2.tex b/...ompletion-glossary/glossaries-extra-2.tex → ...ompletion-glossary/glossaries-extra-2.tex
diff --git a/...-completion-glossary/glossaries-extra.bib → ...-completion-glossary/glossaries-extra.bib b/...-completion-glossary/glossaries-extra.bib → ...-completion-glossary/glossaries-extra.bib
diff --git a/...-completion-glossary/glossaries-extra.vim → ...-completion-glossary/glossaries-extra.vim b/...-completion-glossary/glossaries-extra.vim → ...-completion-glossary/glossaries-extra.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/...s/test-completion-glossary/glossaries.tex → test/test-completion-glossary/glossaries.tex b/...s/test-completion-glossary/glossaries.tex → test/test-completion-glossary/glossaries.tex
diff --git a/...s/test-completion-glossary/glossaries.vim → test/test-completion-glossary/glossaries.vim b/...s/test-completion-glossary/glossaries.vim → test/test-completion-glossary/glossaries.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/...s/test-completion-glossary/glsentries.tex → test/test-completion-glossary/glsentries.tex b/...s/test-completion-glossary/glsentries.tex → test/test-completion-glossary/glsentries.tex
diff --git a/.../tests/test-completion-glossary/latexmkrc → test/test-completion-glossary/latexmkrc b/.../tests/test-completion-glossary/latexmkrc → test/test-completion-glossary/latexmkrc
diff --git a/test/tests/test-completion-labels/Makefile → test/test-completion-labels/Makefile b/test/tests/test-completion-labels/Makefile → test/test-completion-labels/Makefile
diff --git a/test/tests/test-completion-labels/test1.aux → test/test-completion-labels/test1.aux b/test/tests/test-completion-labels/test1.aux → test/test-completion-labels/test1.aux
diff --git a/test/tests/test-completion-labels/test1.tex → test/test-completion-labels/test1.tex b/test/tests/test-completion-labels/test1.tex → test/test-completion-labels/test1.tex
diff --git a/test/tests/test-completion-labels/test1.vim → test/test-completion-labels/test1.vim b/test/tests/test-completion-labels/test1.vim → test/test-completion-labels/test1.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...sts/test-completion-labels/test1/sub1.aux → test/test-completion-labels/test1/sub1.aux b/...sts/test-completion-labels/test1/sub1.aux → test/test-completion-labels/test1/sub1.aux
diff --git a/...sts/test-completion-labels/test1/sub1.tex → test/test-completion-labels/test1/sub1.tex b/...sts/test-completion-labels/test1/sub1.tex → test/test-completion-labels/test1/sub1.tex
diff --git a/...pletion-labels/test1/sub2 with spaces.tex → ...pletion-labels/test1/sub2 with spaces.tex b/...pletion-labels/test1/sub2 with spaces.tex → ...pletion-labels/test1/sub2 with spaces.tex
diff --git a/...pletion-labels/test1/sub3 with spaces.tex → ...pletion-labels/test1/sub3 with spaces.tex b/...pletion-labels/test1/sub3 with spaces.tex → ...pletion-labels/test1/sub3 with spaces.tex
diff --git a/...sts/test-completion-labels/test1/sub4.tex → test/test-completion-labels/test1/sub4.tex b/...sts/test-completion-labels/test1/sub4.tex → test/test-completion-labels/test1/sub4.tex
diff --git a/test/tests/test-completion-labels/test2.tex → test/test-completion-labels/test2.tex b/test/tests/test-completion-labels/test2.tex → test/test-completion-labels/test2.tex
diff --git a/test/tests/test-completion-labels/test2.vim → test/test-completion-labels/test2.vim b/test/tests/test-completion-labels/test2.vim → test/test-completion-labels/test2.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/...s/test-completion-labels/test2/input1.aux → test/test-completion-labels/test2/input1.aux b/...s/test-completion-labels/test2/input1.aux → test/test-completion-labels/test2/input1.aux
diff --git a/...s/test-completion-labels/test2/input2.aux → test/test-completion-labels/test2/input2.aux b/...s/test-completion-labels/test2/input2.aux → test/test-completion-labels/test2/input2.aux
diff --git a/test/tests/test-completion-packages/Makefile → test/test-completion-packages/Makefile b/test/tests/test-completion-packages/Makefile → test/test-completion-packages/Makefile
diff --git a/test/tests/test-completion-packages/main.tex → test/test-completion-packages/main.tex b/test/tests/test-completion-packages/main.tex → test/test-completion-packages/main.tex
diff --git a/test/tests/test-completion-packages/test.vim → test/test-completion-packages/test.vim b/test/tests/test-completion-packages/test.vim → test/test-completion-packages/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-delim/Makefile → test/test-delim/Makefile b/test/tests/test-delim/Makefile → test/test-delim/Makefile
diff --git a/test/tests/test-delim/test.tex → test/test-delim/test.tex b/test/tests/test-delim/test.tex → test/test-delim/test.tex
diff --git a/test/tests/test-delim/test.vim → test/test-delim/test.vim b/test/tests/test-delim/test.vim → test/test-delim/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 syntax on
 

diff --git a/test/tests/test-folding/Makefile → test/test-folding/Makefile b/test/tests/test-folding/Makefile → test/test-folding/Makefile
diff --git a/test/tests/test-folding/main.tex → test/test-folding/main.tex b/test/tests/test-folding/main.tex → test/test-folding/main.tex
diff --git a/test/tests/test-folding/test.vim → test/test-folding/test.vim b/test/tests/test-folding/test.vim → test/test-folding/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set fillchars=fold:\ 

diff --git a/test/tests/test-formatting/Makefile → test/test-formatting/Makefile b/test/tests/test-formatting/Makefile → test/test-formatting/Makefile
diff --git a/test/tests/test-formatting/test-01.ref → test/test-formatting/test-01.ref b/test/tests/test-formatting/test-01.ref → test/test-formatting/test-01.ref
diff --git a/test/tests/test-formatting/test-01.tex → test/test-formatting/test-01.tex b/test/tests/test-formatting/test-01.tex → test/test-formatting/test-01.tex
diff --git a/test/tests/test-formatting/test-02.ref → test/test-formatting/test-02.ref b/test/tests/test-formatting/test-02.ref → test/test-formatting/test-02.ref
diff --git a/test/tests/test-formatting/test-02.tex → test/test-formatting/test-02.tex b/test/tests/test-formatting/test-02.tex → test/test-formatting/test-02.tex
diff --git a/test/tests/test-formatting/test-03.ref → test/test-formatting/test-03.ref b/test/tests/test-formatting/test-03.ref → test/test-formatting/test-03.ref
diff --git a/test/tests/test-formatting/test-03.tex → test/test-formatting/test-03.tex b/test/tests/test-formatting/test-03.tex → test/test-formatting/test-03.tex
diff --git a/test/tests/test-formatting/test-04.ref → test/test-formatting/test-04.ref b/test/tests/test-formatting/test-04.ref → test/test-formatting/test-04.ref
diff --git a/test/tests/test-formatting/test-04.tex → test/test-formatting/test-04.tex b/test/tests/test-formatting/test-04.tex → test/test-formatting/test-04.tex
diff --git a/test/tests/test-formatting/test-05.ref → test/test-formatting/test-05.ref b/test/tests/test-formatting/test-05.ref → test/test-formatting/test-05.ref
diff --git a/test/tests/test-formatting/test-05.tex → test/test-formatting/test-05.tex b/test/tests/test-formatting/test-05.tex → test/test-formatting/test-05.tex
diff --git a/test/tests/test-formatting/test-06.ref → test/test-formatting/test-06.ref b/test/tests/test-formatting/test-06.ref → test/test-formatting/test-06.ref
diff --git a/test/tests/test-formatting/test-06.tex → test/test-formatting/test-06.tex b/test/tests/test-formatting/test-06.tex → test/test-formatting/test-06.tex
diff --git a/test/tests/test-formatting/test.vim → test/test-formatting/test.vim b/test/tests/test-formatting/test.vim → test/test-formatting/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin indent on
 syntax on
 

diff --git a/test/tests/test-get-main/Makefile → test/test-get-main/Makefile b/test/tests/test-get-main/Makefile → test/test-get-main/Makefile
diff --git a/test/tests/test-get-main/simple.tex → test/test-get-main/simple.tex b/test/tests/test-get-main/simple.tex → test/test-get-main/simple.tex
diff --git a/...test-get-main/test-bib-alternate/main.tex → ...test-get-main/test-bib-alternate/main.tex b/...test-get-main/test-bib-alternate/main.tex → ...test-get-main/test-bib-alternate/main.tex
diff --git a/...et-main/test-bib-alternate/references.bib → ...et-main/test-bib-alternate/references.bib b/...et-main/test-bib-alternate/references.bib → ...et-main/test-bib-alternate/references.bib
diff --git a/...get-main/test-bib-notfound/references.bib → ...get-main/test-bib-notfound/references.bib b/...get-main/test-bib-notfound/references.bib → ...get-main/test-bib-notfound/references.bib
diff --git a/...ts/test-get-main/test-bib-simple/main.tex → test/test-get-main/test-bib-simple/main.tex b/...ts/test-get-main/test-bib-simple/main.tex → test/test-get-main/test-bib-simple/main.tex
diff --git a/...t-get-main/test-bib-simple/references.bib → ...t-get-main/test-bib-simple/references.bib b/...t-get-main/test-bib-simple/references.bib → ...t-get-main/test-bib-simple/references.bib
diff --git a/.../test-get-main/test-includes/include3.tex → .../test-get-main/test-includes/include3.tex b/.../test-get-main/test-includes/include3.tex → .../test-get-main/test-includes/include3.tex
diff --git a/...ests/test-get-main/test-includes/main.tex → test/test-get-main/test-includes/main.tex b/...ests/test-get-main/test-includes/main.tex → test/test-get-main/test-includes/main.tex
diff --git a/...s/test-get-main/test-includes/subfile.tex → test/test-get-main/test-includes/subfile.tex b/...s/test-get-main/test-includes/subfile.tex → test/test-get-main/test-includes/subfile.tex
diff --git a/...-get-main/test-includes/test/include1.tex → ...-get-main/test-includes/test/include1.tex b/...-get-main/test-includes/test/include1.tex → ...-get-main/test-includes/test/include1.tex
diff --git a/...-main/test-includes/test/sub/include2.tex → ...-main/test-includes/test/sub/include2.tex b/...-main/test-includes/test/sub/include2.tex → ...-main/test-includes/test/sub/include2.tex
diff --git a/...test-get-main/test-latexmain/included.tex → ...test-get-main/test-latexmain/included.tex b/...test-get-main/test-latexmain/included.tex → ...test-get-main/test-latexmain/included.tex
diff --git a/...sts/test-get-main/test-latexmain/main.tex → test/test-get-main/test-latexmain/main.tex b/...sts/test-get-main/test-latexmain/main.tex → test/test-get-main/test-latexmain/main.tex
diff --git a/...et-main/test-latexmain/main.tex.latexmain → ...et-main/test-latexmain/main.tex.latexmain b/...et-main/test-latexmain/main.tex.latexmain → ...et-main/test-latexmain/main.tex.latexmain
diff --git a/...get-main/test-latexmain/section1/main.tex → ...get-main/test-latexmain/section1/main.tex b/...get-main/test-latexmain/section1/main.tex → ...get-main/test-latexmain/section1/main.tex
diff --git a/...ests/test-get-main/test-latexmk/latexmkrc → test/test-get-main/test-latexmk/latexmkrc b/...ests/test-get-main/test-latexmk/latexmkrc → test/test-get-main/test-latexmk/latexmkrc
diff --git a/...tests/test-get-main/test-latexmk/main.tex → test/test-get-main/test-latexmk/main.tex b/...tests/test-get-main/test-latexmk/main.tex → test/test-get-main/test-latexmk/main.tex
diff --git a/...s/test-get-main/test-latexmk/preamble.tex → test/test-get-main/test-latexmk/preamble.tex b/...s/test-get-main/test-latexmk/preamble.tex → test/test-get-main/test-latexmk/preamble.tex
diff --git a/...ests/test-get-main/test-subfiles/main.tex → test/test-get-main/test-subfiles/main.tex b/...ests/test-get-main/test-subfiles/main.tex → test/test-get-main/test-subfiles/main.tex
diff --git a/.../test-get-main/test-subfiles/not-main.tex → .../test-get-main/test-subfiles/not-main.tex b/.../test-get-main/test-subfiles/not-main.tex → .../test-get-main/test-subfiles/not-main.tex
diff --git a/.../test-get-main/test-subfiles/preamble.tex → .../test-get-main/test-subfiles/preamble.tex b/.../test-get-main/test-subfiles/preamble.tex → .../test-get-main/test-subfiles/preamble.tex
diff --git a/.../test-get-main/test-subfiles/sub/sub1.tex → .../test-get-main/test-subfiles/sub/sub1.tex b/.../test-get-main/test-subfiles/sub/sub1.tex → .../test-get-main/test-subfiles/sub/sub1.tex
diff --git a/.../test-get-main/test-subfiles/sub/sub2.tex → .../test-get-main/test-subfiles/sub/sub2.tex b/.../test-get-main/test-subfiles/sub/sub2.tex → .../test-get-main/test-subfiles/sub/sub2.tex
diff --git a/.../test-get-main/test-subfiles/sub/sub3.tex → .../test-get-main/test-subfiles/sub/sub3.tex b/.../test-get-main/test-subfiles/sub/sub3.tex → .../test-get-main/test-subfiles/sub/sub3.tex
diff --git a/...s/test-get-main/test-texroot/included.tex → test/test-get-main/test-texroot/included.tex b/...s/test-get-main/test-texroot/included.tex → test/test-get-main/test-texroot/included.tex
diff --git a/...tests/test-get-main/test-texroot/main.tex → test/test-get-main/test-texroot/main.tex b/...tests/test-get-main/test-texroot/main.tex → test/test-get-main/test-texroot/main.tex
diff --git a/...gly-paths/[code college-1] title/test.tex → ...gly-paths/[code college-1] title/test.tex b/...gly-paths/[code college-1] title/test.tex → ...gly-paths/[code college-1] title/test.tex
diff --git a/test/tests/test-get-main/test.vim → test/test-get-main/test.vim b/test/tests/test-get-main/test.vim → test/test-get-main/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 set nomore

diff --git a/test/tests/test-imaps/Makefile → test/test-imaps/Makefile b/test/tests/test-imaps/Makefile → test/test-imaps/Makefile
diff --git a/test/tests/test-imaps/test.vim → test/test-imaps/test.vim b/test/tests/test-imaps/test.vim → test/test-imaps/test.vim
@@ -1,6 +1,6 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
-let &rtp .= ',../../../after'
+let &rtp = '../..,' . &rtp
+let &rtp .= ',../../after'
 filetype plugin indent on
 syntax enable
 

diff --git a/test/tests/test-include/Makefile → test/test-include/Makefile b/test/tests/test-include/Makefile → test/test-include/Makefile
diff --git a/test/tests/test-include/references.bib → test/test-include/references.bib b/test/tests/test-include/references.bib → test/test-include/references.bib
diff --git a/test/tests/test-include/sub/file1.tex → test/test-include/sub/file1.tex b/test/tests/test-include/sub/file1.tex → test/test-include/sub/file1.tex
diff --git a/test/tests/test-include/sub/file2.tex → test/test-include/sub/file2.tex b/test/tests/test-include/sub/file2.tex → test/test-include/sub/file2.tex
diff --git a/test/tests/test-include/test.tex → test/test-include/test.tex b/test/tests/test-include/test.tex → test/test-include/test.tex
diff --git a/test/tests/test-include/test.vim → test/test-include/test.vim b/test/tests/test-include/test.vim → test/test-include/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-indentation-timing/Makefile → test/test-indentation-timing/Makefile b/test/tests/test-indentation-timing/Makefile → test/test-indentation-timing/Makefile
diff --git a/test/tests/test-indentation-timing/test.vim → test/test-indentation-timing/test.vim b/test/tests/test-indentation-timing/test.vim → test/test-indentation-timing/test.vim
@@ -1,6 +1,6 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
-let &rtp .= ',../../../after'
+let &rtp = '../..,' . &rtp
+let &rtp .= ',../../after'
 filetype plugin on
 syntax enable
 

diff --git a/.../tests/test-indentation-timing/thesis.tex → test/test-indentation-timing/thesis.tex b/.../tests/test-indentation-timing/thesis.tex → test/test-indentation-timing/thesis.tex
diff --git a/test/tests/test-indentation/Makefile → test/test-indentation/Makefile b/test/tests/test-indentation/Makefile → test/test-indentation/Makefile
diff --git a/test/tests/test-indentation/test.vim → test/test-indentation/test.vim b/test/tests/test-indentation/test.vim → test/test-indentation/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin indent on
 
 nnoremap q :qall!<cr>

diff --git a/...indentation/test_ampersands-off_input.tex → ...indentation/test_ampersands-off_input.tex b/...indentation/test_ampersands-off_input.tex → ...indentation/test_ampersands-off_input.tex
diff --git a/...ntation/test_ampersands-off_reference.tex → ...ntation/test_ampersands-off_reference.tex b/...ntation/test_ampersands-off_reference.tex → ...ntation/test_ampersands-off_reference.tex
diff --git a/...est-indentation/test_ampersands_input.tex → ...est-indentation/test_ampersands_input.tex b/...est-indentation/test_ampersands_input.tex → ...est-indentation/test_ampersands_input.tex
diff --git a/...ion/test_ampersands_nested-envs_input.tex → ...ion/test_ampersands_nested-envs_input.tex b/...ion/test_ampersands_nested-envs_input.tex → ...ion/test_ampersands_nested-envs_input.tex
diff --git a/...test_ampersands_nested-envs_reference.tex → ...test_ampersands_nested-envs_reference.tex b/...test_ampersands_nested-envs_reference.tex → ...test_ampersands_nested-envs_reference.tex
diff --git a/...indentation/test_ampersands_reference.tex → ...indentation/test_ampersands_reference.tex b/...indentation/test_ampersands_reference.tex → ...indentation/test_ampersands_reference.tex
diff --git a/...indentation/test_close-indented_input.tex → ...indentation/test_close-indented_input.tex b/...indentation/test_close-indented_input.tex → ...indentation/test_close-indented_input.tex
diff --git a/...ntation/test_close-indented_reference.tex → ...ntation/test_close-indented_reference.tex b/...ntation/test_close-indented_reference.tex → ...ntation/test_close-indented_reference.tex
diff --git a/...ation/test_environments-ignored_input.tex → ...ation/test_environments-ignored_input.tex b/...ation/test_environments-ignored_input.tex → ...ation/test_environments-ignored_input.tex
diff --git a/...n/test_environments-ignored_reference.tex → ...n/test_environments-ignored_reference.tex b/...n/test_environments-ignored_reference.tex → ...n/test_environments-ignored_reference.tex
diff --git a/...t-indentation/test_environments_input.tex → ...t-indentation/test_environments_input.tex b/...t-indentation/test_environments_input.tex → ...t-indentation/test_environments_input.tex
diff --git a/...dentation/test_environments_reference.tex → ...dentation/test_environments_reference.tex b/...dentation/test_environments_reference.tex → ...dentation/test_environments_reference.tex
diff --git a/...ests/test-indentation/test_math_input.tex → test/test-indentation/test_math_input.tex b/...ests/test-indentation/test_math_input.tex → test/test-indentation/test_math_input.tex
diff --git a/.../test-indentation/test_math_reference.tex → .../test-indentation/test_math_reference.tex b/.../test-indentation/test_math_reference.tex → .../test-indentation/test_math_reference.tex
diff --git a/...ests/test-indentation/test_tikz_input.tex → test/test-indentation/test_tikz_input.tex b/...ests/test-indentation/test_tikz_input.tex → test/test-indentation/test_tikz_input.tex
diff --git a/...test-indentation/test_tikz_long_input.tex → ...test-indentation/test_tikz_long_input.tex b/...test-indentation/test_tikz_long_input.tex → ...test-indentation/test_tikz_long_input.tex
diff --git a/...-indentation/test_tikz_long_reference.tex → ...-indentation/test_tikz_long_reference.tex b/...-indentation/test_tikz_long_reference.tex → ...-indentation/test_tikz_long_reference.tex
diff --git a/.../test-indentation/test_tikz_reference.tex → .../test-indentation/test_tikz_reference.tex b/.../test-indentation/test_tikz_reference.tex → .../test-indentation/test_tikz_reference.tex
diff --git a/.../test-indentation/test_verbatim_input.tex → .../test-indentation/test_verbatim_input.tex b/.../test-indentation/test_verbatim_input.tex → .../test-indentation/test_verbatim_input.tex
diff --git a/...t-indentation/test_verbatim_reference.tex → ...t-indentation/test_verbatim_reference.tex b/...t-indentation/test_verbatim_reference.tex → ...t-indentation/test_verbatim_reference.tex
diff --git a/test/tests/test-matchparen-speed/Makefile → test/test-matchparen-speed/Makefile b/test/tests/test-matchparen-speed/Makefile → test/test-matchparen-speed/Makefile
diff --git a/test/tests/test-matchparen-speed/test.tex → test/test-matchparen-speed/test.tex b/test/tests/test-matchparen-speed/test.tex → test/test-matchparen-speed/test.tex
diff --git a/test/tests/test-matchparen-speed/test.vim → test/test-matchparen-speed/test.vim b/test/tests/test-matchparen-speed/test.vim → test/test-matchparen-speed/test.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 syntax on
 

diff --git a/test/tests/test-metadata/Makefile → test/test-metadata/Makefile b/test/tests/test-metadata/Makefile → test/test-metadata/Makefile
diff --git a/test/tests/test-metadata/test-sources.vim → test/test-metadata/test-sources.vim b/test/tests/test-metadata/test-sources.vim → test/test-metadata/test-sources.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 silent edit test-sources/main.tex

diff --git a/...s/test-metadata/test-sources/include1.tex → test/test-metadata/test-sources/include1.tex b/...s/test-metadata/test-sources/include1.tex → test/test-metadata/test-sources/include1.tex
diff --git a/...tests/test-metadata/test-sources/main.tex → test/test-metadata/test-sources/main.tex b/...tests/test-metadata/test-sources/main.tex → test/test-metadata/test-sources/main.tex
diff --git a/...t-metadata/test-sources/sub1/include2.tex → ...t-metadata/test-sources/sub1/include2.tex b/...t-metadata/test-sources/sub1/include2.tex → ...t-metadata/test-sources/sub1/include2.tex
diff --git a/...t-metadata/test-sources/sub2/include3.tex → ...t-metadata/test-sources/sub2/include3.tex b/...t-metadata/test-sources/sub2/include3.tex → ...t-metadata/test-sources/sub2/include3.tex
diff --git a/...ts/test-metadata/test-sources/subfile.tex → test/test-metadata/test-sources/subfile.tex b/...ts/test-metadata/test-sources/subfile.tex → test/test-metadata/test-sources/subfile.tex
diff --git a/test/tests/test-motions-virtual/Makefile → test/test-motions-virtual/Makefile b/test/tests/test-motions-virtual/Makefile → test/test-motions-virtual/Makefile
diff --git a/test/tests/test-motions-virtual/test.ref → test/test-motions-virtual/test.ref b/test/tests/test-motions-virtual/test.ref → test/test-motions-virtual/test.ref
diff --git a/test/tests/test-motions-virtual/test.tex → test/test-motions-virtual/test.tex b/test/tests/test-motions-virtual/test.tex → test/test-motions-virtual/test.tex
diff --git a/test/tests/test-motions-virtual/test.vim → test/test-motions-virtual/test.vim b/test/tests/test-motions-virtual/test.vim → test/test-motions-virtual/test.vim
@@ -1,6 +1,6 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
-let &rtp .= ',../../../after'
+let &rtp = '../..,' . &rtp
+let &rtp .= ',../../after'
 filetype plugin indent on
 syntax on
 

diff --git a/test/tests/test-motions/Makefile → test/test-motions/Makefile b/test/tests/test-motions/Makefile → test/test-motions/Makefile
diff --git a/test/tests/test-motions/test-beamer.tex → test/test-motions/test-beamer.tex b/test/tests/test-motions/test-beamer.tex → test/test-motions/test-beamer.tex
diff --git a/test/tests/test-motions/test-beamer.vim → test/test-motions/test-beamer.vim b/test/tests/test-motions/test-beamer.vim → test/test-motions/test-beamer.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 syntax on
 

diff --git a/test/tests/test-motions/test-comment.tex → test/test-motions/test-comment.tex b/test/tests/test-motions/test-comment.tex → test/test-motions/test-comment.tex
diff --git a/test/tests/test-motions/test-comment.vim → test/test-motions/test-comment.vim b/test/tests/test-motions/test-comment.vim → test/test-motions/test-comment.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 
 nnoremap q :qall!<cr>

diff --git a/test/tests/test-motions/test-math.tex → test/test-motions/test-math.tex b/test/tests/test-motions/test-math.tex → test/test-motions/test-math.tex
diff --git a/test/tests/test-motions/test-math.vim → test/test-motions/test-math.vim b/test/tests/test-motions/test-math.vim → test/test-motions/test-math.vim
@@ -1,5 +1,5 @@
 set nocompatible
-let &rtp = '../../..,' . &rtp
+let &rtp = '../..,' . &rtp
 filetype plugin on
 syntax on
 

diff --git a/test/tests/test-motions/test-method.tex → test/test-motions/test-method.tex b/test/tests/test-motions/test-method.tex → test/test-motions/test-method.tex