git.iko.soy/Idris-dev
on master help sign in
Instead of using the installed global idris for tests,
faad05cHannes Mehnert
Makefile+1−1
compare with master
unifiedsplit
@@ -14,7 +14,7 @@ build: dist/setup-config
14 $(CABAL) build $(CABALFLAGS)
14 $(CABAL) build $(CABALFLAGS)
15
15
16test:
16test:
17− make -C test
17+ make -C test IDRIS=../dist/build/idris
18
18
19relib:
19relib:
20 make -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
20 make -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
test/runtest.pl+6
@@ -1,5 +1,7 @@
1#!/usr/bin/perl
1#!/usr/bin/perl
2
2
3+use Cwd;
4+
3my $exitstatus = 0;
5my $exitstatus = 0;
4
6
5sub runtest {
7sub runtest {
@@ -79,6 +81,10 @@ while ($opt=shift(@opts)) {
79 else { push(@idrOpts, $opt); }
81 else { push(@idrOpts, $opt); }
80}
82}
81
83
84+my $idris = $ENV{IDRIS};
85+my $path = $ENV{PATH};
86+$ENV{PATH}=cwd() . "/" . $idris . ":" . $path;
87+
82foreach $test (@tests) {
88foreach $test (@tests) {
83
89
84 if ($diff == 0 && $show == 0) {
90 if ($diff == 0 && $show == 0) {