set ert_eval & build-depend on elpa-shut-up

3 files changed, 16 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 06af121..b4fc220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 seq-el (2.19-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Set autopkgtest_keep in d/elpa-test.
+  * Add d/elpa-test.
+    - New build dependency on elpa-shut-up.
   * Add skip-test-using-map-length.patch.
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 01 Nov 2016 20:43:56 -0700
diff --git a/debian/control b/debian/control
index d809715..1c9c9bd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: lisp
 Priority: optional
 Maintainer: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org>
 Uploaders: Sean Whitton <spwhitton@spwhitton.name>
-Build-Depends: debhelper (>= 10), dh-elpa (>= 0.0.17)
+Build-Depends: debhelper (>= 10), dh-elpa (>= 0.0.17), elpa-shut-up
 Standards-Version: 3.9.8
 Homepage: https://elpa.gnu.org/packages/seq.html
 Testsuite: autopkgtest-pkg-elpa
diff --git a/debian/elpa-test b/debian/elpa-test
index 4a99c44..1e373bf 100644
--- a/debian/elpa-test
+++ b/debian/elpa-test
@@ -1 +1,14 @@
 autopkgtest_keep = seq-*.el
+
+# Under emacs25, the second call to `require' in seq-tests.el does
+# nothing because the seq.el included with emacs25 has already been
+# loaded.  That means functions defined in versions of seq.el newer
+# than the one bundled with Emacs are left undefined, and the test
+# suite fails.  So set ert_eval to unload the bundled version before
+# trying to run tests.
+
+# Note that package.el DTRT when elpa-seq is installed: the bundled
+# seq.el is overridden by the packaged seq.el during a normal Emacs
+# startup.
+
+ert_eval = (shut-up (when (featurep 'seq) (unload-feature 'seq t)))