Skip to content

Commit 9daa78c

Browse files
committed
Fix usages of /home to /home/vimtest
Forgotten with 1f99a50.
1 parent 1f99a50 commit 9daa78c

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: build push test
22

3-
TAG:=6
3+
TAG:=7
44

55
build:
66
docker build -t testbed/vim:$(TAG) .

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ docker run -it --rm -v $PWD:/testplugin -v $PWD/test:/home "your/repository" vim
7575
The entry point for the container is a script that runs the named Vim version.
7676
In this case `vim74`. Arguments after the name is passed to Vim.
7777

78-
The entry point script prefixes your arguments with `-u /home/vimrc -i NONE`.
78+
The entry point script prefixes your arguments with `-u /home/vimtest/vimrc -i NONE`.
7979
They can be overridden with your arguments.
8080

8181
## Setup
@@ -97,8 +97,8 @@ vimrc:
9797
source /rtp.vim
9898
```
9999

100-
It will add `/home/vim` and `/home/vim/after` to the runtime path, and search
101-
for plugins in `/home/plugins`.
100+
It will add `/home/vimtest/vim` and `/home/vimtest/vim/after` to the runtime
101+
path, and search for plugins in `/home/vimtest/plugins`.
102102

103103
### Volumes
104104

example/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WRITABLE_HOME:=$(shell tmpdir=$$(mktemp -d --dry-run); \
1010
DOCKER = docker run -a stderr --rm \
1111
-v $(CURDIR):/testplugin \
1212
-v $(WRITABLE_HOME):/home \
13-
-v $(CURDIR)/$(PLUGINS):/home/plugins "$(IMAGE)"
13+
-v $(CURDIR)/$(PLUGINS):/home/vimtest/plugins "$(IMAGE)"
1414

1515
test: test-setup
1616
docker build -f Dockerfile.tests -t "$(IMAGE)" .
@@ -29,8 +29,8 @@ test: test-setup
2929
fi; \
3030
for vim in "neovim-master --headless" vim-master; do \
3131
$(DOCKER) $${vim} -u NONE \
32-
"+py import sys; open('/home/py2', 'w').write(str(sys.version_info[0]))" \
33-
"+py3 import sys; open('/home/py3', 'w').write(str(sys.version_info[0]))" \
32+
"+py import sys; open('/home/vimtest/py2', 'w').write(str(sys.version_info[0]))" \
33+
"+py3 import sys; open('/home/vimtest/py3', 'w').write(str(sys.version_info[0]))" \
3434
'+q'; \
3535
if [ "$$(<$(WRITABLE_HOME)/py2)" != "2" ]; then \
3636
echo "Failed to get Python version from $${vim} (2)." >&2; exit 1; \
@@ -42,7 +42,7 @@ test: test-setup
4242
done; \
4343
for vim in "neovim-master --headless" vim-master; do \
4444
$(DOCKER) $${vim} -u NONE \
45-
"+ruby open('/home/ruby', 'w') { |f| f << 'ruby was here' }" \
45+
"+ruby open('/home/vimtest/ruby', 'w') { |f| f << 'ruby was here' }" \
4646
'+q'; \
4747
if [ "$$(<$(WRITABLE_HOME)/ruby)" != "ruby was here" ]; then \
4848
echo "Failed to get output from Ruby for $${vim}." >&2; exit 1; \
@@ -51,7 +51,7 @@ test: test-setup
5151
done; \
5252
for vim in "neovim-master --headless" vim-master; do \
5353
$(DOCKER) $${vim} -u NONE \
54-
"+lua io.open('/home/lua', 'w'):write('lua was here')" \
54+
"+lua io.open('/home/vimtest/lua', 'w'):write('lua was here')" \
5555
'+q'; \
5656
if [ "$$(<$(WRITABLE_HOME)/lua)" != "lua was here" ]; then \
5757
echo "Failed to get output from Lua for $${vim}." >&2; exit 1; \

scripts/rtp.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
set rtp=/home/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/home/vim/after
2-
execute 'set rtp+='.join(filter(split(expand('/home/plugins/*')), 'isdirectory(v:val)'), ',')
1+
set rtp=/home/vimtest/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/home/vimtest/vim/after
2+
execute 'set rtp+='.join(filter(split(expand('/home/vimtest/plugins/*')), 'isdirectory(v:val)'), ',')
33
set rtp+=/testplugin

scripts/run_vim.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if ! [ -x "/vim-build/bin/$BIN" ]; then
1111
fi
1212

1313
# Set default vimrc to a visible file
14-
ARGS="-u /home/vimrc -i NONE"
14+
ARGS="-u /home/vimtest/vimrc -i NONE"
1515

1616
# So we can pass the arguments to Vim as it was passed to this script
1717
while [ $# -gt 0 ]; do

0 commit comments

Comments
 (0)