meson: mark skipped config tests as skipped

Using exit code 77 lets meson know to classify tests as skipped instead
of failed or passed.

Works since meson 0.37.

https://mesonbuild.com/Unit-tests.html#skipped-tests-and-hard-errors

diff --git a/daemon/lua/trust_anchors.test/bootstrap.test.lua b/daemon/lua/trust_anchors.test/bootstrap.test.lua
index fa113c4e542d28a0e26daf5c83ee2beeeadd01b8..56c5addef0ec0cade1df8fa274152134741082d8 100644 (file)
--- a/daemon/lua/trust_anchors.test/bootstrap.test.lua
+++ b/daemon/lua/trust_anchors.test/bootstrap.test.lua
@@ -4,8 +4,8 @@ modules.load('ta_update')
 -- check prerequisites
 local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request')
 if not has_http then
-       pass('skipping bootstrap tests because http module is not not installed')
-       done()
+       -- skipping bootstrap tests because http module is not not installed
+       os.exit(77)
 end
 
 local cqueues = require("cqueues")

diff --git a/modules/daf/daf_http.test.lua b/modules/daf/daf_http.test.lua
index bdd486e146bf33c5d1a69d76159705a5640f7a15..fc1b50eb020116886aa847e21d2b60dfaebe9458 100644 (file)
--- a/modules/daf/daf_http.test.lua
+++ b/modules/daf/daf_http.test.lua
@@ -2,8 +2,8 @@
 -- check prerequisites
 local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request')
 if not has_http then
-       pass('skipping daf module test because http its not installed')
-       done()
+       -- skipping daf module test because http its not installed
+       os.exit(77)
 else
        local request = require('http.request')
 

diff --git a/modules/http/http.test.lua b/modules/http/http.test.lua
index 393114064804a9f31b188d038cb3bad27315a177..4d1e0fecc12f65d9f382c0425668c469277074bb 100644 (file)
--- a/modules/http/http.test.lua
+++ b/modules/http/http.test.lua
@@ -2,8 +2,8 @@
 -- check prerequisites
 local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request')
 if not has_http then
-       pass('skipping http module test because its not installed')
-       done()
+       -- skipping http module test because its not installed
+       os.exit(77)
 else
        local request = require('http.request')
 

diff --git a/modules/http/http_doh.test.lua b/modules/http/http_doh.test.lua
index 97bc63a8960029b1b4160bfb037266fa2b70de7a..cfe31d373a0bc1aa1cf08a17a2d0f5ffca5ebf53 100644 (file)
--- a/modules/http/http_doh.test.lua
+++ b/modules/http/http_doh.test.lua
@@ -75,8 +75,8 @@ end
 -- check prerequisites
 local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request')
 if not has_http then
-       pass('skipping http module test because its not installed')
-       done()
+       -- skipping http module test because its not installed
+       os.exit(77)
 else
        policy.add(policy.suffix(policy.DROP, policy.todnames({'servfail.test.'})))
        policy.add(policy.suffix(policy.DENY, policy.todnames({'nxdomain.test.'})))

diff --git a/modules/http/test_tls/tls.test.lua b/modules/http/test_tls/tls.test.lua
index 459452606ca3336d8fdcaca92cf72ba1375b42eb..481d7b87f7b94c3c7392f693f3b9860ef4bad463 100644 (file)
--- a/modules/http/test_tls/tls.test.lua
+++ b/modules/http/test_tls/tls.test.lua
@@ -2,8 +2,8 @@
 -- check prerequisites
 local has_http = pcall(require, 'kres_modules.http') and pcall(require, 'http.request')
 if not has_http then
-       pass('skipping http module test because its not installed')
-       done()
+       -- skipping http module test because its not installed
+       os.exit(77)
 else
        local request = require('http.request')
        local openssl_ctx = require('openssl.ssl.context')

diff --git a/tests/config/worker.test.lua b/tests/config/worker.test.lua
index 6133d6c8c2e22942672c4796559f5c417f62d13c..756bb5fb148de9274bc5ecb94f9b2929395cee8c 100644 (file)
--- a/tests/config/worker.test.lua
+++ b/tests/config/worker.test.lua
@@ -1,8 +1,8 @@
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- check prerequisites
 if not worker.bg_worker then
-       pass('skipping worker test because it doesnt support background worker')
-       done()
+       -- skipping worker test because it doesnt support background worker
+       os.exit(77)
 else
        -- import primitives for synchronisation
        local monotime = require('cqueues').monotime