mirror of
https://github.com/idris-lang/Idris2.git
synced 2024-09-11 13:36:08 +03:00
Point bootstrap tests at the right place
We also need to separate building the runtests binary from running the tests, because runtests refers to the boostrap libraries, and the tests refer to the newly built libraries. This worked locally, using inconsistent TTC versions for the bootstrap version and new version, but let's see what it does on a clean machine
This commit is contained in:
parent
4ed38bd47d
commit
941c8b1ab5
5
Makefile
5
Makefile
@ -38,7 +38,7 @@ export SCHEME
|
||||
|
||||
.PHONY: all idris2-exec ${TARGET} support support-clean clean distclean
|
||||
|
||||
all: support ${TARGET} libs
|
||||
all: support ${TARGET} testbin libs
|
||||
|
||||
idris2-exec: ${TARGET}
|
||||
|
||||
@ -64,6 +64,9 @@ contrib: prelude
|
||||
|
||||
libs : prelude base network contrib
|
||||
|
||||
testbin:
|
||||
@${MAKE} -C tests testbin
|
||||
|
||||
test:
|
||||
@${MAKE} -C tests only=$(only) IDRIS2=../../../${TARGET}
|
||||
|
||||
|
@ -16,8 +16,8 @@ you have Chez Scheme installed, with the executable name `chez`, type:
|
||||
|
||||
You may need to change `chez` to be the local name of your Chez Scheme. This
|
||||
is often one of `scheme`, `chezscheme` or `chezscheme9.5` (depending on the
|
||||
version). On a modern desktop machine, this process should take no more than
|
||||
2 or 3 minutes.
|
||||
version). On a modern desktop machine, this process (including tests)
|
||||
should take less than 5 minutes.
|
||||
|
||||
Idris 2 is mostly backwards compatible with Idris 1, with some minor
|
||||
exceptions. The most notable user visible differences, which might cause Idris
|
||||
|
@ -26,9 +26,13 @@ PREFIX="`dirname $DIR`"/bootstrap
|
||||
echo ${PREFIX}
|
||||
|
||||
IDRIS2_BOOT_PATH="${PREFIX}/idris2-0.2.0/prelude:${PREFIX}/idris2-0.2.0/base:${PREFIX}/idris2-0.2.0/contrib:${PREFIX}/idris2-0.2.0/network"
|
||||
NEWPREFIX="`dirname $DIR`"
|
||||
IDRIS2_NEW_PATH="${NEWPREFIX}/libs/prelude/build/ttc:${NEWPREFIX}/libs/base/build/ttc:${NEWPREFIX}/libs/network/build/ttc"
|
||||
|
||||
make libs SCHEME=${SCHEME} PREFIX=${PREFIX}
|
||||
make install SCHEME=${SCHEME} PREFIX=${PREFIX}
|
||||
make clean IDRIS2_BOOT=${PREFIX}/bin/idris2
|
||||
make all IDRIS2_BOOT=${PREFIX}/bin/idris2 SCHEME=${SCHEME} IDRIS2_PATH=${IDRIS2_BOOT_PATH}
|
||||
make test INTERACTIVE='' IDRIS2_BOOT=${PREFIX}/bin/idris2 SCHEME=${SCHEME} IDRIS2_LIBS=${PREFIX}/idris2-0.2.0/lib IDRIS2_DATA=${PREFIX}/idris2-0.2.0/support
|
||||
|
||||
echo "Testing using libraries in ${IDRIS2_NEW_PATH}"
|
||||
make test INTERACTIVE='' IDRIS2_PATH=${IDRIS2_NEW_PATH} SCHEME=${SCHEME} IDRIS2_LIBS=${PREFIX}/idris2-0.2.0/lib IDRIS2_DATA=${PREFIX}/idris2-0.2.0/support
|
||||
|
@ -1,8 +1,14 @@
|
||||
INTERACTIVE ?= --interactive
|
||||
|
||||
test: clean
|
||||
.PHONY: testbin test
|
||||
|
||||
test:
|
||||
./build/exec/runtests $(IDRIS2) $(INTERACTIVE) --only $(only)
|
||||
|
||||
testbin: build/exec/runtests
|
||||
|
||||
build/exec/runtests:
|
||||
${IDRIS2_BOOT} --build tests.ipkg
|
||||
@./build/exec/runtests $(IDRIS2) $(INTERACTIVE) --only $(only)
|
||||
|
||||
clean:
|
||||
$(RM) -r build
|
||||
|
@ -2,7 +2,7 @@ import Data.Primitives.Views
|
||||
import Data.Strings
|
||||
import System
|
||||
|
||||
-- %default total -- put this back when codata works!
|
||||
%default total
|
||||
|
||||
data Command : Type -> Type where
|
||||
PutStr : String -> Command ()
|
||||
|
Loading…
Reference in New Issue
Block a user