aboutsummaryrefslogtreecommitdiffstats
path: root/test/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-12-05 16:38:17 +0200
committerEli Zaretskii2019-12-05 16:38:17 +0200
commit85f8aa1089e6fdbdf27b6f2c775e377faa79b19b (patch)
tree8e7ed8528bbb498d140775d183f9cc38dae44458 /test/src
parent3586fef263ccf3b68cc1289d55ef44a3d9ac7e1d (diff)
downloademacs-85f8aa1089e6fdbdf27b6f2c775e377faa79b19b.tar.gz
emacs-85f8aa1089e6fdbdf27b6f2c775e377faa79b19b.zip
Fix recent modifications in emacs-module-tests
* test/data/emacs-module/mod-test.c (extract_big_integer): Fix calculation of size of 'magnitude' when 'emacs_limb_t' is wider than 'unsigned long'. * test/src/emacs-module-tests.el (module--test-assertions--load-non-live-object) (module--test-assertions--call-emacs-from-gc): On MS-Windows, check also mod-test-emacs with ".exe" appended, before skipping the tests.
Diffstat (limited to 'test/src')
-rw-r--r--test/src/emacs-module-tests.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index c5107847318..18766081c0a 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -257,7 +257,9 @@ must evaluate to a regular expression string."
257 257
258(ert-deftest module--test-assertions--load-non-live-object () 258(ert-deftest module--test-assertions--load-non-live-object ()
259 "Check that -module-assertions verify that non-live objects aren't accessed." 259 "Check that -module-assertions verify that non-live objects aren't accessed."
260 (skip-unless (file-executable-p mod-test-emacs)) 260 (skip-unless (or (file-executable-p mod-test-emacs)
261 (and (eq system-type 'windows-nt)
262 (file-executable-p (concat mod-test-emacs ".exe")))))
261 ;; This doesn't yet cause undefined behavior. 263 ;; This doesn't yet cause undefined behavior.
262 (should (eq (mod-test-invalid-store) 123)) 264 (should (eq (mod-test-invalid-store) 123))
263 (module--test-assertion (rx "Emacs value not found in " 265 (module--test-assertion (rx "Emacs value not found in "
@@ -271,7 +273,9 @@ must evaluate to a regular expression string."
271(ert-deftest module--test-assertions--call-emacs-from-gc () 273(ert-deftest module--test-assertions--call-emacs-from-gc ()
272 "Check that -module-assertions prevents calling Emacs functions 274 "Check that -module-assertions prevents calling Emacs functions
273during garbage collection." 275during garbage collection."
274 (skip-unless (file-executable-p mod-test-emacs)) 276 (skip-unless (or (file-executable-p mod-test-emacs)
277 (and (eq system-type 'windows-nt)
278 (file-executable-p (concat mod-test-emacs ".exe")))))
275 (module--test-assertion 279 (module--test-assertion
276 (rx "Module function called during garbage collection\n") 280 (rx "Module function called during garbage collection\n")
277 (mod-test-invalid-finalizer) 281 (mod-test-invalid-finalizer)