From f16a8d5dbd3bb8a319c951bdde9a6a75dbdb8c17 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 20 Sep 2017 10:16:11 +0300 Subject: [PATCH] Fix 2 testsuite tests for MS-Windows * test/lisp/ibuffer-tests.el (test-buffer-list): Don't try to create files with "*" in their names. * test/src/editfns-tests.el (format-time-string-with-zone): Adapt results to MS-Windows build. Reported by Fabrice Popineau . --- test/lisp/ibuffer-tests.el | 51 ++++++++++++++++++++++---------------- test/src/editfns-tests.el | 6 ++++- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el index d65acf60712..35605ca28dc 100644 --- a/test/lisp/ibuffer-tests.el +++ b/test/lisp/ibuffer-tests.el @@ -456,11 +456,14 @@ (funcall create-non-file-buffer "ibuf-test-8a" :mode #'artist-mode)) (bufB (funcall create-non-file-buffer "*ibuf-test-8b*" :size 32)) - (bufC (funcall create-file-buffer "ibuf-test8c" :suffix "*" - :size 64)) - (bufD (funcall create-file-buffer "*ibuf-test8d" :size 128)) - (bufE (funcall create-file-buffer "*ibuf-test8e" :suffix "*<2>" - :size 16)) + (bufC (or (memq system-type '(ms-dos windows-nt)) + (funcall create-file-buffer "ibuf-test8c" :suffix "*" + :size 64))) + (bufD (or (memq system-type '(ms-dos windows-nt)) + (funcall create-file-buffer "*ibuf-test8d" :size 128))) + (bufE (or (memq system-type '(ms-dos windows-nt)) + (funcall create-file-buffer "*ibuf-test8e" + :suffix "*<2>" :size 16))) (bufF (and (funcall create-non-file-buffer "*ibuf-test8f*") (funcall create-non-file-buffer "*ibuf-test8f*" :size 8)))) @@ -479,22 +482,28 @@ (name . "test.*8b") (size-gt . 31) (not visiting-file))))) - (should (ibuffer-included-in-filters-p - bufC '((and (not (starred-name)) - (visiting-file) - (name . "8c[^*]*\\*") - (size-lt . 65))))) - (should (ibuffer-included-in-filters-p - bufD '((and (not (starred-name)) - (visiting-file) - (name . "\\`\\*.*test8d") - (size-lt . 129) - (size-gt . 127))))) - (should (ibuffer-included-in-filters-p - bufE '((and (starred-name) - (visiting-file) - (name . "8e.*?\\*<[[:digit:]]+>") - (size-gt . 10))))) + ;; MS-DOS and MS-Windows don't allow "*" in file names. + (or (memq system-type '(ms-dos windows-nt)) + (should (ibuffer-included-in-filters-p + bufC '((and (not (starred-name)) + (visiting-file) + (name . "8c[^*]*\\*") + (size-lt . 65)))))) + ;; MS-DOS and MS-Windows don't allow "*" in file names. + (or (memq system-type '(ms-dos windows-nt)) + (should (ibuffer-included-in-filters-p + bufD '((and (not (starred-name)) + (visiting-file) + (name . "\\`\\*.*test8d") + (size-lt . 129) + (size-gt . 127)))))) + ;; MS-DOS and MS-Windows don't allow "*" in file names. + (or (memq system-type '(ms-dos windows-nt)) + (should (ibuffer-included-in-filters-p + bufE '((and (starred-name) + (visiting-file) + (name . "8e.*?\\*<[[:digit:]]+>") + (size-gt . 10)))))) (should (ibuffer-included-in-filters-p bufF '((and (starred-name) (not (visiting-file)) diff --git a/test/src/editfns-tests.el b/test/src/editfns-tests.el index f910afaf711..70dc9372fad 100644 --- a/test/src/editfns-tests.el +++ b/test/src/editfns-tests.el @@ -169,7 +169,11 @@ ;; Negative UTC offset, as a Lisp integer. (should (string-equal (format-time-string format look -28800) - "1972-06-30 15:59:59.999 -0800 (-08)")) + ;; MS-Windows build replaces unrecognizable TZ values, + ;; such as "-08", with "ZZZ". + (if (eq system-type 'windows-nt) + "1972-06-30 15:59:59.999 -0800 (ZZZ)" + "1972-06-30 15:59:59.999 -0800 (-08)"))) ;; Positive UTC offset that is not an hour multiple, as a string. (should (string-equal (format-time-string format look "IST-5:30") -- 2.39.5