Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:rakudo/rakudo
Browse files Browse the repository at this point in the history
  • Loading branch information
pmichaud committed Feb 26, 2009
2 parents f0a9a5d + 1951708 commit 5e410bb
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
15 changes: 9 additions & 6 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ U: Whiteknight

N: Andy Lester
E: andy@petdance.com
W: http://perlbuzz.com/
S: McHenry, IL, USA
U: petdance

U: ask
Expand Down Expand Up @@ -87,7 +89,8 @@ U: cdolan
D: Rakudo patches
E: cdolan@cpan.org

N: Chris Fields (cjfields)
N: Chris Fields
U: cjfields
D: Rakudo patches

N: Christoph Otto a.k.a. cotto
Expand Down Expand Up @@ -140,7 +143,7 @@ E: francois.perrad@gadz.org
W: http://fperrad.googlepages.com/home
U: fperrad

N: Geoff Broadwell (japhb)
N: Geoff Broadwell
U: japhb
E: geoff@broadwell.org

Expand All @@ -165,10 +168,10 @@ N: Jeff Horwitz
E: jeff@smashing.org
U: jhorwitz

N: Jerry Gay a.k.a. particle
N: Jerry Gay
U: particle
E: Jerry.Gay@gmail.com
S: Seattle, WA
S: Seattle, WA, USA

N: Jesse Vincent
U: jesse
Expand All @@ -193,7 +196,7 @@ N: Kevin Tew
U: tewk
E: tewk@tewk.com

N: Klaas-Jan Stol a.k.a. kj[s]?
N: Klaas-Jan Stol
U: kjs
E: parrotcode@gmail.com

Expand All @@ -211,7 +214,7 @@ N: Luke Palmer
E: luke@luqui.org
U: luqui

N: Mark Glines a.k.a. Infinoid
N: Mark Glines
U: infinoid
E: mark@glines.org
S: South Lake Tahoe, CA, USA
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ testable : perl6$(EXE) Test.pir spectest_checkout spectest_update

xmas: perl6$(EXE)

CRITIC_FILES=Configure.pl t/harness build/ config/ tools/
CRITIC_FILES=Configure.pl t/harness build/ tools/

perlcritic:
perlcritic -1 --profile tools/util/perlcritic.conf $(CRITIC_FILES)
Expand Down
3 changes: 1 addition & 2 deletions build/gen_junction_pir.pl
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@
);
}

close $fh;
0;
close $fh or die $!;
25 changes: 14 additions & 11 deletions t/harness
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

# $Id$

# note: du to a limitation in Getopt::Long options that should be passed
# note: Due to a limitation in Getopt::Long options that should be passed
# through to fudgeall have to come after all other options

use strict;
use warnings;

use FindBin;
use File::Spec;
use Getopt::Long qw(:config pass_through);
Expand Down Expand Up @@ -40,7 +43,7 @@ if ($list_file) {
warn "Missing test file: $fn\n";
}
}
close $f;
close $f or die $!;
}

my @tfiles = map { all_in($_) } sort @files;
Expand All @@ -57,20 +60,20 @@ sub all_in {

return $start unless -d $start;

my @skip = ( File::Spec->updir, File::Spec->curdir, qw( .svn CVS .git ) );
my %skip = map {($_,1)} @skip;

my @hits = ();

local *DH;
if ( opendir( DH, $start ) ) {
my @files = sort readdir DH;
closedir DH;
if ( opendir( my $dh, $start ) ) {
my @files = sort readdir $dh;
closedir $dh or die $!;
for my $file ( @files ) {
next if $file eq File::Spec->updir || $file eq File::Spec->curdir;
next if $file eq ".svn";
next if $file eq "CVS";
next if $skip{$file};

my $currfile = File::Spec->catfile( $start, $file );
if ( -d $currfile ) {
push( @hits, all_in( $currfile ) ) if $recurse;
push( @hits, all_in( $currfile ) );
} else {
push( @hits, $currfile ) if $currfile =~ /\.t$/;
}
Expand All @@ -84,7 +87,7 @@ sub all_in {

sub fudge {
my $impl = 'rakudo';
my $cmd = join ' ', $^X, 't/spec/fudgeall',
my $cmd = join ' ', $^X, 't/spec/fudgeall',
@pass_through_options, $impl, @_;
return split ' ', `$cmd`;
}

0 comments on commit 5e410bb

Please sign in to comment.