From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 30 Mar 2025 05:24:33 +0000 (+0800)
Subject: Disable emacs-module-tests.el
X-Git-Tag: archive/raspbian/1%30.1+1-5+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3442b8934b4c438e5d54675edd99582549147b49;p=emacs.git

Disable emacs-module-tests.el

This regularly causes Emacs to FTBFS.
---

3442b8934b4c438e5d54675edd99582549147b49
diff --cc debian/.git-dpm
index 6517479ae70,00000000000..c069fabd312
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 2c784d2bc319a00160f8c911d00d1a4978e2ac22
- 2c784d2bc319a00160f8c911d00d1a4978e2ac22
++22d6e7ad34d947c1154358cd3a59789f539a9cf5
++22d6e7ad34d947c1154358cd3a59789f539a9cf5
 +c512c0fa6ab117d10b0602d2b2d1fe5880695944
 +c512c0fa6ab117d10b0602d2b2d1fe5880695944
 +emacs_30.1+1.orig.tar.xz
 +09c8a2c6420edf1c0eafbe02c108fdaaf9d3a105
 +31081984
diff --cc debian/patches/0021-Disable-emacs-module-tests.el.patch
index 00000000000,00000000000..f5d68103cd4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0021-Disable-emacs-module-tests.el.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 22d6e7ad34d947c1154358cd3a59789f539a9cf5 Mon Sep 17 00:00:00 2001
++From: Sean Whitton <spwhitton@spwhitton.name>
++Date: Sun, 30 Mar 2025 13:24:23 +0800
++Subject: Disable emacs-module-tests.el
++
++This regularly causes Emacs to FTBFS.
++---
++ test/Makefile.in | 4 ----
++ 1 file changed, 4 deletions(-)
++
++diff --git a/test/Makefile.in b/test/Makefile.in
++index 842c0517b98..578c05281b4 100644
++--- a/test/Makefile.in
+++++ b/test/Makefile.in
++@@ -186,11 +186,7 @@ testloadfile =
++ 	  -l ert ${ert_opts} -l $(testloadfile) \
++ 	  $(TEST_RUN_ERT)
++ 
++-ifeq (@HAVE_MODULES@, yes)
++-maybe_exclude_module_tests :=
++-else
++ maybe_exclude_module_tests := -name emacs-module-tests.el -prune -o
++-endif
++ 
++ ## Optional list of .el files to exclude from testing.
++ ## Intended for use in automated testing where one or more files
diff --cc debian/patches/series
index 6c97f3b0c73,00000000000..c4483b12b4b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,20 -1,0 +1,21 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch
 +0010-Mark-test-undo-region-as-unstable.patch
 +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch
 +0012-Add-inhibit-native-compilation.patch
 +0013-Rename-to-inhibit-automatic-native-compilation.patch
 +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
 +0015-Change-native-comp-async-jobs-number-default-to-1.patch
 +0016-Change-native-comp-async-report-warnings-errors-to-s.patch
 +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch
 +0018-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch
 +0019-Boost-BASE_PURESIZE-in-attempt-to-fix-build-on-32-bi.patch
 +0020-Disable-server-tests-server-force-stop-keeps-frames-.patch
++0021-Disable-emacs-module-tests.el.patch