Move the eddsa prereq.sh check to a with_eddsa marker

Assisted-by: Claude:claude-opus-4-8

diff --git a/bin/tests/system/eddsa/prereq.sh b/bin/tests/system/eddsa/prereq.sh
deleted file mode 100644 (file)
index ccf967b..0000000
--- a/bin/tests/system/eddsa/prereq.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-. ../conf.sh
-
-if [ $ED25519_SUPPORTED = 0 ] && [ $ED448_SUPPORTED = 0 ]; then
-  exit 1
-fi

diff --git a/bin/tests/system/eddsa/tests_sh_eddsa.py b/bin/tests/system/eddsa/tests_sh_eddsa.py
index 587748ffb5f08022dab9854ca33da81609722845..9fb79cff1673e3c7462d0b5fe2cd89cf5092dec1 100644 (file)
--- a/bin/tests/system/eddsa/tests_sh_eddsa.py
+++ b/bin/tests/system/eddsa/tests_sh_eddsa.py
@@ -11,7 +11,9 @@
 
 import pytest
 
-pytestmark = pytest.mark.extra_artifacts(
+import isctest.mark
+
+EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
     [
         "dig.out.*",
         "ns*/*.signed",
@@ -25,6 +27,11 @@ pytestmark = pytest.mark.extra_artifacts(
     ]
 )
 
+pytestmark = [
+    isctest.mark.with_eddsa,
+    EXTRA_ARTIFACTS,
+]
+
 
 def test_eddsa(run_tests_sh):
     run_tests_sh()

diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index ad82258649b91d08060c6d1f95355961a2c2466e..0dbb0ca8f35083a40bfe83cd0add1f14addea5be 100644 (file)
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -84,6 +84,12 @@ def with_algorithm(name: str):
     return pytest.mark.skipif(os.getenv(key) != "1", reason=f"{name} is not supported")
 
 
+with_eddsa = pytest.mark.skipif(
+    os.getenv("ED25519_SUPPORTED") != "1" and os.getenv("ED448_SUPPORTED") != "1",
+    reason="EdDSA (ED25519 or ED448) is not supported",
+)
+
+
 with_developer = pytest.mark.skipif(
     os.getenv("FEATURE_DEVELOPER") != "1",
     reason="developer mode disabled in the build",