From faad05cb11804e66fa83b3f7f39dc28f7f603d21 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 10 May 2013 08:58:54 +0200 Subject: [PATCH] Instead of using the installed global idris for tests, pass the PATH to the current compiled one to test and use this --- Makefile | 2 +- test/runtest.pl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d03a947f..06c4cbf73 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build: dist/setup-config $(CABAL) build $(CABALFLAGS) test: - make -C test + make -C test IDRIS=../dist/build/idris relib: make -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean diff --git a/test/runtest.pl b/test/runtest.pl index 5eda464d7..1683719ef 100755 --- a/test/runtest.pl +++ b/test/runtest.pl @@ -1,5 +1,7 @@ #!/usr/bin/perl +use Cwd; + my $exitstatus = 0; sub runtest { @@ -79,6 +81,10 @@ while ($opt=shift(@opts)) { else { push(@idrOpts, $opt); } } +my $idris = $ENV{IDRIS}; +my $path = $ENV{PATH}; +$ENV{PATH}=cwd() . "/" . $idris . ":" . $path; + foreach $test (@tests) { if ($diff == 0 && $show == 0) {