On Fri Feb 20 00:36:36 2009, alli...@perl.org wrote:
>
> - There's still a problem with the installed test libraries. I'll look
> into it and provide an additional patch.
Ah, it wasn't a problem with the test libraries, just with Rakudo's
t/harness (using a hardcoded path to the parrot executable). Attached
git patch to fix the test target.
Allison
>From 90672654a8f2600dbc8b67f4f46286d1ed2b7279 Mon Sep 17 00:00:00 2001
From: Allison Randal <alli...@parrot.org>
Date: Mon, 23 Feb 2009 18:03:30 -0800
Subject: [PATCH] Also fix t/harness to use installed Parrot executable when requested, instead of looking for the executable in a 'parrot/' subdirectory.
---
build/Makefile.in | 4 ++--
t/harness | 16 ++++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/build/Makefile.in b/build/Makefile.in
index 3244ff0..9c88b2e 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -149,7 +149,7 @@ CLEANUPS = \
# NOTE: eventually, we should remove --keep-exit-code and --fudge
# as the goal is that all tests must pass without fudge
-HARNESS_WITH_FUDGE = $(PERL) t/harness --fudge --keep-exit-code
+HARNESS_WITH_FUDGE = $(PERL) -I$(TOOLS_DIR) t/harness --bindir=$(BIN_DIR) --fudge --keep-exit-code
HARNESS_WITH_FUDGE_JOBS = $(HARNESS_WITH_FUDGE) --jobs
@@ -243,7 +243,7 @@ codetest:
coretest: perl6.pbc
# prove t/pmc
- $(PERL) t/harness t/00-parrot t/01-sanity
+ $(PERL) -I$(TOOLS_DIR) t/harness --bindir=$(BIN_DIR) t/00-parrot t/01-sanity
fulltest: coretest spectest codetest
diff --git a/t/harness b/t/harness
index 48f2aab..26327fe 100644
--- a/t/harness
+++ b/t/harness
@@ -20,21 +20,25 @@ our %harness_args = (
verbosity => 0,
);
-if (-d 'parrot') {
- $harness_args{exec} = ['parrot/parrot', 'perl6.pbc'];
-} else {
- $harness_args{compiler} = 'perl6.pbc';
-}
-
GetOptions(
'tests-from-file=s' => \my $list_file,
'fudge' => \my $do_fudge,
'verbosity=i' => \$harness_args{verbosity},
+ 'bindir=s' => \$harness_args{bindir},
# A sensible default is num_cores + 1.
# Many people have two cores these days.
'jobs:3' => \$harness_args{jobs},
);
+if ($harness_args{bindir}) {
+ $harness_args{exec} = [$harness_args{bindir}.'/parrot', 'perl6.pbc'];
+} elsif (-d 'parrot') {
+ $harness_args{exec} = ['parrot/parrot', 'perl6.pbc'];
+} else {
+ $harness_args{compiler} = 'perl6.pbc';
+}
+
+
my @pass_through_options = grep m/^--?[^-]/, @ARGV;
my @files = grep m/^[^-]/, @ARGV;
--
1.5.6.3
