Use native shared library extension

For most platforms this is ".so" but for Darwin it is ".dylib".

diff --git a/bin/tests/system/conf.sh b/bin/tests/system/conf.sh
index dddf5dac20ffef9ac2750e97e4d34ecb2d6d5720..ea61b6bbb2e55ff9e97b59f5e524679c01e89387 100644 (file)
--- a/bin/tests/system/conf.sh
+++ b/bin/tests/system/conf.sh
@@ -538,6 +538,7 @@ copy_setports() {
     -e "s/@DISABLED_ALGORITHM_NUMBER@/${DISABLED_ALGORITHM_NUMBER}/g" \
     -e "s/@DISABLED_ALGORITHM_NUMBER@/${DISABLED_ALGORITHM_DST_NUMBER}/g" \
     -e "s/@DISABLED_BITS@/${DISABLED_BITS}/g" \
+    -e "s/@DYLIB@/${DYLIB}/g" \
     $1 >$2
 }
 

diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in
index 7e0234edeb80edb90e0230dfdade2417a4e48074..621b37a9bd337292970238388a5228ea256fae6b 100644 (file)
--- a/bin/tests/system/dlzexternal/ns1/named.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.in
@@ -38,34 +38,34 @@ controls {
 };
 
 dlz "example one" {
-       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so example.nil";
+       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ example.nil";
 };
 
 dlz "example two" {
-       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so alternate.nil";
+       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ alternate.nil";
 };
 
 dlz "example three" {
-       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so example.org";
+       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ example.org";
 };
 
 dlz "example four" {
        // Long zone name to trigger ISC_R_NOSPACE in dns_sdlz_putrr.
-        database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so 123456789.123456789.123456789.123456789.123456789.example.foo";
+        database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ 123456789.123456789.123456789.123456789.123456789.example.foo";
 };
 
 dlz "unsearched1" {
-       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so other.nil";
+       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ other.nil";
        search no;
 };
 
 dlz "unsearched2" {
-       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so zone.nil";
+       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ zone.nil";
        search no;
 };
 
 dlz redzone {
-       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so .";
+       database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ .";
        search no;
 };
 

diff --git a/bin/tests/system/dyndb/ns1/named.conf.j2 b/bin/tests/system/dyndb/ns1/named.conf.j2
index a32c8474fea01e33ea7a06c2ec265532653ad5fe..8906cf2c68ff499f86e735ce70e6b4219e93772f 100644 (file)
--- a/bin/tests/system/dyndb/ns1/named.conf.j2
+++ b/bin/tests/system/dyndb/ns1/named.conf.j2
@@ -36,5 +36,5 @@ controls {
        inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
-dyndb sample "@TOP_BUILDDIR@/testlib-driver-sample.so" { ipv4.example.nil. in-addr.arpa. };
-dyndb sample2 "@TOP_BUILDDIR@/testlib-driver-sample.so" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };
+dyndb sample "@TOP_BUILDDIR@/testlib-driver-sample.@DYLIB@" { ipv4.example.nil. in-addr.arpa. };
+dyndb sample2 "@TOP_BUILDDIR@/testlib-driver-sample.@DYLIB@" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };

diff --git a/bin/tests/system/filter-aaaa/conf/bad1.conf.in b/bin/tests/system/filter-aaaa/conf/bad1.conf.in
index 7223efcf84ccbbb031c8e2deb408274d63a033de..77daaaf29ac4ac939d9b8d35a282a289cec9550f 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/bad1.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/bad1.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 yes;
        filter-aaaa { none; };
 };

diff --git a/bin/tests/system/filter-aaaa/conf/bad2.conf.in b/bin/tests/system/filter-aaaa/conf/bad2.conf.in
index 770227c4543c9c975aa2d79d234e68dbba771604..a0a9e19ce515849bcae35fcbed57c883137bb3f4 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/bad2.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/bad2.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        /*
         * While this matches the defaults, it is not a good configuration
         * to have in named.conf as the two options contradict each other

diff --git a/bin/tests/system/filter-aaaa/conf/bad3.conf.in b/bin/tests/system/filter-aaaa/conf/bad3.conf.in
index d8d30d18e8e458a4f908fdcaa07faf4e09cedb02..fa7c598254901b8fccc629f9bd07e4a4b2acea6c 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/bad3.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/bad3.conf.in
@@ -12,7 +12,7 @@
  */
 
 view myview {
-       plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+       plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
                filter-aaaa-on-v4 no;
                filter-aaaa { any; };
        };

diff --git a/bin/tests/system/filter-aaaa/conf/bad4.conf.in b/bin/tests/system/filter-aaaa/conf/bad4.conf.in
index be198361eeee2e75b47d3d1ec9d9ffad58e6eb67..594b1d0a8a8b5ccfb8a2e355be90776ab2eaeae1 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/bad4.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/bad4.conf.in
@@ -12,7 +12,7 @@
  */
 
 view myview {
-       plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+       plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
                filter-aaaa-on-v4 yes;
                filter-aaaa { none; };
        };

diff --git a/bin/tests/system/filter-aaaa/conf/bad5.conf.in b/bin/tests/system/filter-aaaa/conf/bad5.conf.in
index e17f6a0cd44cccaee888b3b90263285e8b7839bc..fc70791d6c7f1d2a37b4e0c7f2a7e70a32da2c8a 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/bad5.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/bad5.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 yes;
        filter-aaaa { 1.0.0.0/8; };
 };

diff --git a/bin/tests/system/filter-aaaa/conf/good1.conf.in b/bin/tests/system/filter-aaaa/conf/good1.conf.in
index 45efef7940f384f97f4c89650af81e849192a3c5..101eecd171be4cf5dc9eaf1eb64a0744c973f769 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/good1.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/good1.conf.in
@@ -11,6 +11,6 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 yes;
 };

diff --git a/bin/tests/system/filter-aaaa/conf/good2.conf.in b/bin/tests/system/filter-aaaa/conf/good2.conf.in
index 351bedfd3a0badd3713ce6201d78ee2ba408c058..dc44313175b37300006f24895a42e54b940eed35 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/good2.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/good2.conf.in
@@ -11,6 +11,6 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 break-dnssec;
 };

diff --git a/bin/tests/system/filter-aaaa/conf/good3.conf.in b/bin/tests/system/filter-aaaa/conf/good3.conf.in
index 559d98a6f0d5ac5796b6130b432c0f7384c94f38..d6226623cdad17d65f689528a3f96d80584ab00f 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/good3.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/good3.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 break-dnssec;
        filter-aaaa { 1.0.0.0/8; };
 };

diff --git a/bin/tests/system/filter-aaaa/conf/good4.conf.in b/bin/tests/system/filter-aaaa/conf/good4.conf.in
index a9ee336fe15e9525c52af511161a7d442b31dad4..ee99487e936831153ebf8ee4006ef7003dc846b2 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/good4.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/good4.conf.in
@@ -11,7 +11,7 @@
  * information regarding copyright ownership.
  */
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 yes;
        filter-aaaa { 1.0.0.0/8; };
 };

diff --git a/bin/tests/system/filter-aaaa/conf/good5.conf.in b/bin/tests/system/filter-aaaa/conf/good5.conf.in
index 4e568d7f5a27fea3321bb64741ec542092a6d343..0c1706a5bbdc04731ba2a4ee4723425b8532b70f 100644 (file)
--- a/bin/tests/system/filter-aaaa/conf/good5.conf.in
+++ b/bin/tests/system/filter-aaaa/conf/good5.conf.in
@@ -12,7 +12,7 @@
  */
 
 view myview {
-       plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+       plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
                filter-aaaa-on-v4 yes;
                filter-aaaa { 1.0.0.0/8; };
        };

diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
index 3a7338c58020e36f4ab2111cc58aef6af908faab..8dea5f5d226620ce7debc18bc65e5bbf7c02f2c5 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
@@ -28,7 +28,7 @@ options {
 
 acl filterees { 10.53.0.1; };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 yes;
        filter-aaaa { filterees; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
index 6b421159ca5b920cbebed40795d30553bc7b2e51..b03fda546ad567794e31c05e8e349ead3c1bec41 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
@@ -26,7 +26,7 @@ options {
 };
 
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v6 yes;
        filter-aaaa { fd92:7065:b8e:ffff::1; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf.in b/bin/tests/system/filter-aaaa/ns2/named1.conf.in
index cab026e949a84a91aa156a7242e4b01fe85538cb..c714c5429cb87a21df049d9f803b0948a3a783e5 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns2/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named1.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 yes;
        filter-aaaa { 10.53.0.2; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf.in b/bin/tests/system/filter-aaaa/ns2/named2.conf.in
index abf5e7ce2618c9950a67ca756ee0fc4ecf9efdbc..fc77fc4699e9526acbf9beb79136c5ef345e005a 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns2/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named2.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v6 yes;
        filter-aaaa { fd92:7065:b8e:ffff::2; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf.in b/bin/tests/system/filter-aaaa/ns3/named1.conf.in
index 74534d3cf18bfb316b61e5bf7c377dfd59846d56..b11eea3dd94bf8bca3b9d0765bf9bebc6624ff46 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns3/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named1.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 break-dnssec;
        filter-aaaa { 10.53.0.3; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf.in b/bin/tests/system/filter-aaaa/ns3/named2.conf.in
index 7174067b23c3ead6bc4c89082e9d9aa4c553294d..5553e05b4dd6dc079da31ca24cbbb6d08cb06426 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns3/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named2.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v6 break-dnssec;
        filter-aaaa { fd92:7065:b8e:ffff::3; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
index 6909d2221e866d3560ad4e5cfc80207df3383ace..6d3a9cceee51f3dea54ae0ec2cca6a06abbcf8b3 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns4/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 break-dnssec;
        filter-aaaa { 10.53.0.4; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
index cb2ea3be697a9eeb5b1e7d283824f410110a0043..91e38533b2c895dec8fd1648d3d1a3bde109ee73 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns4/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
@@ -25,7 +25,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v6 break-dnssec;
        filter-aaaa { fd92:7065:b8e:ffff::4; };
 };

diff --git a/bin/tests/system/filter-aaaa/ns5/named.conf.in b/bin/tests/system/filter-aaaa/ns5/named.conf.in
index 2dad6434a0a85f163c67272f1fa12ea494822bc3..58acd797eae55b6afa7d8874c29d7185a487af52 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns5/named.conf.in
+++ b/bin/tests/system/filter-aaaa/ns5/named.conf.in
@@ -30,7 +30,7 @@ options {
        minimal-responses no;
 };
 
-plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
+plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
        filter-aaaa-on-v4 break-dnssec;
        filter-aaaa { any; };
 };

diff --git a/bin/tests/system/hooks/ns1/named.conf.j2 b/bin/tests/system/hooks/ns1/named.conf.j2
index 500ede379d0b09b4f62e6f9cce7cc15415342620..0cc4387cf1c131b5b4d093ccc8d243c870657bf9 100644 (file)
--- a/bin/tests/system/hooks/ns1/named.conf.j2
+++ b/bin/tests/system/hooks/ns1/named.conf.j2
@@ -25,7 +25,7 @@ options {
 };
 
 
-plugin query "@TOP_BUILDDIR@/testlib-driver-async.so";
+plugin query "@TOP_BUILDDIR@/testlib-driver-async.@DYLIB@";
 
 key rndc_key {
        secret "1234abcd8765";

diff --git a/bin/tests/system/isctest/vars/basic.py b/bin/tests/system/isctest/vars/basic.py
index 4371694c6dd09a508befd7ec98b71f7074c98666..690088c3c03115c22d832d22fa98cbfff52137f1 100644 (file)
--- a/bin/tests/system/isctest/vars/basic.py
+++ b/bin/tests/system/isctest/vars/basic.py
@@ -61,4 +61,5 @@ BASIC_VARS = {
     ),
     "LC_ALL": "C",
     "ANS_LOG_LEVEL": "debug",
+    "DYLIB": ("dylib" if os.uname().sysname == "Darwin" else "so"),
 }

diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
index 672ba05f21a9f8cc2874011773a0819dc4afefcf..cfb66cfea822e4d49897f8e28bf375c068db9f3a 100644 (file)
--- a/bin/tests/system/rpz/ns3/named.conf.in
+++ b/bin/tests/system/rpz/ns3/named.conf.in
@@ -157,5 +157,5 @@ zone "static-stub-nomatch." {
 # The "BAD" comments below are necessary, because they will be removed using
 # 'sed' by tests.sh in order to activate the faulty configuration.
 #BAD   dlz "bad-dlz" {
-#BAD           database "dlopen bad-dlz.so example.org";
+#BAD           database "dlopen bad-dlz.@DYLIB@ example.org";
 #BAD   };