From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 26 Feb 2025 08:14:08 +0000 (+0800)
Subject: Disable server-tests/server-force-stop/keeps-frames on riscv64
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab4d774cec1cf9f99850adddc3c89afd5f4d7c93;p=emacs.git

Disable server-tests/server-force-stop/keeps-frames on riscv64
---

ab4d774cec1cf9f99850adddc3c89afd5f4d7c93
diff --cc debian/.git-dpm
index 44cfa1a5dda,00000000000..6517479ae70
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
- 2be074322744c69ff73ea5e7225c60be95ebfc32
- 2be074322744c69ff73ea5e7225c60be95ebfc32
++2c784d2bc319a00160f8c911d00d1a4978e2ac22
++2c784d2bc319a00160f8c911d00d1a4978e2ac22
 +c512c0fa6ab117d10b0602d2b2d1fe5880695944
 +c512c0fa6ab117d10b0602d2b2d1fe5880695944
 +emacs_30.1+1.orig.tar.xz
 +09c8a2c6420edf1c0eafbe02c108fdaaf9d3a105
 +31081984
diff --cc debian/patches/0020-Disable-server-tests-server-force-stop-keeps-frames-.patch
index 00000000000,00000000000..c1e28f16ba6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0020-Disable-server-tests-server-force-stop-keeps-frames-.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 2c784d2bc319a00160f8c911d00d1a4978e2ac22 Mon Sep 17 00:00:00 2001
++From: Sean Whitton <spwhitton@spwhitton.name>
++Date: Wed, 26 Feb 2025 16:13:44 +0800
++Subject: Disable server-tests/server-force-stop/keeps-frames on riscv64
++
++This test often hangs on the Debian buildds.
++It simply fails on a porterbox, at least for the emacs-nox phase
++of the build, though seemingly not the emacs-lucid phase.
++---
++ test/lisp/server-tests.el | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el
++index 444c2f99fa7..02106808518 100644
++--- a/test/lisp/server-tests.el
+++++ b/test/lisp/server-tests.el
++@@ -195,7 +195,9 @@ server-tests/server-force-stop/keeps-frames
++ tests that `server-force-stop' doesn't delete frames (and even
++ then, requires a few tricks to run as a regression test).  So
++ long as this works, the problem in bug#58877 shouldn't occur."
++-  (skip-unless server-tests/can-create-frames-p)
+++  (skip-unless (and server-tests/can-create-frames-p
+++                    (not (string-prefix-p "riscv64-"
+++                                          system-configuration))))
++   (let* ((starting-frames (frame-list))
++          (starting-frame-count (length starting-frames))
++          terminal)
diff --cc debian/patches/series
index 2ccdcf664ec,00000000000..6c97f3b0c73
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,0 +1,20 @@@
 +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