From 1add0c7d43fc27a13f5575fc86b2bf0dc3238fc5 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sat, 9 May 2020 10:30:09 -0500
Subject: [PATCH] make test-install should be easier to clean.

---
 Makefile                | 10 ++++++----
 test/install/.gitignore |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5fc16ae9..4f872ad7 100644
--- a/Makefile
+++ b/Makefile
@@ -290,6 +290,7 @@ build/janet.tmLanguage: tools/tm_lang_gen.janet $(JANET_TARGET)
 
 clean:
 	-rm -rf build vgcore.* callgrind.*
+	-rm -rf test/install/build test/install/modpath
 
 test-install:
 	cd test/install \
@@ -299,10 +300,11 @@ test-install:
 		&& build/testexec \
 		&& jpm --verbose quickbin testexec.janet build/testexec2 \
 		&& build/testexec2 \
-		&& jpm --verbose --testdeps --modpath=. install https://github.com/janet-lang/json.git
-	cd test/install && jpm --verbose --test --modpath=. install https://github.com/janet-lang/jhydro.git
-	cd test/install && jpm --verbose --test --modpath=. install https://github.com/janet-lang/path.git
-	cd test/install && jpm --verbose --test --modpath=. install https://github.com/janet-lang/argparse.git
+		&& mkdir -p modpath \
+		&& jpm --verbose --testdeps --modpath=./modpath install https://github.com/janet-lang/json.git
+	cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/jhydro.git
+	cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/path.git
+	cd test/install && jpm --verbose --test --modpath=./modpath install https://github.com/janet-lang/argparse.git
 
 .PHONY: clean install repl debug valgrind test \
 	valtest emscripten dist uninstall docs grammar format
diff --git a/test/install/.gitignore b/test/install/.gitignore
index c230d0a4..9a026ee6 100644
--- a/test/install/.gitignore
+++ b/test/install/.gitignore
@@ -1,4 +1,5 @@
 /build
+/modpath
 .cache
 .manifests
 json.*