Merge remote-tracking branch 'origin/emacs-30'

1 files changed, 5 insertions, 4 deletions

diff --git a/test/lisp/proced-tests.el b/test/lisp/proced-tests.el
index e24163c3884..ecf23c5d037 100644
--- a/test/lisp/proced-tests.el
+++ b/test/lisp/proced-tests.el
@@ -38,10 +38,10 @@
 (defun proced--cpu-at-point ()
   "Return as an integer the current CPU value at point."
   (if (string-suffix-p "nan" (thing-at-point 'sexp))
-      (let ((pid (proced-pid-at-point)))
-        (ert-skip
-         (format
-          "Found NaN value for %%CPU at point for process with PID %d" pid)))
+      (ert-skip
+       (format
+        "Found NaN value for %%CPU at point for process with PID %s"
+        (substring-no-properties (thing-at-point 'sexp))))
     (thing-at-point 'number)))
 
 (defun proced--assert-emacs-pid-in-buffer ()
@@ -61,6 +61,7 @@
   (proced--move-to-column "%CPU")
   (condition-case err
       (>= (proced--cpu-at-point) cpu)
+    (ert-test-skipped (signal (car err) (cdr err)))
     (error
      (ert-fail
       (list err (proced--assert-process-valid-cpu-refinement-explainer cpu))))))