on master help sign in
make the tests respect the IDRIS env variable

Simplify the sandbox lookup and only run it once. Only run the test script once for 'make test' instead of using the makefile to iterate.

commitb0e8b1258bfb30998217e2c94d260491aa53e3b7 authorNiklas Larsson <niklas@mm.st> dateFri 22 Jan 2016, 06:57 (11 years ago) parent18d0204
192 files changed+261−266
Makefile+3−9 test/Makefile+3−3 test/basic001/run+2−2 test/basic002/run+1−1 test/basic003/run+1−1 test/basic004/run+1−1 test/basic005/run+1−1 test/basic006/run+2−2 test/basic007/run+1−1 test/basic008/run+1−1 test/basic009/run+3−3 test/basic011/run+1−1 test/basic012/run+1−1 test/basic013/run+1−1 test/basic014/run+1−1 test/basic015/run+1−1 test/basic016/run+1−1 test/bignum001/run+1−1 test/bignum002/run+1−1 test/bounded001/run+1−1 test/classes001/run+1−1 test/corecords001/run+1−1 test/corecords002/run+1−1 test/delab001/run+1−1 test/disambig002/run+1−1 test/docs001/run+1−1 test/docs002/run+1−1 test/docs003/run+1−1 test/docs004/run+1−1 test/dsl001/run+1−1 test/dsl002/run+1−1 test/dsl003/run+1−1 test/dsl004/run+3−3 test/effects001/run+2−2 test/effects002/run+1−1 test/effects003/run+1−1 test/effects004/run+1−1 test/effects005/run+2−2 test/error001/run+1−1 test/error002/run+1−1 test/error003/run+1−1 test/error004/run+1−1 test/error005/run+1−1 test/error006/run+1−1 test/ffi001/run+1−1 test/ffi002/run+1−1 test/ffi003/run+1−1 test/ffi004/run+1−1 test/ffi005/run+1−1 test/ffi006/run+1−1 test/folding001/run+1−1 test/idrisdoc001/run+1−1 test/idrisdoc002/run+1−1 test/idrisdoc003/run+1−1 test/idrisdoc004/run+1−1 test/idrisdoc005/run+1−1 test/idrisdoc006/run+2−2 test/idrisdoc007/run+1−1 test/idrisdoc008/run+1−1 test/idrisdoc009/run+1−1 test/interactive001/run+1−1 test/interactive002/run+1−1 test/interactive003/run+1−1 test/interactive004/run+1−1 test/interactive005/run+1−1 test/interactive006/run+1−1 test/interactive007/run+1−1 test/interactive008/run+1−1 test/interactive009/run+1−1 test/interactive010/run+1−1 test/interactive011/run+1−1 test/interactive012/run+1−1 test/io001/run+1−1 test/io002/run+1−1 test/io003/run+2−2 test/literate001/run+2−2 test/meta001/run+1−1 test/meta002/run+2−2 test/meta003/run+1−1 test/meta004/run+1−1 test/pkg001/run+1−1 test/pkg002/run+1−1 test/pkg003/run+1−1 test/pkg004/run+1−1 test/primitives001/run+2−2 test/primitives003/run+1−1 test/primitives004-disabled/run+1−1 test/proof001/run+1−1 test/proof002/run+2−2 test/proof003/run+1−1 test/proof004/run+1−1 test/proof005/run+1−1 test/proof006/run+1−1 test/proof007/run+1−1 test/proof008/run+1−1 test/proof009/run+1−1 test/proof010/run+1−1 test/proofsearch001/run+1−1 test/proofsearch002/run+1−1 test/proofsearch003/run+1−1 test/pruviloj001/run+1−1 test/quasiquote001/run+1−1 test/quasiquote002/run+1−1 test/quasiquote003/run+1−1 test/quasiquote004/run+1−1 test/quasiquote005/run+1−1 test/quasiquote006/run+1−1 test/records001/run+1−1 test/records002/run+1−1 test/records003/run+1−1 test/records004/run+1−1 test/reg001/run+1−1 test/reg002/run+1−1 test/reg003/run+2−2 test/reg004/run+1−1 test/reg006/run+1−1 test/reg007/run+1−1 test/reg010/run+1−1 test/reg013/run+1−1 test/reg016/run+1−1 test/reg017/run+1−1 test/reg018/run+4−4 test/reg020/run+1−1 test/reg023/run+1−1 test/reg024/run+1−1 test/reg025/run+1−1 test/reg027/run+2−2 test/reg028/run+2−2 test/reg029/run+2−2 test/reg031/run+1−1 test/reg032/run+1−1 test/reg034/run+1−1 test/reg035/run+3−3 test/reg036/run+1−1 test/reg037/run+1−1 test/reg038/run+1−1 test/reg040/run+1−1 test/reg041/run+2−2 test/reg042/run+1−1 test/reg044/run+1−1 test/reg045/run+1−1 test/reg046/run+1−1 test/reg047/run+2−2 test/reg048/run+1−1 test/reg049/run+1−1 test/reg050/run+3−3 test/reg051-disabled/run+1−1 test/reg052/run+1−1 test/reg053/run+1−1 test/reg054/run+1−1 test/reg055/run+2−2 test/reg056/run+1−1 test/reg057/run+1−1 test/reg058/run+2−2 test/reg059/run+1−1 test/reg060/run+1−1 test/reg061/run+1−1 test/reg062/run+2−2 test/reg063/run+1−1 test/reg064/run+1−1 test/reg065/run+1−1 test/reg066/run+1−1 test/reg067/run+1−1 test/runtest.pl+17−16 test/sourceLocation001/run+1−1 test/sugar001/run+1−1 test/sugar002/run+1−1 test/sugar003/run+1−1 test/sugar004/run+1−1 test/sugar005/run+1−1 test/syntax001/run+2−2 test/syntax002/run+1−1 test/tactics001/run+1−1 test/totality001/run+3−3 test/totality002/run+3−3 test/totality003/run+2−2 test/totality004/run+2−2 test/totality005/run+2−2 test/totality006/run+3−3 test/totality007/run+1−1 test/totality008/run+1−1 test/totality009/run+2−2 test/totality010/run+1−1 test/tutorial001/run+1−1 test/tutorial002/run+1−1 test/tutorial003/run+1−1 test/tutorial004/run+1−1 test/tutorial005/run+1−1 test/tutorial006/run+3−3 test/unique001/run+6−6 test/unique002/run+2−2 test/unique003/run+1−1
Makefile+3−9
@@ -20,16 +20,10 @@ build: dist/setup-config
2020test: doc test_c
2121
2222test_c:
23− $(MAKE) -C test IDRIS=../dist/build/idris
24−
25−test_java:
26− $(MAKE) -C test IDRIS=../dist/build/idris test_java
27−
28−test_llvm:
29− $(MAKE) -C test IDRIS=../dist/build/idris test_llvm
23+ $(MAKE) -C test IDRIS=../dist/build/idris/idris
3024
3125test_js:
32− $(MAKE) -C test IDRIS=../dist/build/idris test_js
26+ $(MAKE) -C test IDRIS=../dist/build/idris/idris test_js
3327
3428test_all:
3529 $(MAKE) test
@@ -37,7 +31,7 @@ test_all:
3731 $(MAKE) test_java
3832
3933test_timed:
40− $(MAKE) -C test IDRIS=../dist/build/idris time
34+ $(MAKE) -C test IDRIS=../dist/build/idris/idris time
4135
4236lib_clean:
4337 $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean
test/Makefile+3−3
@@ -1,8 +1,8 @@
1−.PHONY: test test_java test_js time update diff distclean $(TESTS)
1+.PHONY: test test_js time update diff distclean $(TESTS)
22
3−TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))
43
5−test: $(TESTS)
4+test:
5+ /usr/bin/env perl ./runtest.pl all
66
77%.test:
88 @perl ./runtest.pl $(patsubst %.test,%,$@)
test/basic001/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris $@ reg005.idr -o reg005
3−idris $@ basic001a.idr -o basic001a
2+${IDRIS:-idris} $@ reg005.idr -o reg005
3+${IDRIS:-idris} $@ basic001a.idr -o basic001a
44./reg005
55./basic001a
66rm -f reg005 basic001a *.ibc
test/basic002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --consolewidth 80 test006.idr -o test006
2+${IDRIS:-idris} $@ --nocolour --consolewidth 80 test006.idr -o test006
33./test006
44rm -f test006 test006.ibc
test/basic003/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test027.idr -o test027
2+${IDRIS:-idris} $@ test027.idr -o test027
33./test027
44rm -f test027 *.ibc
test/basic004/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test016.idr -o test016
2+${IDRIS:-idris} $@ test016.idr -o test016
33./test016
44rm -f test016 *.ibc
test/basic005/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test019.lidr -o test019
2+${IDRIS:-idris} $@ test019.lidr -o test019
33./test019
44rm -f test019 *.ibc
test/basic006/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22
3−idris --consolewidth 80 $@ test020.idr -o test020
4−idris --consolewidth 80 $@ test020a.idr --check --nocolor
3+${IDRIS:-idris} --consolewidth 80 $@ test020.idr -o test020
4+${IDRIS:-idris} --consolewidth 80 $@ test020a.idr --check --nocolor
55./test020
66rm -f test020 *.ibc
test/basic007/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ -o test033 test033.idr
2+${IDRIS:-idris} $@ -o test033 test033.idr
33./test033
44rm -f *.ibc test033
test/basic008/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test036.idr -o test036
2+${IDRIS:-idris} $@ test036.idr -o test036
33./test036
44rm -f test036 *.ibc
test/basic009/run+3−3
@@ -1,8 +1,8 @@
11#!/usr/bin/env bash
22
3−idris --consolewidth 80 $@ Main.idr --nocolour --check && echo MAIN-PASS
4−idris --consolewidth 80 $@ Faulty.idr --nocolour --check && echo FAULTY-PASS
5−idris --consolewidth 80 $@ Multiple.idr --nocolour --check && echo MULTIPLE-PASS
3+${IDRIS:-idris} --consolewidth 80 $@ Main.idr --nocolour --check && echo MAIN-PASS
4+${IDRIS:-idris} --consolewidth 80 $@ Faulty.idr --nocolour --check && echo FAULTY-PASS
5+${IDRIS:-idris} --consolewidth 80 $@ Multiple.idr --nocolour --check && echo MULTIPLE-PASS
66
77
88rm -f *.ibc B/*.ibc
test/basic011/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ basic011.idr -p contrib -o basic011
2+${IDRIS:-idris} $@ basic011.idr -p contrib -o basic011
33./basic011
44rm -f basic011 *.ibc
test/basic012/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ basic012.idr -o basic012
2+${IDRIS:-idris} $@ basic012.idr -o basic012
33./basic012
44rm -f basic012 *.ibc
test/basic013/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ basic013.idr -o basic013
2+${IDRIS:-idris} $@ basic013.idr -o basic013
33./basic013
44rm -f basic013 *.ibc
test/basic014/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ basic014.idr --check
2+${IDRIS:-idris} $@ basic014.idr --check
33rm -f *.ibc
test/basic015/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ basic015.idr -o basic015
2+${IDRIS:-idris} $@ basic015.idr -o basic015
33./basic015
44rm -f basic015 *.ibc
test/basic016/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ CycleA.idr --consolewidth 80 --nocolour --check
2+${IDRIS:-idris} $@ CycleA.idr --consolewidth 80 --nocolour --check
33rm -f *.ibc
test/bignum001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ bignum001.idr -o bignum001
2+${IDRIS:-idris} $@ bignum001.idr -o bignum001
33./bignum001
44rm -f bignum001 *.ibc
test/bignum002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ bignum002.idr -o bignum002
2+${IDRIS:-idris} $@ bignum002.idr -o bignum002
33./bignum002
44rm -f bignum002 *.ibc
test/bounded001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ bounded001.idr -o bounded001
2+${IDRIS:-idris} $@ bounded001.idr -o bounded001
33./bounded001
44rm -f bounded001 *.ibc
test/classes001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --quiet --nocolour --consolewidth 70 ClassName.idr < input
2+${IDRIS:-idris} $@ --quiet --nocolour --consolewidth 70 ClassName.idr < input
33rm -f bounded001 *.ibc
test/corecords001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ corecords001.idr -o corecords001
2+${IDRIS:-idris} $@ corecords001.idr -o corecords001
33./corecords001
44rm -f corecords001 corecords001.ibc
test/corecords002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ corecords002.idr -o corecords002
2+${IDRIS:-idris} $@ corecords002.idr -o corecords002
33./corecords002
44rm -f corecords002 corecords002.ibc
test/delab001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --quiet --nocolor delab001.idr < input
2+${IDRIS:-idris} $@ --quiet --nocolor delab001.idr < input
33rm -f *.ibc
test/disambig002/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ disambig002.idr --check
2+${IDRIS:-idris} $@ disambig002.idr --check
33rm -f *.ibc
test/docs001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet --nocolor --consolewidth 80 docs001.idr < input
2+${IDRIS:-idris} --quiet --nocolor --consolewidth 80 docs001.idr < input
33rm *.ibc
test/docs002/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 --nobanner --nocolor --quiet docs002.idr < input
2+${IDRIS:-idris} --consolewidth 80 --nobanner --nocolor --quiet docs002.idr < input
33rm *.ibc
test/docs003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 --quiet --nocolor docs003.idr < input
2+${IDRIS:-idris} --consolewidth 80 --quiet --nocolor docs003.idr < input
33rm *.ibc
test/docs004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet --nocolor --consolewidth 80 docs004.idr < input
2+${IDRIS:-idris} --quiet --nocolor --consolewidth 80 docs004.idr < input
33rm *.ibc
test/dsl001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test001.idr -o test001
2+${IDRIS:-idris} $@ test001.idr -o test001
33./test001
44rm -f test001 test001.ibc
test/dsl002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test014.idr -o test014
2+${IDRIS:-idris} $@ test014.idr -o test014
33./test014
44rm -f test014 Resimp.ibc test014.ibc
test/dsl003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --check DSLPi.idr -e test1 -e test2
2+${IDRIS:-idris} $@ --nocolour --check DSLPi.idr -e test1 -e test2
33rm -f *.ibc
test/dsl004/run+3−3
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ Door0.idr --check
3−idris $@ Door1.idr --check
4−idris $@ Door2.idr --check
2+${IDRIS:-idris} $@ Door0.idr --check
3+${IDRIS:-idris} $@ Door1.idr --check
4+${IDRIS:-idris} $@ Door2.idr --check
55rm -f *.ibc
test/effects001/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris -p effects $@ test021.idr -o test021
3−idris -p effects $@ test021a.idr -o test021a
2+${IDRIS:-idris} -p effects $@ test021.idr -o test021
3+${IDRIS:-idris} -p effects $@ test021a.idr -o test021a
44./test021
55./test021a
66rm -f test021 test021a *.ibc
test/effects002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris -p effects $@ test025.idr -o test025
2+${IDRIS:-idris} -p effects $@ test025.idr -o test025
33./test025
44rm -f test025 *.ibc
test/effects003/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ hangman.idr --consolewidth 80 --nocolour -p effects -o hangman
2+${IDRIS:-idris} $@ hangman.idr --consolewidth 80 --nocolour -p effects -o hangman
33./hangman < input
44rm -f hangman *.ibc
test/effects004/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ effects004.idr -o effects004 -p effects
2+${IDRIS:-idris} $@ effects004.idr -o effects004 -p effects
33./effects004 < input
44rm -f effects004 *.ibc
test/effects005/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris $@ defaultLogger.idr -o default -p effects
2+${IDRIS:-idris} $@ defaultLogger.idr -o default -p effects
33./default
4−idris $@ categoryLogger.idr -o category -p effects
4+${IDRIS:-idris} $@ categoryLogger.idr -o category -p effects
55./category
66rm -f default category *.ibc
test/error001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ test002.idr --check --noprelude --consolewidth 70
2+${IDRIS:-idris} $@ test002.idr --check --noprelude --consolewidth 70
33rm -f *.ibc
test/error002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test031.idr -o test031
2+${IDRIS:-idris} $@ test031.idr -o test031
33./test031
44rm -f test031 *.ibc
test/error003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ ErrorReflection.idr --nocolour --check
2+${IDRIS:-idris} --consolewidth 80 $@ ErrorReflection.idr --nocolour --check
33rm -f *.ibc
test/error004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ FunErrTest.idr --nocolour --check
2+${IDRIS:-idris} --consolewidth 80 $@ FunErrTest.idr --nocolour --check
33rm -f *.ibc
test/error005/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ --check --nocolour error005.idr
2+${IDRIS:-idris} --consolewidth 80 $@ --check --nocolour error005.idr
33rm -f *.ibc
test/error006/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ --check --nocolour WithPatsNoWith.idr
2+${IDRIS:-idris} --consolewidth 80 $@ --check --nocolour WithPatsNoWith.idr
33rm -f *.ibc
test/ffi001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet --nocolour test022.idr --exec main
2+${IDRIS:-idris} --quiet --nocolour test022.idr --exec main
33rm -f *.ibc
test/ffi002/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 --quiet test023.idr -o test023
2+${IDRIS:-idris} --consolewidth 80 --quiet test023.idr -o test023
33rm -f test023 *.ibc
test/ffi003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet --nocolour test024.idr --exec main < input
2+${IDRIS:-idris} --quiet --nocolour test024.idr --exec main < input
33rm -f *.ibc
test/ffi004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet --nocolour --check test026.idr
2+${IDRIS:-idris} --quiet --nocolour --check test026.idr
33rm -f *.ibc
test/ffi005/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22
3−idris $@ Postulate.idr -o postulate
3+${IDRIS:-idris} $@ Postulate.idr -o postulate
44./postulate
55rm -f postulate *.ibc
test/ffi006/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ ffi006.idr --interface -o ffi006.o
2+${IDRIS:-idris} $@ ffi006.idr --interface -o ffi006.o
33${CC:=cc} ffi006.c ffi006.o `idris --include` `idris --link` -o ffi006
44./ffi006
55rm -f ffi006 *.ibc *.o *.h
test/folding001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ folding001.idr -o folding001
2+${IDRIS:-idris} $@ folding001.idr -o folding001
33./folding001
44rm -f folding001 *.ibc
test/idrisdoc001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
22# Tests that no documentation is built for empty and/or private-only namespaces
3−idris --mkdoc test_empty.ipkg
3+${IDRIS:-idris} --mkdoc test_empty.ipkg
44rm -rf *.ibc *_doc
test/idrisdoc002/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22# Tests that documentation is generated for functions
3−idris --mkdoc test_functions.ipkg
3+${IDRIS:-idris} --mkdoc test_functions.ipkg
44[ -d test_functions_doc ] && echo "Functions are documented"
55rm -rf *.ibc *_doc
test/idrisdoc003/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22# Tests that documentation is generated for data types
3−idris --mkdoc test_datatypes.ipkg
3+${IDRIS:-idris} --mkdoc test_datatypes.ipkg
44[ -d test_datatypes_doc ] && echo "Data types are documented"
55rm -rf *.ibc *_doc
test/idrisdoc004/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22# Tests that documentation is generated for typeclasses
3−idris --mkdoc test_typeclasses.ipkg
3+${IDRIS:-idris} --mkdoc test_typeclasses.ipkg
44[ -d test_typeclasses_doc ] && echo "Typeclasses are documented"
55rm -rf *.ibc *_doc
test/idrisdoc005/run+1−1
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22# Tests that references to other namespaces are traced
3−idris --mkdoc test_tracing.ipkg
3+${IDRIS:-idris} --mkdoc test_tracing.ipkg
44[ -f test_tracing_doc/docs/TestTracing.html ] && echo "TestTracing: Check"
55[ -f test_tracing_doc/docs/Prelude.Bool.html ] && echo "Prelude.Bool: Check"
66rm -rf *.ibc *_doc
test/idrisdoc006/run+2−2
@@ -1,8 +1,8 @@
11#!/usr/bin/env bash
22# Tests that documentation properly is merged with existent.
3−idris --mkdoc package_a.ipkg
3+${IDRIS:-idris} --mkdoc package_a.ipkg
44[ -f test_merge_doc/IdrisDoc ] && echo "IdrisDoc file written"
5−idris --mkdoc package_b.ipkg
5+${IDRIS:-idris} --mkdoc package_b.ipkg
66ls -1p test_merge_doc/docs
77if grep -q "href\\=\"docs/A.fully.Qualified.NAME\\.html\"" test_merge_doc/index.html; then
88 echo A.fully.Qualified.NAME is in the index
test/idrisdoc007/run+1−1
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22# Tests that documentation only is written when safe
33mkdir do_not_delete_doc
4−idris --mkdoc package.ipkg > nowhere
4+${IDRIS:-idris} --mkdoc package.ipkg > nowhere
55echo Exit status \(expects 1\): $?
66rm -rf do_not_delete_doc *.ibc nowhere
test/idrisdoc008/run+1−1
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22# Tests that documentation is generated for both public and abstract members.
3−idris --mkdoc visibility.ipkg
3+${IDRIS:-idris} --mkdoc visibility.ipkg
44[ -f visibility_doc/docs/Abstract.html ] && echo "Abstract members are documented"
55[ -f visibility_doc/docs/Visible.html ] && echo "Public members are documented"
66rm -rf *.ibc *_doc
test/idrisdoc009/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --quiet Test.idr < input
2+${IDRIS:-idris} $@ --nocolour --quiet Test.idr < input
33rm -f *.ibc
test/interactive001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet test032.idr < input
2+${IDRIS:-idris} --quiet test032.idr < input
33rm -f *.ibc
test/interactive002/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet interactive002.idr < input
2+${IDRIS:-idris} --quiet interactive002.idr < input
33rm -f *.ibc
test/interactive003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet interactive003.idr < input
2+${IDRIS:-idris} --quiet interactive003.idr < input
33rm -f *.ibc
test/interactive004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet interactive004.idr < input
2+${IDRIS:-idris} --quiet interactive004.idr < input
33rm -f *.ibc
test/interactive005/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --nocolour --quiet interactive005.idr --consolewidth 70 < input
2+${IDRIS:-idris} --nocolour --quiet interactive005.idr --consolewidth 70 < input
33rm -f *.ibc
44rm -f hello.bytecode
55rm -f hello
test/interactive006/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet --port 5000 interactive006.idr < input
2+${IDRIS:-idris} --quiet --port 5000 interactive006.idr < input
33rm -f *.ibc
test/interactive007/run+1−1
@@ -1,2 +1,2 @@
11#!/usr/bin/env bash
2−idris -p contrib --nobanner --nocolor < input
2+${IDRIS:-idris} -p contrib --nobanner --nocolor < input
test/interactive008/run+1−1
@@ -1,2 +1,2 @@
11#!/usr/bin/env bash
2−idris --nobanner --nocolor < input
2+${IDRIS:-idris} --nobanner --nocolor < input
test/interactive009/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet interactive009.idr < input
2+${IDRIS:-idris} --quiet interactive009.idr < input
33rm -f *.ibc
test/interactive010/run+1−1
@@ -1,2 +1,2 @@
11#!/usr/bin/env bash
2−idris --quiet --nobanner --nocolor --consolewidth 80 < input
2+${IDRIS:-idris} --quiet --nobanner --nocolor --consolewidth 80 < input
test/interactive011/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --quiet interactive011.idr < input
2+${IDRIS:-idris} --quiet interactive011.idr < input
33rm -f *.ibc
test/interactive012/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 70 --quiet interactive012.idr < input
2+${IDRIS:-idris} --nocolour --consolewidth 70 --quiet interactive012.idr < input
33rm -f *.ibc
test/io001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test004.idr -o test004
2+${IDRIS:-idris} $@ test004.idr -o test004
33./test004
44rm -f test004 test004.ibc testfile
test/io002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test008.idr -o test008
2+${IDRIS:-idris} $@ test008.idr -o test008
33./test008
44rm -f test008 test008.ibc
test/io003/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris $@ test018.idr -p contrib -o test018
3−idris $@ test018a.idr -p contrib -o test018a
2+${IDRIS:-idris} $@ test018.idr -p contrib -o test018
3+${IDRIS:-idris} $@ test018a.idr -p contrib -o test018a
44./test018
55#./test018a
66rm -f test018 test018a *.ibc
test/literate001/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ test003a.lidr --check
3−idris --consolewidth 80 $@ test003.lidr -o test003
2+${IDRIS:-idris} --consolewidth 80 $@ test003a.lidr --check
3+${IDRIS:-idris} --consolewidth 80 $@ test003.lidr -o test003
44./test003
55rm -f test003 test003.ibc Lit.ibc
test/meta001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check --nocolour --consolewidth 70 Finite.idr
2+${IDRIS:-idris} $@ --check --nocolour --consolewidth 70 Finite.idr
33rm -f *.ibc
test/meta002/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris $@ -p pruviloj --nocolour --check --consolewidth 70 Tacs.idr
3−idris $@ -p pruviloj --nocolour --check --consolewidth 70 AgdaStyleReflection.idr
2+${IDRIS:-idris} $@ -p pruviloj --nocolour --check --consolewidth 70 Tacs.idr
3+${IDRIS:-idris} $@ -p pruviloj --nocolour --check --consolewidth 70 AgdaStyleReflection.idr
44# Disabled due to excess memory consumption
55# idris $@ -p pruviloj --nocolour --check --consolewidth 70 Deriving.idr
66rm -f *.ibc
test/meta003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --check --consolewidth 70 BadDef.idr
2+${IDRIS:-idris} $@ --nocolour --check --consolewidth 70 BadDef.idr
33rm -f *.ibc
test/meta004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ -p pruviloj --nocolour --check --consolewidth 70 meta004.idr
2+${IDRIS:-idris} $@ -p pruviloj --nocolour --check --consolewidth 70 meta004.idr
33rm -f *.ibc
test/pkg001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --build test.ipkg
2+${IDRIS:-idris} $@ --build test.ipkg
33rm -f *.ibc
test/pkg002/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22### Test: IPKG executable names can be any namespaced identifier.
3−idris $@ --build test.ipkg
3+${IDRIS:-idris} $@ --build test.ipkg
44rm -f *.ibc
55rm -f some.namespaced.identifier
test/pkg003/run+1−1
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22### Test: IPKG executable names can be a quoted string
33### containing a valid filename.
4−idris $@ --build test.ipkg
4+${IDRIS:-idris} $@ --build test.ipkg
55rm -f *.ibc
66rm -f 'quoting-allows-hyphens and spaces and fun stuff!'
test/pkg004/run+1−1
@@ -2,5 +2,5 @@
22### Test: IPKG executable names CANNOT include a directory separator.
33# TODO: Verify that a name like "a/b\c" is rejected by both *NIX and Windows
44# (assuming these tests get run on Windows).
5−idris $@ --build test.ipkg
5+${IDRIS:-idris} $@ --build test.ipkg
66rm -f *.ibc
test/primitives001/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris $@ test005.idr -o test005
2+${IDRIS:-idris} $@ test005.idr -o test005
33./test005
4−idris $@ substring.idr -o substring
4+${IDRIS:-idris} $@ substring.idr -o substring
55./substring < input
66rm -f test005 substring *.ibc
test/primitives003/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ -o test038 test038.idr --nocolour
2+${IDRIS:-idris} $@ -o test038 test038.idr --nocolour
33./test038
44rm -f test038 *.ibc
55
test/primitives004-disabled/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ -o primitives004 primitives004.idr --nocolour
2+${IDRIS:-idris} $@ -o primitives004 primitives004.idr --nocolour
33./primitives004
44rm -f primitives004 *.ibc
test/proof001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ test029.idr --consolewidth 80 --nocolour --check test029
2+${IDRIS:-idris} $@ test029.idr --consolewidth 80 --nocolour --check test029
33rm -f *.ibc
test/proof002/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ test030.idr --check --nocolour
3−idris --consolewidth 80 $@ test030a.idr --check --nocolour
2+${IDRIS:-idris} --consolewidth 80 $@ test030.idr --check --nocolour
3+${IDRIS:-idris} --consolewidth 80 $@ test030a.idr --check --nocolour
44rm -f *.ibc
test/proof003/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test015.idr --nocolour --consolewidth 80 -o test015
2+${IDRIS:-idris} $@ test015.idr --nocolour --consolewidth 80 -o test015
33./test015
44rm -f test015 Parity.ibc test015.ibc
test/proof004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check $@ test035.idr
2+${IDRIS:-idris} --check $@ test035.idr
33rm -f *.ibc
test/proof005/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check $@ DefaultArgSubstitutionSuccess.idr
2+${IDRIS:-idris} --check $@ DefaultArgSubstitutionSuccess.idr
33rm -f *.ibc
test/proof006/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check $@ DefaultArgSubstitutionSyntax.idr
2+${IDRIS:-idris} --check $@ DefaultArgSubstitutionSyntax.idr
33rm -f *.ibc
test/proof007/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 --check $@ DefaultArgUnknownName.idr
2+${IDRIS:-idris} --nocolour --consolewidth 80 --check $@ DefaultArgUnknownName.idr
33rm -f *.ibc
test/proof008/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 --check $@ ClaimAndUnfocus.idr
2+${IDRIS:-idris} --nocolour --consolewidth 80 --check $@ ClaimAndUnfocus.idr
33rm -f *.ibc
test/proof009/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --consolewidth 70 --quiet proof009.idr < input
2+${IDRIS:-idris} $@ --consolewidth 70 --quiet proof009.idr < input
33rm -f *.ibc
test/proof010/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ proof010.idr -o proof010
2+${IDRIS:-idris} $@ proof010.idr -o proof010
33./proof010
44rm -f proof010 *.ibc
test/proofsearch001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check proofsearch001.idr
2+${IDRIS:-idris} $@ --check proofsearch001.idr
33rm -f *.ibc
test/proofsearch002/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check proofsearch002.idr
2+${IDRIS:-idris} $@ --check proofsearch002.idr
33rm -f *.ibc
test/proofsearch003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check proofsearch003.idr
2+${IDRIS:-idris} --check proofsearch003.idr
33rm -f *.ibc
test/pruviloj001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ -p pruviloj --check --nocolour --consolewidth 70 pruviloj001.idr
2+${IDRIS:-idris} $@ -p pruviloj --check --nocolour --consolewidth 70 pruviloj001.idr
33rm -f *.ibc
test/quasiquote001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ QuasiquoteBasics.idr -o quasiquote001
2+${IDRIS:-idris} $@ QuasiquoteBasics.idr -o quasiquote001
33./quasiquote001
44rm -f quasiquote001 *.ibc
test/quasiquote002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ GoalQQuote.idr -o quasiquote002
2+${IDRIS:-idris} $@ GoalQQuote.idr -o quasiquote002
33./quasiquote002
44rm -f quasiquote002 *.ibc
test/quasiquote003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ --check NoInfer.idr
2+${IDRIS:-idris} --consolewidth 80 $@ --check NoInfer.idr
33rm -f *.ibc
test/quasiquote004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ --check --nocolour Quasiquote004.idr
2+${IDRIS:-idris} --consolewidth 80 $@ --check --nocolour Quasiquote004.idr
33rm -f *.ibc
test/quasiquote005/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check --nocolour Quasiquote005.idr
2+${IDRIS:-idris} $@ --check --nocolour Quasiquote005.idr
33rm -f *.ibc
test/quasiquote006/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check --nocolour --quiet --consolewidth 70 quasiquote006.idr
2+${IDRIS:-idris} $@ --check --nocolour --quiet --consolewidth 70 quasiquote006.idr
33rm -f *.ibc
test/records001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test011.idr -o test011
2+${IDRIS:-idris} $@ test011.idr -o test011
33./test011
44rm -f test011 test011.ibc
test/records002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ record002.idr -o record002
2+${IDRIS:-idris} $@ record002.idr -o record002
33./record002
44rm -f record002 *.ibc
test/records003/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ records003.idr -o records003
2+${IDRIS:-idris} $@ records003.idr -o records003
33./records003
44rm -f records003 *.ibc
test/records004/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ records004.idr -o records004
2+${IDRIS:-idris} $@ records004.idr -o records004
33./records004
44rm -f records004 *.ibc
test/reg001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris reg001.idr --check
2+${IDRIS:-idris} reg001.idr --check
33rm -rf reg001.ibc
44
test/reg002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris reg012.idr -o reg012
2+${IDRIS:-idris} reg012.idr -o reg012
33./reg012
44rm -f reg012 *.ibc
test/reg003/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 --check reg003.idr
3−idris --consolewidth 80 --check reg003a.idr
2+${IDRIS:-idris} --consolewidth 80 --check reg003.idr
3+${IDRIS:-idris} --consolewidth 80 --check reg003a.idr
44rm -f *.ibc
test/reg004/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg004.idr -o reg004
2+${IDRIS:-idris} $@ reg004.idr -o reg004
33./reg004
44rm -f reg004 *.ibc
test/reg006/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ reg006.idr --check
2+${IDRIS:-idris} --consolewidth 80 $@ reg006.idr --check
33rm -f *.ibc
test/reg007/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 --nocolour --check $@ reg007.lidr
2+${IDRIS:-idris} --consolewidth 80 --nocolour --check $@ reg007.lidr
33rm -f *.ibc
test/reg010/run+1−1
@@ -1,2 +1,2 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ reg010.idr --check --nocolour
2+${IDRIS:-idris} --consolewidth 80 $@ reg010.idr --check --nocolour
test/reg013/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg013.idr -o reg013
2+${IDRIS:-idris} $@ reg013.idr -o reg013
33./reg013
44rm -f reg013 *.ibc
test/reg016/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg016.idr -o reg016
2+${IDRIS:-idris} $@ reg016.idr -o reg016
33./reg016
44rm -f reg016 *.ibc
test/reg017/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --consolewidth 80 reg017.idr -o reg017
2+${IDRIS:-idris} $@ --nocolour --consolewidth 80 reg017.idr -o reg017
33./reg017
44rm -f reg017 *.ibc
test/reg018/run+4−4
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ reg018a.idr --check
3−idris --consolewidth 80 $@ reg018b.idr --check
4−idris --consolewidth 80 $@ reg018c.idr --check
5−idris --consolewidth 80 $@ reg018d.idr --check
2+${IDRIS:-idris} --consolewidth 80 $@ reg018a.idr --check
3+${IDRIS:-idris} --consolewidth 80 $@ reg018b.idr --check
4+${IDRIS:-idris} --consolewidth 80 $@ reg018c.idr --check
5+${IDRIS:-idris} --consolewidth 80 $@ reg018d.idr --check
66rm *.ibc
test/reg020/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg020.idr -o reg020
2+${IDRIS:-idris} $@ reg020.idr -o reg020
33./reg020
44rm -f reg020 *.ibc
test/reg023/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ reg023.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ reg023.idr --check
33rm -f *.ibc
test/reg024/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg024.idr -o reg024
2+${IDRIS:-idris} $@ reg024.idr -o reg024
33./reg024
44rm -f reg024 *.ibc
test/reg025/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg025.idr -o reg025
2+${IDRIS:-idris} $@ reg025.idr -o reg025
33./reg025
44rm -f reg025 *.ibc
test/reg027/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ reg027.idr -o reg027
2+${IDRIS:-idris} --consolewidth 80 $@ reg027.idr -o reg027
33./reg027
4−idris --consolewidth 80 $@ reg027a.idr --check
4+${IDRIS:-idris} --consolewidth 80 $@ reg027a.idr --check
55rm -f reg027 *.ibc
test/reg028/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ reg028.idr --check
3−idris --consolewidth 80 $@ reg028a.idr --check
2+${IDRIS:-idris} --consolewidth 80 $@ reg028.idr --check
3+${IDRIS:-idris} --consolewidth 80 $@ reg028a.idr --check
44rm -f *.ibc
test/reg029/run+2−2
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22
3−idris $@ reg029.idr -o reg029
3+${IDRIS:-idris} $@ reg029.idr -o reg029
44unset IDRIS_REG029_NONEXISTENT_VAR
55export IDRIS_REG029_EXISTENT_VAR='exists!'
66
@@ -12,6 +12,6 @@ else
1212 javac -cp reg029:. Reg029Wrapper.java
1313 java -cp reg029:. Reg029Wrapper
1414fi
15−idris $@ reg029.idr --execute
15+${IDRIS:-idris} $@ reg029.idr --execute
1616rm -f reg029 *.ibc *.class
1717
test/reg031/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg031.idr -o reg031
2+${IDRIS:-idris} $@ reg031.idr -o reg031
33./reg031
44rm -f *.ibc reg031
test/reg032/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test028.idr -o test028
2+${IDRIS:-idris} $@ test028.idr -o test028
33./test028
44rm -f test028 test028.ibc
test/reg034/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 --check reg034.idr
2+${IDRIS:-idris} --nocolour --consolewidth 80 --check reg034.idr
33rm -f reg034 *.ibc
test/reg035/run+3−3
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 --check reg035.idr
3−idris --nocolour --consolewidth 80 --check reg035a.lidr
4−idris --nocolour --consolewidth 80 --check reg035b.idr
2+${IDRIS:-idris} --nocolour --consolewidth 80 --check reg035.idr
3+${IDRIS:-idris} --nocolour --consolewidth 80 --check reg035a.lidr
4+${IDRIS:-idris} --nocolour --consolewidth 80 --check reg035b.idr
55rm -f *.ibc
test/reg036/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check reg036.idr
2+${IDRIS:-idris} --check reg036.idr
33rm -f reg036 *.ibc
test/reg037/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check reg037.idr
2+${IDRIS:-idris} --check reg037.idr
33rm -f reg037 *.ibc
test/reg038/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check reg038.idr
2+${IDRIS:-idris} --check reg038.idr
33rm -f *.ibc
test/reg040/run+1−1
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
22
3−idris --warnreach reg040.idr -o reg040
3+${IDRIS:-idris} --warnreach reg040.idr -o reg040
44./reg040
55
66rm -f reg040 *.ibc
test/reg041/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ --quiet ott.idr -e example
3−idris $@ showu.idr -o reg040
2+${IDRIS:-idris} $@ --quiet ott.idr -e example
3+${IDRIS:-idris} $@ showu.idr -o reg040
44./reg040
55rm -f reg040 *.ibc
test/reg042/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg042 -o reg042 --warnreach
2+${IDRIS:-idris} $@ reg042 -o reg042 --warnreach
33./reg042
44rm -f reg042 *.ibc
test/reg044/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 reg044.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 reg044.idr --check
33rm -f *.ibc
test/reg045/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg045.idr -o reg045
2+${IDRIS:-idris} $@ reg045.idr -o reg045
33./reg045
44rm -f reg045 *.ibc
test/reg046/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg046.idr --check
2+${IDRIS:-idris} $@ reg046.idr --check
33rm -f reg046 *.ibc
test/reg047/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg047.idr --check --nobuiltins
3−idris $@ reg047a.idr --check
2+${IDRIS:-idris} $@ reg047.idr --check --nobuiltins
3+${IDRIS:-idris} $@ reg047a.idr --check
44rm -f *.ibc
test/reg048/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg048.idr -p contrib -o reg048
2+${IDRIS:-idris} $@ reg048.idr -p contrib -o reg048
33./reg048
44rm -f reg048 *.ibc
test/reg049/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 --nocolour --check $@ reg049.idr
2+${IDRIS:-idris} --consolewidth 80 --nocolour --check $@ reg049.idr
33rm -f *.ibc
test/reg050/run+3−3
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --nocolour --check $@ working.idr
3−idris --nocolour --check $@ badbangop.idr
4−idris --nocolour --check $@ baddoublebang.idr
2+${IDRIS:-idris} --nocolour --check $@ working.idr
3+${IDRIS:-idris} --nocolour --check $@ badbangop.idr
4+${IDRIS:-idris} --nocolour --check $@ baddoublebang.idr
55rm -f *.ibc
test/reg051-disabled/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg051.idr --check
2+${IDRIS:-idris} $@ reg051.idr --check
33rm -f *.ibc
test/reg052/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ -o reg052 reg052.idr
2+${IDRIS:-idris} $@ -o reg052 reg052.idr
33./reg052
44rm -f reg052 *.ibc
test/reg053/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check four.idr
2+${IDRIS:-idris} $@ --check four.idr
33rm -f *.ibc
test/reg054/run+1−1
@@ -1,2 +1,2 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ reg054.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ reg054.idr --check
test/reg055/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ reg055.idr --check
3−idris --nocolour --consolewidth 80 $@ reg055a.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ reg055.idr --check
3+${IDRIS:-idris} --nocolour --consolewidth 80 $@ reg055a.idr --check
44rm -f *.ibc
55
test/reg056/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ reg056.idr -o reg056
2+${IDRIS:-idris} --consolewidth 80 $@ reg056.idr -o reg056
33rm -f *.ibc
test/reg057/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg057.idr --check
2+${IDRIS:-idris} $@ reg057.idr --check
33rm -f *.ibc
test/reg058/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ implicits.idr --check
3−idris $@ implicits2.idr --check
2+${IDRIS:-idris} $@ implicits.idr --check
3+${IDRIS:-idris} $@ implicits2.idr --check
44
55rm -f *.ibc
test/reg059/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg059.idr --check
2+${IDRIS:-idris} $@ reg059.idr --check
33rm -f *.ibc
test/reg060/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg060.idr --check
2+${IDRIS:-idris} $@ reg060.idr --check
33rm -f *.ibc
test/reg061/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ Capture.idr --check
2+${IDRIS:-idris} $@ Capture.idr --check
33rm -f *.ibc
test/reg062/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ reg062.idr --check --nocolour
3−idris $@ reg062.lidr --check --nocolour
2+${IDRIS:-idris} $@ reg062.idr --check --nocolour
3+${IDRIS:-idris} $@ reg062.lidr --check --nocolour
44rm -f *.ibc
test/reg063/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ Cmp.idr --check --nocolour --quiet
2+${IDRIS:-idris} $@ Cmp.idr --check --nocolour --quiet
33rm *.ibc
test/reg064/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg064.idr --check
2+${IDRIS:-idris} $@ reg064.idr --check
33rm -f *.ibc
test/reg065/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg065.idr --check
2+${IDRIS:-idris} $@ reg065.idr --check
33rm -f *.ibc
test/reg066/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ reg066.idr --check --nocolor
2+${IDRIS:-idris} $@ reg066.idr --check --nocolor
33rm -f *.ibc
test/reg067/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22rm -f *.ibc reg067
3−idris $@ reg067.idr -o reg067 --warnreach
3+${IDRIS:-idris} $@ reg067.idr -o reg067 --warnreach
44./reg067
55rm -f *.ibc reg067
test/runtest.pl+17−16
@@ -9,39 +9,35 @@ my $exitstatus = 0;
99my @idrOpts = ();
1010
1111
12−# Determines how idris was built locally, returning a PATH modifier.
12+# Sets the PATH if there's a sandbox or stack present
1313#
1414# Order of checking is:
1515#
1616# 1. Cabal Sandboxing
1717# 2. Stack
18−# 3. Pure cabal.
1918#
20−sub sandbox_path {
19+sub set_path {
2120 my ($test_dir,) = @_;
22− my $sandbox = "$test_dir/../../.cabal-sandbox/bin";
21+ my $sandbox = "../.cabal-sandbox/bin";
2322
2423 my $stack_bin_path = `stack path --dist-dir`;
2524 $stack_bin_path =~ s/\n//g;
26− my $stack_work_dir = "$test_dir/../../$stack_bin_path/build/idris";
25+ my $stack_work_dir = "../$stack_bin_path/build/idris";
26+ my $path = $ENV{PATH};
2727
2828 if ( -d $sandbox ) {
29−
3029 my $sandbox_abs = abs_path($sandbox);
3130 print "Using Cabal Sandbox\n";
3231 printf("Sandbox located at: %s\n", $sandbox_abs);
33− return "PATH=\"$sandbox_abs:$PATH\"";
32+ $ENV{PATH} = $sandbox_abs . ":" . $path;
3433
3534 } elsif ( -d $stack_work_dir ) {
3635
3736 my $stack_work_abs = abs_path($stack_work_dir);
3837 print "Using Stack Work\n";
3938 printf("Stack work located at: %s\n", $stack_work_abs);
40− return "PATH=\"$stack_work_abs:$PATH\"";
39+ $ENV{PATH} = $stack_work_abs . ":" . $path;
4140
42− } else {
43− print "Using Default Cabal.\n";
44− return "";
4541 }
4642}
4743
@@ -51,13 +47,12 @@ sub sandbox_path {
5147sub runtest {
5248 my ($test, $update, $showTime) = @_;
5349
54− my $sandbox = sandbox_path($test);
5550
5651 chdir($test);
5752
5853 my $startTime = time();
5954 print "Running $test...\n";
60− my $got = `$sandbox ./run @idrOpts`;
55+ my $got = `./run @idrOpts`;
6156 my $exp = `cat expected`;
6257
6358 my $endTime = time();
@@ -177,9 +172,15 @@ while (my $opt = shift @opts) {
177172 else { push(@idrOpts, $opt); }
178173}
179174
180−my $idris = $ENV{IDRIS};
181−my $path = $ENV{PATH};
182−$ENV{PATH} = cwd() . "/" . $idris . ":" . $path;
175+my $idris = $ENV{IDRIS};
176+
177+if (defined $ENV{IDRIS} && -e $idris ) {
178+ $ENV{IDRIS} = abs_path($idris);
179+ print "Using $idris\n";
180+} else {
181+ delete $ENV{IDRIS};
182+ set_path();
183+}
183184
184185my $startTime = time();
185186
test/sourceLocation001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --consolewidth 80 SourceLoc.idr -o sourceLocation001
2+${IDRIS:-idris} $@ --nocolour --consolewidth 80 SourceLoc.idr -o sourceLocation001
33./sourceLocation001
44rm -f sourceLocation001 *.ibc
test/sugar001/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test007.idr -o test007
2+${IDRIS:-idris} $@ test007.idr -o test007
33./test007
44rm -f test007 test007.ibc
test/sugar002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test009.idr -o test009
2+${IDRIS:-idris} $@ test009.idr -o test009
33./test009
44rm -f test009 test009.ibc
test/sugar003/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ test013.idr -o test013
2+${IDRIS:-idris} $@ test013.idr -o test013
33./test013
44rm -f test013 test013.ibc
test/sugar004/run+1−1
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ sugar004.idr -o sugar004
2+${IDRIS:-idris} $@ sugar004.idr -o sugar004
33./sugar004
44./sugar004 42
55./sugar004 42 100
test/sugar005/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ As.idr -o sugar005
2+${IDRIS:-idris} $@ As.idr -o sugar005
33./sugar005
44rm -f sugar005 *.ibc
test/syntax001/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ Syntax.idr --nocolour --consolewidth 80 --check
3−idris $@ SyntaxTest.idr --nocolour --consolewidth 80 --check
2+${IDRIS:-idris} $@ Syntax.idr --nocolour --consolewidth 80 --check
3+${IDRIS:-idris} $@ SyntaxTest.idr --nocolour --consolewidth 80 --check
44rm -f *.ibc
test/syntax002/run+1−1
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris $@ syntax002.idr -o syntax002
2+${IDRIS:-idris} $@ syntax002.idr -o syntax002
33./syntax002
44rm -f syntax002 *.ibc
test/tactics001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --check Tactics.idr
2+${IDRIS:-idris} $@ --check Tactics.idr
33rm -f *.ibc
test/totality001/run+3−3
@@ -1,6 +1,6 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ --check test010.idr
3−idris --consolewidth 80 $@ --check test010a.idr
4−idris --consolewidth 80 $@ --check test010b.idr
2+${IDRIS:-idris} --consolewidth 80 $@ --check test010.idr
3+${IDRIS:-idris} --consolewidth 80 $@ --check test010a.idr
4+${IDRIS:-idris} --consolewidth 80 $@ --check test010b.idr
55
66rm -f *.ibc
test/totality002/run+3−3
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ --check test017.idr
3−idris --consolewidth 80 $@ --check test017a.idr
4−idris --consolewidth 80 $@ --check test017b.idr
2+${IDRIS:-idris} --consolewidth 80 $@ --check test017.idr
3+${IDRIS:-idris} --consolewidth 80 $@ --check test017a.idr
4+${IDRIS:-idris} --consolewidth 80 $@ --check test017b.idr
55rm -f *.ibc
test/totality003/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ totality003.idr --check
3−idris --nocolour --consolewidth 80 $@ totality003a.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ totality003.idr --check
3+${IDRIS:-idris} --nocolour --consolewidth 80 $@ totality003a.idr --check
44rm -f *.ibc
test/totality004/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ totality004.idr -o totality004
2+${IDRIS:-idris} --consolewidth 80 $@ totality004.idr -o totality004
33./totality004
4−idris --consolewidth 80 $@ --check totality004a.idr
4+${IDRIS:-idris} --consolewidth 80 $@ --check totality004a.idr
55rm -f totality004 *.ibc
test/totality005/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris $@ totality005.idr --total --check
3−idris $@ totality005.idr -o totality005
2+${IDRIS:-idris} $@ totality005.idr --total --check
3+${IDRIS:-idris} $@ totality005.idr -o totality005
44./totality005
55rm -f totality005 *.ibc
test/totality006/run+3−3
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ totality006.idr --check
3−idris --consolewidth 80 $@ totality006a.idr --check
4−idris --consolewidth 80 $@ totality006b.idr --check
2+${IDRIS:-idris} --consolewidth 80 $@ totality006.idr --check
3+${IDRIS:-idris} --consolewidth 80 $@ totality006a.idr --check
4+${IDRIS:-idris} --consolewidth 80 $@ totality006b.idr --check
55rm -f *.ibc
test/totality007/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --build totality.ipkg
2+${IDRIS:-idris} $@ --build totality.ipkg
33rm -f src/*.ibc
test/totality008/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --consolewidth 80 $@ totality008.idr --check
2+${IDRIS:-idris} --consolewidth 80 $@ totality008.idr --check
33rm -f *.ibc
test/totality009/run+2−2
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
22OPTS="--consolewidth infinite --nocolour"
3−idris "$@" $OPTS --check TestLambdaImpossible
4−idris "$@" $OPTS --check --warnpartial TestLambdaPossible
3+${IDRIS:-idris} "$@" $OPTS --check TestLambdaImpossible
4+${IDRIS:-idris} "$@" $OPTS --check --warnpartial TestLambdaPossible
55rm -f *.ibc
test/totality010/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ totality010.idr --nocolour --consolewidth 80 --check
2+${IDRIS:-idris} $@ totality010.idr --nocolour --consolewidth 80 --check
33rm -f *.ibc
test/tutorial001/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --check tutorial001.idr
2+${IDRIS:-idris} --check tutorial001.idr
33rm -f *.ibc
test/tutorial002/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ --nocolour --consolewidth 80 tutorial002.idr --check
2+${IDRIS:-idris} $@ --nocolour --consolewidth 80 tutorial002.idr --check
33rm -f *.ibc
test/tutorial003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ tutorial003.idr --check
2+${IDRIS:-idris} $@ tutorial003.idr --check
33rm -f *.ibc
test/tutorial004/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ tutorial004.idr --check --nocolour --consolewidth 80
2+${IDRIS:-idris} $@ tutorial004.idr --check --nocolour --consolewidth 80
33rm -f *.ibc
test/tutorial005/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris $@ tutorial005.idr --check
2+${IDRIS:-idris} $@ tutorial005.idr --check
33rm -f *.ibc
test/tutorial006/run+3−3
@@ -1,5 +1,5 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ tutorial006a.idr --check
3−idris --nocolour --consolewidth 80 $@ tutorial006b.idr --check
4−idris --nocolour --consolewidth 80 $@ tutorial006c.idr -p effects --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ tutorial006a.idr --check
3+${IDRIS:-idris} --nocolour --consolewidth 80 $@ tutorial006b.idr --check
4+${IDRIS:-idris} --nocolour --consolewidth 80 $@ tutorial006c.idr -p effects --check
55rm -f *.ibc
test/unique001/run+6−6
@@ -1,9 +1,9 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ unique001.idr -o unique001
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique001.idr -o unique001
33./unique001
4−idris --nocolour --consolewidth 80 $@ unique001a.idr --check
5−idris --nocolour --consolewidth 80 $@ unique001b.idr --check
6−idris --nocolour --consolewidth 80 $@ unique001c.idr --check
7−idris --nocolour --consolewidth 80 $@ unique001d.idr --check
8−idris --nocolour --consolewidth 80 $@ unique001e.idr --check
4+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique001a.idr --check
5+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique001b.idr --check
6+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique001c.idr --check
7+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique001d.idr --check
8+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique001e.idr --check
99rm -f unique001 *.ibc
test/unique002/run+2−2
@@ -1,4 +1,4 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ unique002.idr --check
3−idris --nocolour --consolewidth 80 $@ unique002a.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique002.idr --check
3+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique002a.idr --check
44rm -f *.ibc
test/unique003/run+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
2−idris --nocolour --consolewidth 80 $@ unique003.idr --check
2+${IDRIS:-idris} --nocolour --consolewidth 80 $@ unique003.idr --check
33rm -f *.ibc