summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-01-10 11:17:49 -0700
committerSean Whitton <spwhitton@spwhitton.name>2017-01-10 11:17:49 -0700
commita06f0c917fdf8c604fc0e93a8b3620cbc0d6cd66 (patch)
tree13f44f936e016bf48936d633f46c3e3a210ffcd2
parente26a74596105f702ba7fcbe15bdf41f59b75555f (diff)
finish implementing ignoring ERT tests in .git
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_elpa_test2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 295ea68..065a89d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-elpa (1.7) UNRELEASED; urgency=medium
+
+ * Properly implement ignoring files containing ERT tests in .git.
+ dh-elpa 1.4 ignored them only in --autopkgtest mode.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Tue, 10 Jan 2017 11:16:56 -0700
+
dh-elpa (1.6) unstable; urgency=medium
* Add an "exit 0" to xemacs case of remove script (Closes: #850036).
diff --git a/dh_elpa_test b/dh_elpa_test
index c8ee10b..2c49904 100755
--- a/dh_elpa_test
+++ b/dh_elpa_test
@@ -303,7 +303,7 @@ if ($control->source->Build_Depends->has( "elpa-buttercup" )) {
my $rule = File::Find::Rule->new;
$rule
->or(File::Find::Rule
- ->name('.pc', 'debian')
+ ->name('.pc', 'debian', '.git')
->directory->prune->discard,
File::Find::Rule->new);
$rule