X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=xt%2Fwhitespace.t;fp=xt%2Feol.t;h=0645aed49b6b83870b0da290c42a1635b375caaa;hp=da4ef1078eb44622a20d96320ed9d93e4d825341;hb=ffce4b65b2c49bbb04919766c376625d426542f7;hpb=e01862e481716a38079f38aa688f9a5c6317c449 diff --git a/xt/eol.t b/xt/whitespace.t similarity index 61% rename from xt/eol.t rename to xt/whitespace.t index da4ef10..0645aed 100644 --- a/xt/eol.t +++ b/xt/whitespace.t @@ -7,27 +7,29 @@ use lib 't/lib'; use DBICTest; require DBIx::Class; -unless ( DBIx::Class::Optional::Dependencies->req_ok_for ('test_eol') ) { - my $missing = DBIx::Class::Optional::Dependencies->req_missing_for ('test_eol'); +unless ( DBIx::Class::Optional::Dependencies->req_ok_for ('test_whitespace') ) { + my $missing = DBIx::Class::Optional::Dependencies->req_missing_for ('test_whitespace'); $ENV{RELEASE_TESTING} ? die ("Failed to load release-testing module requirements: $missing") : plan skip_all => "Test needs: $missing" } -# FIXME - temporary workaround for RT#82032 +# FIXME - temporary workaround for RT#82032, RT#82033 # also add all scripts (no extension) and some extra extensions # we want to check { no warnings 'redefine'; + my $is_pm = sub { + $_[0] !~ /\./ || $_[0] =~ /\.(?:pm|pod|skip|sql|json|proto)$/i || $_[0] =~ /::/; + }; - *Test::EOL::_is_perl_module = sub { - $_[0] !~ /\./ || $_[0] =~ /\.(?:pm|pod|skip|json|proto)$/i || $_[0] =~ /::/; - } + *Test::EOL::_is_perl_module = $is_pm; + *Test::NoTabs::_is_perl_module = $is_pm; } -Test::EOL::all_perl_files_ok({ trailing_whitespace => 1 }, - qw/t xt lib script examples maint/, -); +my @pl_targets = qw/t xt lib script examples maint/; +Test::EOL::all_perl_files_ok({ trailing_whitespace => 1 }, @pl_targets); +Test::NoTabs::all_perl_files_ok(@pl_targets); # check some non-"perl files" in the root separately # use .gitignore as a guide of what to skip @@ -40,13 +42,17 @@ if (open(my $gi, '<', '.gitignore')) { $skipnames->{$_}++ for bsd_glob($ln); } + # that we want to check anyway + delete $skipnames->{'META.yml'}; + for my $fn (bsd_glob('*')) { next if $skipnames->{$fn}; next unless -f $fn; Test::EOL::eol_unix_ok($fn, { trailing_whitespace => 1 }); + Test::NoTabs::notabs_ok($fn); } } -# FIXME - Test::EOL declares 'no_plan' which conflicts with done_testing +# FIXME - Test::NoTabs and Test::EOL declare 'no_plan' which conflicts with done_testing # https://github.com/schwern/test-more/issues/14 #done_testing;