Tests: detection when "xml" module is disabled.

diff --git a/test/harness/compatXml.js b/test/harness/compatXml.js
index 465d95ea205b3a14ff61362be600093888eb172e..cf3642c24f47c8fa72c61b0efca44ecc740539f3 100644 (file)
--- a/test/harness/compatXml.js
+++ b/test/harness/compatXml.js
@@ -4,5 +4,14 @@ if (typeof require == 'function'
     && typeof njs == 'object'
     && typeof njs.version == 'string')
 {
-    xml = require('xml');
+    try {
+        xml = require('xml');
+
+    } catch (e) {
+        // ignore
+    }
+}
+
+function has_xml() {
+    return xml;
 }

diff --git a/test/xml/external_entity_ignored.t.js b/test/xml/external_entity_ignored.t.js
index 26ee2403050df095b61f9d0ecded3456c31fc738..57c91e7fd2ee013ac954b4bee7f16451a8053c67 100644 (file)
--- a/test/xml/external_entity_ignored.t.js
+++ b/test/xml/external_entity_ignored.t.js
@@ -11,8 +11,7 @@ let data = `<?xml version="1.0"?>
 <root>&c;</root>
 `;
 
-if (has_njs()) {
-    const xml = require('xml');
+if (has_njs() && has_xml()) {
     let doc = xml.parse(data);
     assert.sameValue(doc.$root.$text, "");
 }

diff --git a/test/xml/saml_verify.t.js b/test/xml/saml_verify.t.js
index ec15c513325d29f833923911118b343cd658d067..be6bae82245e218d7869c1e5d73fb225ddb7fc13 100644 (file)
--- a/test/xml/saml_verify.t.js
+++ b/test/xml/saml_verify.t.js
@@ -280,7 +280,7 @@ function p(args, default_opts) {
 
 let saml_verify_tsuite = {
     name: "SAML verify",
-    skip: () => (!has_njs() || !has_fs() || !has_webcrypto()),
+    skip: () => (!has_njs() || !has_fs() || !has_webcrypto() || !has_xml()),
     T: verify,
     prepare_args: p,
     opts: {