Commit 85f8aa10 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 3586fef2
Pipeline #4250 failed with stage
in 56 minutes and 1 second
......@@ -401,7 +401,7 @@ extract_big_integer (emacs_env *env, emacs_value arg, mpz_t result)
mpz_set_ui (result, 0);
return true;
}
enum { order = -1, size = sizeof (unsigned long), endian = 0, nails = 0 };
enum { order = -1, size = sizeof (emacs_limb_t), endian = 0, nails = 0 };
assert (0 < count && count <= max_count);
emacs_limb_t *magnitude = malloc (count * size);
if (magnitude == NULL)
......
......@@ -257,7 +257,9 @@ must evaluate to a regular expression string."
(ert-deftest module--test-assertions--load-non-live-object ()
"Check that -module-assertions verify that non-live objects aren't accessed."
(skip-unless (file-executable-p mod-test-emacs))
(skip-unless (or (file-executable-p mod-test-emacs)
(and (eq system-type 'windows-nt)
(file-executable-p (concat mod-test-emacs ".exe")))))
;; This doesn't yet cause undefined behavior.
(should (eq (mod-test-invalid-store) 123))
(module--test-assertion (rx "Emacs value not found in "
......@@ -271,7 +273,9 @@ must evaluate to a regular expression string."
(ert-deftest module--test-assertions--call-emacs-from-gc ()
"Check that -module-assertions prevents calling Emacs functions
during garbage collection."
(skip-unless (file-executable-p mod-test-emacs))
(skip-unless (or (file-executable-p mod-test-emacs)
(and (eq system-type 'windows-nt)
(file-executable-p (concat mod-test-emacs ".exe")))))
(module--test-assertion
(rx "Module function called during garbage collection\n")
(mod-test-invalid-finalizer)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment