|
 |
43d968 |
From 953e480044f61dd162726f8345acf450d6ddbecc 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 |
---
|
|
|
df81e8 |
bin/tests/system/conf.sh.in | 18 +++++++++---------
|
|
|
df81e8 |
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
|
|
|
43d968 |
index d859909..db2bafb 100644
|
|
|
25e332 |
--- a/bin/tests/system/conf.sh.in
|
|
|
25e332 |
+++ b/bin/tests/system/conf.sh.in
|
|
|
9c5451 |
@@ -37,17 +37,17 @@ DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen
|
|
|
df81e8 |
DELV=$TOP/bin/delv/delv
|
|
|
df81e8 |
DIG=$TOP/bin/dig/dig
|
|
|
df81e8 |
DNSTAPREAD=$TOP/bin/tools/dnstap-read
|
|
|
25e332 |
-DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
|
|
|
df81e8 |
-FEATURETEST=$TOP/bin/named/feature-test
|
|
|
43d968 |
+DSFROMKEY=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-dsfromkey${DNSSEC_VARIANT:-}
|
|
|
43d968 |
+FEATURETEST=$TOP/bin/named${NAMED_VARIANT:-}/feature-test${NAMED_VARIANT:-}
|
|
|
df81e8 |
FSTRM_CAPTURE=@FSTRM_CAPTURE@
|
|
|
1b1332 |
HOST=$TOP/bin/dig/host
|
|
|
df81e8 |
-IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey
|
|
|
43d968 |
+IMPORTKEY=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-importkey${DNSSEC_VARIANT:-}
|
|
|
df81e8 |
JOURNALPRINT=$TOP/bin/tools/named-journalprint
|
|
|
df81e8 |
-KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel
|
|
|
df81e8 |
-KEYGEN=$TOP/bin/dnssec/dnssec-keygen
|
|
|
43d968 |
+KEYFRLAB=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-keyfromlabel${DNSSEC_VARIANT:-}
|
|
|
43d968 |
+KEYGEN=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-keygen${DNSSEC_VARIANT:-}
|
|
|
25e332 |
KEYMGR=$TOP/bin/python/dnssec-keymgr
|
|
|
25e332 |
MDIG=$TOP/bin/tools/mdig
|
|
|
df81e8 |
-NAMED=$TOP/bin/named/named
|
|
|
43d968 |
+NAMED=$TOP/bin/named${NAMED_VARIANT:-}/named${NAMED_VARIANT:-}
|
|
|
df81e8 |
NSEC3HASH=$TOP/bin/tools/nsec3hash
|
|
|
df81e8 |
NSLOOKUP=$TOP/bin/dig/nslookup
|
|
|
df81e8 |
NSUPDATE=$TOP/bin/nsupdate/nsupdate
|
|
|
9c5451 |
@@ -56,12 +56,12 @@ PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0"
|
|
|
df81e8 |
PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}"
|
|
|
df81e8 |
PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}"
|
|
|
9c5451 |
RESOLVE=$TOP/bin/tests/system/resolve
|
|
|
df81e8 |
-REVOKE=$TOP/bin/dnssec/dnssec-revoke
|
|
|
43d968 |
+REVOKE=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-revoke${DNSSEC_VARIANT:-}
|
|
|
df81e8 |
RNDC=$TOP/bin/rndc/rndc
|
|
|
df81e8 |
RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen
|
|
|
df81e8 |
RRCHECKER=$TOP/bin/tools/named-rrchecker
|
|
|
df81e8 |
-SETTIME=$TOP/bin/dnssec/dnssec-settime
|
|
|
df81e8 |
-SIGNER=$TOP/bin/dnssec/dnssec-signzone
|
|
|
43d968 |
+SETTIME=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-settime${DNSSEC_VARIANT:-}
|
|
|
43d968 |
+SIGNER=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-signzone${DNSSEC_VARIANT:-}
|
|
|
df81e8 |
TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen
|
|
|
df81e8 |
VERIFY=$TOP/bin/dnssec/dnssec-verify
|
|
|
df81e8 |
WIRETEST=$TOP/bin/tests/wire_test
|
|
|
25e332 |
--
|
|
|
43d968 |
2.31.1
|
|
|
25e332 |
|