diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-05-13 15:33:10 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-05-13 15:33:10 -0700 |
| commit | ba36c728939ff1e255387bc2073e2a995e466df1 (patch) | |
| tree | 91cf8a690936f829b24415cec04b4c441d74a09a | |
| parent | bd12110ce83c609559b42ef7689811d86ac5dc4c (diff) | |
actually exclude .pc/ and debian/ from ERT tests
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | dh_elpa_test | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 419a2ec..47a60a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ dh-elpa (0.0.21) UNRELEASED; urgency=medium + * Actually exclude .pc/ and debian/ directories from ERT tests. * Fix Vcs-Git: URI. -- Sean Whitton <spwhitton@spwhitton.name> Wed, 04 May 2016 06:45:52 -0700 diff --git a/dh_elpa_test b/dh_elpa_test index d91925c..b46875e 100755 --- a/dh_elpa_test +++ b/dh_elpa_test @@ -134,11 +134,16 @@ if ($control->source->Build_Depends->has( "elpa-buttercup" )) { # ---- ERT -my $rule = File::Find::Rule +my $rule = File::Find::Rule->new; +$rule + ->or(File::Find::Rule + ->name('.pc', 'debian') + ->directory->prune->discard, + File::Find::Rule->new); +$rule ->file() ->name( '*.el' ) - ->grep( "ert-deftest" ) - ->none( File::Find::Rule->name('debian/*'), File::Find::Rule->name('.pc/*') ); + ->grep( "ert-deftest" ); if (defined $ENV{'DH_ELPA_TEST_ERT_EXCLUDE'}) { foreach my $glob (split(',', $ENV{'DH_ELPA_TEST_ERT_EXCLUDE'})) { $rule->not_name($glob); |