[t] Change PARROT from ENV var to calculated, to fix RT#76680

rakudo · Jul 22, 2010 · ca32e3a · ca32e3a
1 parent 08809ca
commit ca32e3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -408,7 +408,7 @@ test    : coretest
 fulltest: coretest stresstest
 
 coretest: Test.pir $(PERL6_EXE)
-	PARROT=$(PARROT) $(PERL) t/harness t/00-parrot t/01-sanity t/02-embed
+	$(PERL) t/harness t/00-parrot t/01-sanity t/02-embed
 
 # Run the spectests that we know work.
 spectest_regression: spectest

diff --git a/t/02-embed/01-load.t b/t/02-embed/01-load.t
@@ -1,3 +1,5 @@
 use v6;
-my $parrot = %*ENV{'PARROT'};
+my $bindir = $*VM<config><bindir> or die 'No bindir found';
+my $exe    = $*VM<config><exe>    // '';
+my $parrot = "$bindir/parrot$exe";
 run("$parrot t/02-embed/01-load.pir");