Skip to content

Commit bd17253

Browse files
committed
example/Makefile: remove writable home, use TEMPDIR
1 parent 131c13f commit bd17253

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

example/Makefile

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
SHELL := $(shell which bash)
22
IMAGE := vim-testbed-example
33
PLUGINS := test/plugins
4-
# A writable home directory, required for Neovim.
5-
WRITABLE_HOME:=$(shell tmpdir=$$(mktemp -d --dry-run); \
6-
mkdir -m 777 $${tmpdir}; \
7-
cd $(CURDIR)/test; \
8-
cp -a vimrc *.vader $${tmpdir}/; \
9-
echo $${tmpdir})
10-
TODO: remove/unneeded by now?!
11-
# -v $(WRITABLE_HOME):/home/testbed \
124

135
DOCKER = docker run -ti --rm \
146
-v $(CURDIR):/testbed \
157
-v $(CURDIR)/$(PLUGINS):/home/testbed/.vim/plugins "$(IMAGE)"
168

9+
test: TEMPDIR=$(shell mktemp -d)
1710
test: test-setup
1811
docker build -f Dockerfile.tests -t "$(IMAGE)" .
1912
set -ex; \
@@ -31,31 +24,31 @@ test: test-setup
3124
fi; \
3225
for vim in "neovim-master --headless" vim-master; do \
3326
$(DOCKER) $${vim} -u NONE \
34-
"+py import sys; open('/home/py2', 'w').write(str(sys.version_info[0]))" \
35-
"+py3 import sys; open('/home/py3', 'w').write(str(sys.version_info[0]))" \
27+
"+py import sys; open('$(TEMPDIR)/py2', 'w').write(str(sys.version_info[0]))" \
28+
"+py3 import sys; open('$(TEMPDIR)/py3', 'w').write(str(sys.version_info[0]))" \
3629
'+q'; \
37-
if [ "$$(<$(WRITABLE_HOME)/py2)" != "2" ]; then \
30+
if [ "$$(<$(TEMPDIR)/py2)" != "2" ]; then \
3831
echo "Failed to get Python version from $${vim} (2)." >&2; exit 1; \
3932
fi; \
40-
if [ "$$(<$(WRITABLE_HOME)/py3)" != "3" ]; then \
33+
if [ "$$(<$(TEMPDIR)/py3)" != "3" ]; then \
4134
echo "Failed to get Python version from $${vim} (3)." >&2; exit 1; \
4235
fi; \
43-
$(RM) $(WRITABLE_HOME)/py*; \
36+
$(RM) $(TEMPDIR)/py*; \
4437
done; \
4538
for vim in "neovim-master --headless" vim-master; do \
4639
$(DOCKER) $${vim} -u NONE \
47-
"+ruby open('/home/ruby', 'w') { |f| f << 'ruby was here' }" \
40+
"+ruby open('$(TEMPDIR)/ruby', 'w') { |f| f << 'ruby was here' }" \
4841
'+q'; \
49-
if [ "$$(<$(WRITABLE_HOME)/ruby)" != "ruby was here" ]; then \
42+
if [ "$$(<$(TEMPDIR)/ruby)" != "ruby was here" ]; then \
5043
echo "Failed to get output from Ruby for $${vim}." >&2; exit 1; \
5144
fi; \
52-
$(RM) $(WRITABLE_HOME)/ruby; \
45+
$(RM) $(TEMPDIR)/ruby; \
5346
done; \
5447
for vim in "neovim-master --headless" vim-master; do \
5548
$(DOCKER) $${vim} -u NONE \
56-
"+lua io.open('/home/lua', 'w'):write('lua was here')" \
49+
"+lua io.open('$(TEMPDIR)/lua', 'w'):write('lua was here')" \
5750
'+q'; \
58-
if [ "$$(<$(WRITABLE_HOME)/lua)" != "lua was here" ]; then \
51+
if [ "$$(<$(TEMPDIR)/lua)" != "lua was here" ]; then \
5952
echo "Failed to get output from Lua for $${vim}." >&2; exit 1; \
6053
fi; \
6154
done; \

0 commit comments

Comments
 (0)