1 files changed, 13 insertions, 30 deletions
diff --git a/test/src/xml-tests.el b/test/src/xml-tests.el
index 557e6da4524..6a8290bd0c8 100644
--- a/test/src/xml-tests.el
+++ b/test/src/xml-tests.el
@@ -1,6 +1,6 @@
-;;; libxml-parse-tests.el --- Test suite for libxml parsing.
+;;; xml-tests.el --- Test suite for libxml parsing. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2022 Free Software Foundation, Inc.
 
 ;; Author: Ulf Jasper <ulf.jasper@web.de>
 ;; Keywords:       internal
@@ -27,6 +27,8 @@
 
 (require 'ert)
 
+(declare-function libxml-parse-xml-region "xml.c")
+
 (defvar libxml-tests--data-comments-preserved
   `(;; simple case
     ("<?xml version=\"1.0\"?><foo baz=\"true\">bar</foo>"
@@ -42,33 +44,14 @@
             (comment nil "comment-b") (comment nil "comment-c"))))
   "Alist of XML strings and their expected parse trees for preserved comments.")
 
-(defvar libxml-tests--data-comments-discarded
-  `(;; simple case
-    ("<?xml version=\"1.0\"?><foo baz=\"true\">bar</foo>"
-     . (foo ((baz . "true")) "bar"))
-    ;; toplevel comments -- first document child must not get lost
-    (,(concat "<?xml version=\"1.0\"?><foo>bar</foo><!--comment-1-->"
-	      "<!--comment-2-->")
-     . (foo nil "bar"))
-    (,(concat "<?xml version=\"1.0\"?><!--comment-a--><foo a=\"b\">"
-	      "<bar>blub</bar></foo><!--comment-b--><!--comment-c-->")
-     . (foo ((a . "b")) (bar nil "blub"))))
-  "Alist of XML strings and their expected parse trees for discarded comments.")
-
-
 (ert-deftest libxml-tests ()
   "Test libxml."
-  (when (fboundp 'libxml-parse-xml-region)
-    (with-temp-buffer
-      (dolist (test libxml-tests--data-comments-preserved)
-        (erase-buffer)
-        (insert (car test))
-        (should (equal (cdr test)
-                       (libxml-parse-xml-region (point-min) (point-max)))))
-      (dolist (test libxml-tests--data-comments-discarded)
-        (erase-buffer)
-        (insert (car test))
-        (should (equal (cdr test)
-                       (libxml-parse-xml-region (point-min) (point-max) nil t)))))))
-
-;;; libxml-tests.el ends here
+  (skip-unless (fboundp 'libxml-parse-xml-region))
+  (with-temp-buffer
+    (dolist (test libxml-tests--data-comments-preserved)
+      (erase-buffer)
+      (insert (car test))
+      (should (equal (cdr test)
+                     (libxml-parse-xml-region (point-min) (point-max)))))))
+
+;;; xml-tests.el ends here