|
 |
6e3b16 |
From 9576e960ad3719aa9c1707734ad7ba0eccf16e5f Mon Sep 17 00:00:00 2001
|
|
|
25e332 |
From: Petr Mensik <pemensik@redhat.com>
|
|
|
25e332 |
Date: Fri, 1 Mar 2019 15:48:20 +0100
|
|
|
25e332 |
Subject: [PATCH] Make alternative named builds testable in system tests
|
|
|
25e332 |
|
|
|
25e332 |
Red Hat has alternative variant builds of named, which are not ever
|
|
|
25e332 |
tested by system tests. New variables make it relatively easy to test
|
|
|
25e332 |
alternative variants.
|
|
|
25e332 |
|
|
|
25e332 |
For sdb variant use:
|
|
|
25e332 |
export NAMED_VARIANT=-sdb DNSSEC_VARIANT=
|
|
|
25e332 |
|
|
|
25e332 |
For pkcs variant use:
|
|
|
25e332 |
export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11
|
|
|
25e332 |
---
|
|
|
6e3b16 |
bin/tests/system/conf.sh.in | 18 +++++++++---------
|
|
|
6e3b16 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
25e332 |
|
|
|
25e332 |
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
|
|
|
6e3b16 |
index 6f2dbcd..05605ae 100644
|
|
|
25e332 |
--- a/bin/tests/system/conf.sh.in
|
|
|
25e332 |
+++ b/bin/tests/system/conf.sh.in
|
|
|
6e3b16 |
@@ -37,7 +37,7 @@ DISABLED_ALGORITHM=ECDSAP384SHA384
|
|
|
2a4663 |
DISABLED_ALGORITHM_NUMBER=14
|
|
|
2a4663 |
DISABLED_BITS=384
|
|
|
25e332 |
|
|
|
25e332 |
-NAMED=$TOP/bin/named/named
|
|
|
25e332 |
+NAMED=$TOP/bin/named${NAMED_VARIANT}/named${NAMED_VARIANT}
|
|
|
25e332 |
# We must use "named -l" instead of "lwresd" because argv[0] is lost
|
|
|
25e332 |
# if the program is libtoolized.
|
|
|
25e332 |
LWRESD="$TOP/bin/named/named -l"
|
|
|
6e3b16 |
@@ -48,14 +48,14 @@ NSUPDATE=$TOP/bin/nsupdate/nsupdate
|
|
|
25e332 |
DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen
|
|
|
25e332 |
TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen
|
|
|
25e332 |
RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen
|
|
|
25e332 |
-KEYGEN=$TOP/bin/dnssec/dnssec-keygen
|
|
|
25e332 |
-KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel
|
|
|
25e332 |
-SIGNER=$TOP/bin/dnssec/dnssec-signzone
|
|
|
25e332 |
-REVOKE=$TOP/bin/dnssec/dnssec-revoke
|
|
|
25e332 |
-SETTIME=$TOP/bin/dnssec/dnssec-settime
|
|
|
25e332 |
-DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
|
|
|
25e332 |
+KEYGEN=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-keygen${DNSSEC_VARIANT}
|
|
|
25e332 |
+KEYFRLAB=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-keyfromlabel${DNSSEC_VARIANT}
|
|
|
25e332 |
+SIGNER=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-signzone${DNSSEC_VARIANT}
|
|
|
25e332 |
+REVOKE=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-revoke${DNSSEC_VARIANT}
|
|
|
25e332 |
+SETTIME=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-settime${DNSSEC_VARIANT}
|
|
|
25e332 |
+DSFROMKEY=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-dsfromkey${DNSSEC_VARIANT}
|
|
|
6e3b16 |
HOST=$TOP/bin/dig/host
|
|
|
6e3b16 |
-IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey
|
|
|
25e332 |
+IMPORTKEY=$TOP/bin/dnssec${DNSSEC_VARIANT}/dnssec-importkey${DNSSEC_VARIANT}
|
|
|
25e332 |
CHECKDS=$TOP/bin/python/dnssec-checkds
|
|
|
25e332 |
COVERAGE=$TOP/bin/python/dnssec-coverage
|
|
|
25e332 |
KEYMGR=$TOP/bin/python/dnssec-keymgr
|
|
|
6e3b16 |
@@ -75,7 +75,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read
|
|
|
25e332 |
MDIG=$TOP/bin/tools/mdig
|
|
|
25e332 |
NZD2NZF=$TOP/bin/tools/named-nzd2nzf
|
|
|
25e332 |
FSTRM_CAPTURE=@FSTRM_CAPTURE@
|
|
|
25e332 |
-FEATURETEST=$TOP/bin/named/feature-test
|
|
|
25e332 |
+FEATURETEST=$TOP/bin/named${NAMED_VARIANT}/feature-test${NAMED_VARIANT}
|
|
|
25e332 |
|
|
|
25e332 |
RANDFILE=$TOP/bin/tests/system/random.data
|
|
|
25e332 |
|
|
|
25e332 |
--
|
|
|
6e3b16 |
2.21.1
|
|
|
25e332 |
|