From 05695a35c7b55661e4d3ccc2da4585979eaab2cb Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Wed, 28 Aug 2019 21:05:34 -0500 Subject: [PATCH] Fix test-install after removing cook. --- Makefile | 8 ++++++-- build_win.bat | 4 ++++ test/install/test/test1.janet | 5 ----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8038b393..1d8e1f88 100644 --- a/Makefile +++ b/Makefile @@ -329,8 +329,12 @@ clean: -rm -rf build vgcore.* callgrind.* test-install: - cd test/install && rm -rf build .cache .manifests && jpm --verbose build && jpm --verbose test \ - && build/testexec + cd test/install \ + && rm -rf build .cache .manifests \ + && jpm --verbose build \ + && jpm --verbose test \ + && build/testexec \ + && jpm --verbose --modpath=. install https://github.com/janet-lang/json.git build/embed_janet.o: build/janet.c $(JANET_HEADERS) $(CC) $(CFLAGS) -c $< -o $@ diff --git a/build_win.bat b/build_win.bat index 2cb7612f..2cc7746c 100644 --- a/build_win.bat +++ b/build_win.bat @@ -172,6 +172,10 @@ call jpm clean @if errorlevel 1 goto :TESTFAIL call jpm test @if errorlevel 1 goto :TESTFAIL +call jpm --verbose --modpath=. install https://github.com/janet-lang/json.git +@if errorlevel 1 goto :TESTFAIL +call build\testexec +@if errorlevel 1 goto :TESTFAIL popd exit /b 0 diff --git a/test/install/test/test1.janet b/test/install/test/test1.janet index 75d5a839..57fde0e1 100644 --- a/test/install/test/test1.janet +++ b/test/install/test/test1.janet @@ -1,8 +1,3 @@ (import build/testmod :as testmod) (if (not= 5 (testmod/get5)) (error "testmod/get5 failed")) - -(import cook) - -(with-dyns [:modpath (os/cwd)] - (cook/install-git "https://github.com/janet-lang/json.git"))