From: Glenn Morris <rgm@gnu.org>
Date: Mon, 12 Jun 2017 21:17:20 +0000 (-0400)
Subject: Small improvement for module assertion test
X-Git-Tag: emacs-26.0.90~521^2~98
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1612d3dd78875b518ebcbcf046e6f9510ff69c99;p=emacs.git

Small improvement for module assertion test

* test/src/emacs-module-tests.el (module--test-assertions):
Don't rely on the precise form of an "Abort" message.
---

diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index 99a853b17e0..502143dd48d 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -188,21 +188,21 @@ changes."
   ;; This doesn’t yet cause undefined behavior.
   (should (eq (mod-test-invalid-store) 123))
   (with-temp-buffer
-    (should (equal (call-process mod-test-emacs nil t nil
-                                 "-batch" "-Q" "-module-assertions" "-eval"
-                                 (prin1-to-string
-                                  `(progn
-                                     (require 'mod-test ,mod-test-file)
-                                     ;; Storing and reloading a local
-                                     ;; value causes undefined
-                                     ;; behavior, which should be
-                                     ;; detected by the module
-                                     ;; assertions.
-                                     (mod-test-invalid-store)
-                                     (mod-test-invalid-load))))
-                   ;; FIXME: This string is probably different on
-                   ;; Windows and Linux.
-                   "Abort trap: 6"))
+    ;; FIXME this dumps a core file if the user has them enabled,
+    ;; which seems unfriendly.
+    (should (string-match-p
+             "Abort" ; eg "Aborted" or "Abort trap: 6"
+             (call-process mod-test-emacs nil t nil
+                           "-batch" "-Q" "-module-assertions" "-eval"
+                           (prin1-to-string
+                            `(progn
+                               (require 'mod-test ,mod-test-file)
+                               ;; Storing and reloading a local value
+                               ;; causes undefined behavior, which should be
+                               ;; detected by the module assertions.
+                               (mod-test-invalid-store)
+                               (mod-test-invalid-load))))))
+    ;; FIXME a failure here gives an uninformative error.
     (re-search-backward (rx bos "Emacs module assertion: "
                             "Emacs value not found in "
                             (+ digit) " values of "