[COMMIT] Check (featurep 'font-mgr) before calling fontconfig functions, tests

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1387103899 0 # Node ID f22989bb76320d7d68b84212f765e77d01567b11 # Parent ffc0c5a66ab16ee04acb86c6d26dc4d31fc34913 Check (featurep 'font-mgr) before calling fontconfig functions, tests tests/ChangeLog addition: 2013-12-15 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/face-tests.el: Only test fontconfig if the font-mgr feature is available, avoid errors when it isn't. diff -r ffc0c5a66ab1 -r f22989bb7632 tests/ChangeLog --- a/tests/ChangeLog Sun Dec 15 10:26:31 2013 +0000 +++ b/tests/ChangeLog Sun Dec 15 10:38:19 2013 +0000 ＠＠ -1,3 +1,9 ＠＠ +2013-12-15 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * automated/face-tests.el: + Only test fontconfig if the font-mgr feature is available, avoid + errors when it isn't. + 2013-12-15 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/lisp-tests.el: diff -r ffc0c5a66ab1 -r f22989bb7632 tests/automated/face-tests.el --- a/tests/automated/face-tests.el Sun Dec 15 10:26:31 2013 +0000 +++ b/tests/automated/face-tests.el Sun Dec 15 10:38:19 2013 +0000 ＠＠ -29,76 +29,74 ＠＠ ;; Test fontconfig -(let* ((test-name-parts - '("Bitstream Vera Sans Mono-16" - "familylang=en" - "style=Roman" - "stylelang=en" - "fullname=Bitstream Vera Sans Mono" - "fullnamelang=en" - "slant=0" - "weight=80" - "width=100" - "pixelsize=21.3174" - "spacing=100" - "foundry=bitstream" - "antialias=True" - "hintstyle=3" - "hinting=True" - "verticallayout=False" - "autohint=False" - "globaladvance=True" - "file=/usr/X11/lib/X11/fonts/TTF/VeraMono.ttf" - "index=0" - "outline=True" - "scalable=True" - "dpi=95.9282" - "rgba=0" - "scale=1" - "minspace=False" - "charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?& !!!)$ 9;*f! !!!.% !!!)$!!!!# !!#0GM>RAd#y#fx !!!W5 !!#3H !!!!& !!#6I<UKaX!!!?+!!!%#!!!!X !!#AL !!!1& !!+u{!!!!) " - "lang=aa|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nds|nl|nn|no|nr|nso|oc|om|pt|rm|sma|smj|so|sq|ss|st|sv|sw|tl|tn|tr|ts|uz|vo|vot|wa|xh|yap|zu|an|crh|fil|ht|jv|kj|ku-tr|kwm|li|ms|ng|pap-an|pap-aw|rn|rw|sc|sg|sn|su|za" - "fontversion=131072" - "fontformat=TrueType" - "embolden=False" - "embeddedbitmap=True" - "decorative=False" - "lcdfilter=1" - "namelang=en" - "prgname=xemacs" - "hash=sha256\\:da4281dc7db17a3dfce64a62ced92875c5895340055ec8ba24a3914eb97b349d" - "postscriptname=BitstreamVeraSansMono-Roman")) - (test-name-degenerate "") - (test-name-trivial (nth 0 test-name-parts)) - (test-name-short - (concat (nth 0 test-name-parts) ":" (nth 26 test-name-parts))) - (test-name-long (mapconcat #'identity - (append (subseq test-name-parts 0 26) - (subseq test-name-parts 27)) - ":")) - (test-name-full (mapconcat #'identity test-name-parts ":")) - ) - (labels ((try (fontname) - (fc-name-unparse (fc-name-parse fontname))) - (try-harder (fontname) - (fc-name-unparse (fc-name-parse-harder fontname)))) - (Assert (string= test-name-degenerate (try test-name-degenerate))) - (Assert (string= test-name-degenerate (try-harder test-name-degenerate))) - (Assert (string= test-name-trivial (try test-name-trivial))) - (Assert (string= test-name-trivial (try-harder test-name-trivial))) - ;; Note when the `try' form fails, the `try-harder' form returns a - ;; shorter name. - (Check-Error 'invalid-argument - (string= test-name-short (try test-name-short))) - (Assert (string= test-name-trivial (try-harder test-name-short))) - (Assert (string= test-name-long (try test-name-long))) - (Assert (string= test-name-long (try-harder test-name-long))) - ;; Note when the `try' form fails, the `try-harder' form returns a - ;; shorter name. - (Check-Error 'invalid-argument - (string= test-name-full (try test-name-full))) - (Assert (string= test-name-long (try-harder test-name-full))) - ) ; labels - ) ; let +(when (featurep 'font-mgr) + (let* ((test-name-parts + '("Bitstream Vera Sans Mono-16" + "familylang=en" + "style=Roman" + "stylelang=en" + "fullname=Bitstream Vera Sans Mono" + "fullnamelang=en" + "slant=0" + "weight=80" + "width=100" + "pixelsize=21.3174" + "spacing=100" + "foundry=bitstream" + "antialias=True" + "hintstyle=3" + "hinting=True" + "verticallayout=False" + "autohint=False" + "globaladvance=True" + "file=/usr/X11/lib/X11/fonts/TTF/VeraMono.ttf" + "index=0" + "outline=True" + "scalable=True" + "dpi=95.9282" + "rgba=0" + "scale=1" + "minspace=False" + "charset= |>^1!|>^1!P0oWQ |>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?& !!!)$ 9;*f! !!!.% !!!)$!!!!# !!#0GM>RAd#y#fx !!!W5 !!#3H !!!!& !!#6I<UKaX!!!?+!!!%#!!!!X !!#AL !!!1& !!+u{!!!!) " + "lang=aa|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nds|nl|nn|no|nr|nso|oc|om|pt|rm|sma|smj|so|sq|ss|st|sv|sw|tl|tn|tr|ts|uz|vo|vot|wa|xh|yap|zu|an|crh|fil|ht|jv|kj|ku-tr|kwm|li|ms|ng|pap-an|pap-aw|rn|rw|sc|sg|sn|su|za" + "fontversion=131072" + "fontformat=TrueType" + "embolden=False" + "embeddedbitmap=True" + "decorative=False" + "lcdfilter=1" + "namelang=en" + "prgname=xemacs" + "hash=sha256\\:da4281dc7db17a3dfce64a62ced92875c5895340055ec8ba24a3914eb97b349d" + "postscriptname=BitstreamVeraSansMono-Roman")) + (test-name-degenerate "") + (test-name-trivial (nth 0 test-name-parts)) + (test-name-short + (concat (nth 0 test-name-parts) ":" (nth 26 test-name-parts))) + (test-name-long (mapconcat #'identity + (append (subseq test-name-parts 0 26) + (subseq test-name-parts 27)) + ":")) + (test-name-full (mapconcat #'identity test-name-parts ":"))) + (labels ((try (fontname) + (fc-name-unparse (fc-name-parse fontname))) + (try-harder (fontname) + (fc-name-unparse (fc-name-parse-harder fontname)))) + (Assert (string= test-name-degenerate (try test-name-degenerate))) + (Assert (string= test-name-degenerate (try-harder test-name-degenerate))) + (Assert (string= test-name-trivial (try test-name-trivial))) + (Assert (string= test-name-trivial (try-harder test-name-trivial))) + ;; Note when the `try' form fails, the `try-harder' form returns a + ;; shorter name. + (Check-Error 'invalid-argument + (string= test-name-short (try test-name-short))) + (Assert (string= test-name-trivial (try-harder test-name-short))) + (Assert (string= test-name-long (try test-name-long))) + (Assert (string= test-name-long (try-harder test-name-long))) + ;; Note when the `try' form fails, the `try-harder' form returns a + ;; shorter name. + (Check-Error 'invalid-argument + (string= test-name-full (try test-name-full))) + (Assert (string= test-name-long (try-harder test-name-full)))))) ;;; end face-tests.el -- ‘Liston operated so fast that he once accidentally amputated an assistant’s fingers along with a patient’s leg, […] The patient and the assistant both died of sepsis, and a spectator reportedly died of shock, resulting in the only known procedure with a 300% mortality.’ (Atul Gawande, NEJM, 2012) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches