Use "-T maxcachesize=2097152" in all system tests

In order to lower the amount of memory allocated at startup by named
instances used in the BIND system test suite, set the default value of
"max-cache-size" for these to 2 megabytes.  The purpose of this change
is to prevent named instances (or even entire virtual machines) from
getting killed by the operating system on the test host due to excessive
memory use.

Remove all "max-cache-size" statements from named configuration files
used in system tests ("checkconf" notwithstanding) to prevent confusion
as the "-T maxcachesize=..." command line option takes precedence over
configuration files.

(cherry picked from commit dad6572093aa17cd6c5ea96b939dde8ad7ed3b78)

diff --git a/bin/tests/system/additional/ns1/named.args b/bin/tests/system/additional/ns1/named.args
index 0db1ead8340947fd76a4600399d68caa55c4fee8..15aa849355f51f605d8bae3fe3457d42b2c8a788 100644 (file)
--- a/bin/tests/system/additional/ns1/named.args
+++ b/bin/tests/system/additional/ns1/named.args
@@ -1,2 +1,2 @@
 # this server runs named with only one worker thread
--m record,size,mctx -c named.conf -d 99 -D additional-ns1 -X named.lock -g -n 1
+-m record,size,mctx -c named.conf -d 99 -D additional-ns1 -X named.lock -g -n 1 -T maxcachesize=2097152

diff --git a/bin/tests/system/allow-query/ns3/named.args b/bin/tests/system/allow-query/ns3/named.args
index 5dd675d0fd241577ec156dfc1680f743b38e9f16..35e99d8dd8b83bae82c6674fa3e3a9bbafba69f8 100644 (file)
--- a/bin/tests/system/allow-query/ns3/named.args
+++ b/bin/tests/system/allow-query/ns3/named.args
@@ -1,2 +1,2 @@
 # this server only has 127.0.0.1 in its localhost/localnets ACLs
--m record,size,mctx -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T fixedlocal
+-m record,size,mctx -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T maxcachesize=2097152 -T fixedlocal

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 4fd5328e865b0a95cf0a3b5940af9b1c99361194..3c0fcac154f46ec092b6dabdeb129333424dd1dd 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -18,7 +18,6 @@ options {
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        notify yes;
-       max-cache-size 80%;
        disable-empty-zone 127.IN-ADDR.ARPA;
        recursion yes;
        dnssec-validation yes;

diff --git a/bin/tests/system/delzone/ns2/named.args b/bin/tests/system/delzone/ns2/named.args
index b3028b1d29fbddaf77eda467e0fb8944d3adac59..be9241ed54a57318b95163bd26be557dc52117ee 100644 (file)
--- a/bin/tests/system/delzone/ns2/named.args
+++ b/bin/tests/system/delzone/ns2/named.args
@@ -1 +1 @@
--D delzone-ns2 -X named.lock -m record,size,mctx -c named.conf -g -U 4
+-D delzone-ns2 -X named.lock -m record,size,mctx -c named.conf -g -U 4 -T maxcachesize=2097152

diff --git a/bin/tests/system/dnssec/ns6/named.args b/bin/tests/system/dnssec/ns6/named.args
index 21242f17ff663dcfb1985f6a3699812818800564..65b7dbcc939dea21fc58ddf36a2dcd72d8b9eb66 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.args
+++ b/bin/tests/system/dnssec/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T nonearest -T tat=1
+-m record,size,mctx -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T maxcachesize=2097152 -T nonearest -T tat=1

diff --git a/bin/tests/system/dnstap/ns3/named.args b/bin/tests/system/dnstap/ns3/named.args
index b746de58fe2b94847e7017349ac110fe0c3de395..fb42af211a05f54fe644fda9a42e537ad27a20fa 100644 (file)
--- a/bin/tests/system/dnstap/ns3/named.args
+++ b/bin/tests/system/dnstap/ns3/named.args
@@ -1,2 +1,2 @@
 # Using "-n 1" allows GL #1795 to be reliably reproduced
--D dnstap-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -n 1
+-D dnstap-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152

diff --git a/bin/tests/system/dscp/ns1/named.args b/bin/tests/system/dscp/ns1/named.args
index 4986abce05974d8cfc648bc5e3cceb461a6b3758..0c955c704a14c38bc3d6e34785720f4545720d6f 100644 (file)
--- a/bin/tests/system/dscp/ns1/named.args
+++ b/bin/tests/system/dscp/ns1/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns2/named.args b/bin/tests/system/dscp/ns2/named.args
index 91635e8c04bc978745425171320b6107644c6da1..ff501a812c06ce212c39f758b43f6c974ce7925f 100644 (file)
--- a/bin/tests/system/dscp/ns2/named.args
+++ b/bin/tests/system/dscp/ns2/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns3/named.args b/bin/tests/system/dscp/ns3/named.args
index ec9b5934dad0c392e30edf5cd67a9409a177f988..3d1981fb59adc3a24e1c459cdc761742ca3dca13 100644 (file)
--- a/bin/tests/system/dscp/ns3/named.args
+++ b/bin/tests/system/dscp/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns4/named.args b/bin/tests/system/dscp/ns4/named.args
index 6da9eff607509450a9767eb16ecb5b4c6e755aea..277a47b628f10819e6b24b41f93abb96e90b505c 100644 (file)
--- a/bin/tests/system/dscp/ns4/named.args
+++ b/bin/tests/system/dscp/ns4/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns5/named.args b/bin/tests/system/dscp/ns5/named.args
index dc556e7e86bfb97dd45844d9da7fd5a18b1b504d..c678163f374a13d47c98d5b3189d4037f3f502db 100644 (file)
--- a/bin/tests/system/dscp/ns5/named.args
+++ b/bin/tests/system/dscp/ns5/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns6/named.args b/bin/tests/system/dscp/ns6/named.args
index c7389076ba458afe44c78feb8dba8a2d4449d4d1..283cf22011b6f5f0498f36040c3db0488e65e916 100644 (file)
--- a/bin/tests/system/dscp/ns6/named.args
+++ b/bin/tests/system/dscp/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns7/named.args b/bin/tests/system/dscp/ns7/named.args
index 39ccaa4bbf8009dd101532ca9a271833ccdee3a3..4ccf38ea05cd768a919c454cf468c7caa563f600 100644 (file)
--- a/bin/tests/system/dscp/ns7/named.args
+++ b/bin/tests/system/dscp/ns7/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dupsigs/ns1/named.args b/bin/tests/system/dupsigs/ns1/named.args
index 2eed0529a73f813bc8f72cb99aa9cb6956ec89c6..231eed49024514df3185c462c16060c7c90f8d71 100644 (file)
--- a/bin/tests/system/dupsigs/ns1/named.args
+++ b/bin/tests/system/dupsigs/ns1/named.args
@@ -1 +1 @@
--D dupsigs-ns1 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T sigvalinsecs
+-D dupsigs-ns1 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T sigvalinsecs

diff --git a/bin/tests/system/geoip2/ns2/named1.conf.in b/bin/tests/system/geoip2/ns2/named1.conf.in
index 62ed7ab3fe1a0425138f25b9033ac9544cc762fc..7d8ceb1d11cc75ba40a5e8b3c4c6caabd206d922 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named1.conf.in
+++ b/bin/tests/system/geoip2/ns2/named1.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named10.conf.in b/bin/tests/system/geoip2/ns2/named10.conf.in
index b7f03cd3af77c25063d9abfa92b05a02c0d2413c..9e12fe084c52c38569e7b4c9a38bfe2f2c338f47 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named10.conf.in
+++ b/bin/tests/system/geoip2/ns2/named10.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named11.conf.in b/bin/tests/system/geoip2/ns2/named11.conf.in
index 75cdbbf55737a35e08c0cabc0ee521fbe8d0509e..4ad1ad0bda45e9e643e0288927c34103bf773bb0 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named11.conf.in
+++ b/bin/tests/system/geoip2/ns2/named11.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named12.conf.in b/bin/tests/system/geoip2/ns2/named12.conf.in
index 3fd54cb274ae97555a19677b6068d2a2ae5588f3..a968c8a91e1949054e2f47e5c417c0e1850c49e0 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named12.conf.in
+++ b/bin/tests/system/geoip2/ns2/named12.conf.in
@@ -27,7 +27,6 @@ options {
        dnssec-validation no;
        geoip-directory "../data";
        blackhole { blocking; };
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named2.conf.in b/bin/tests/system/geoip2/ns2/named2.conf.in
index 8a7022b4a48842f40228b72f3dc64cb928546229..b0c156407969ebb0c02f933572d629b567724042 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named2.conf.in
+++ b/bin/tests/system/geoip2/ns2/named2.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named3.conf.in b/bin/tests/system/geoip2/ns2/named3.conf.in
index 75758f6ee683932c556bf4bb25bb30a990ab9ef8..e275fe34241304feea57e697438365f330415b62 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named3.conf.in
+++ b/bin/tests/system/geoip2/ns2/named3.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named4.conf.in b/bin/tests/system/geoip2/ns2/named4.conf.in
index 917d744ed203e28f30e0c2e351bd656c01c3a7e4..a3015d64f3a18347ecfd3ddb90091a1c218aefc8 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named4.conf.in
+++ b/bin/tests/system/geoip2/ns2/named4.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named5.conf.in b/bin/tests/system/geoip2/ns2/named5.conf.in
index 79f5909515e951334c95ca4758acbb2ddd54a483..c38e613d2f0b66ce097dd326fed44539021407d1 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named5.conf.in
+++ b/bin/tests/system/geoip2/ns2/named5.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named6.conf.in b/bin/tests/system/geoip2/ns2/named6.conf.in
index 4664b242b94af8fbd3855918329df3a528c22bf2..3e95e70090a7e9f0ab38b2062c9a7b0233c03e78 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named6.conf.in
+++ b/bin/tests/system/geoip2/ns2/named6.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named7.conf.in b/bin/tests/system/geoip2/ns2/named7.conf.in
index 2cf06dd88031a00afd682f7f2d8de9743566c76e..0674e75fbf88ecd16336d0e87987632123ff20fd 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named7.conf.in
+++ b/bin/tests/system/geoip2/ns2/named7.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named8.conf.in b/bin/tests/system/geoip2/ns2/named8.conf.in
index 7e7559d3be6df075696c4f657a7e29bd9cb0ef53..a175cb9d25ae522d8a3315a4e97e0879935835c7 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named8.conf.in
+++ b/bin/tests/system/geoip2/ns2/named8.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/geoip2/ns2/named9.conf.in b/bin/tests/system/geoip2/ns2/named9.conf.in
index 78c252da0fdbc6766309b781ccea7759d647245f..41992e49bf15f9db589248e11ed26c754034b006 100644 (file)
--- a/bin/tests/system/geoip2/ns2/named9.conf.in
+++ b/bin/tests/system/geoip2/ns2/named9.conf.in
@@ -22,7 +22,6 @@ options {
        recursion no;
        dnssec-validation no;
        geoip-directory "../data";
-       max-cache-size 1M;
 };
 
 key rndc_key {

diff --git a/bin/tests/system/legacy/ns4/named.args b/bin/tests/system/legacy/ns4/named.args
index 24af8c11275be06f0ce5fc4336518d9e92a52f92..0fe677432954551344e799351473cd1d515371f5 100644 (file)
--- a/bin/tests/system/legacy/ns4/named.args
+++ b/bin/tests/system/legacy/ns4/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T noedns
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns

diff --git a/bin/tests/system/legacy/ns5/named.args b/bin/tests/system/legacy/ns5/named.args
index 515e77d0d9c192f0b244f485b9d8963f6af3c33e..364370a18b4d7748e0bb22623745cfbbaca2c41a 100644 (file)
--- a/bin/tests/system/legacy/ns5/named.args
+++ b/bin/tests/system/legacy/ns5/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T noedns
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T noedns

diff --git a/bin/tests/system/legacy/ns6/named.args b/bin/tests/system/legacy/ns6/named.args
index cdc570f7c8dce2af5a30117e9bd4692596ecaecd..64e5524324a8e8ab5fc7046963aef61b741c0947 100644 (file)
--- a/bin/tests/system/legacy/ns6/named.args
+++ b/bin/tests/system/legacy/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxudp512
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512

diff --git a/bin/tests/system/legacy/ns7/named.args b/bin/tests/system/legacy/ns7/named.args
index 2a1a61217bb3f6ab03660f4a7386f268f84d4d00..e491a95dc6113f81045c9e2101db1ecfe1a81179 100644 (file)
--- a/bin/tests/system/legacy/ns7/named.args
+++ b/bin/tests/system/legacy/ns7/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxudp512
+-m record,size,mctx -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T maxudp512

diff --git a/bin/tests/system/mirror/ns3/named.args b/bin/tests/system/mirror/ns3/named.args
index be1cb49ce3dcbcbc493c5c0aa258ce276fe2f42b..7519c8f587b0ec2a12c553053a8ccd606260abdb 100644 (file)
--- a/bin/tests/system/mirror/ns3/named.args
+++ b/bin/tests/system/mirror/ns3/named.args
@@ -1 +1 @@
--D mirror-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T tat=3
+-D mirror-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3

diff --git a/bin/tests/system/mkeys/ns2/named.args b/bin/tests/system/mkeys/ns2/named.args
index 9f4ad4e46b59c015e3a46093017538acc5702431..2f752bd79b012decbc524c8f674499a08f056619 100644 (file)
--- a/bin/tests/system/mkeys/ns2/named.args
+++ b/bin/tests/system/mkeys/ns2/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T mkeytimers=5/10/20 -T tat=1
+-m record,size,mctx -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20 -T tat=1

diff --git a/bin/tests/system/mkeys/ns3/named.args b/bin/tests/system/mkeys/ns3/named.args
index 376aa253cf0c73e3e134b78f10eee65277f27be0..2015ee509a7475c902e1c724043b2506b2847fa6 100644 (file)
--- a/bin/tests/system/mkeys/ns3/named.args
+++ b/bin/tests/system/mkeys/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T mkeytimers=5/10/20
+-m record,size,mctx -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20

diff --git a/bin/tests/system/mkeys/ns5/named1.args b/bin/tests/system/mkeys/ns5/named1.args
index 2e6aadc2c1bf15dfd388bdccae4833ae25afd94c..c4c8a55817365ff60676f152595a9bf3472deda5 100644 (file)
--- a/bin/tests/system/mkeys/ns5/named1.args
+++ b/bin/tests/system/mkeys/ns5/named1.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152

diff --git a/bin/tests/system/mkeys/ns5/named2.args b/bin/tests/system/mkeys/ns5/named2.args
index 3eaf260cff9f516bbd2e71e1e5875116053c0a0e..3fd830afbbe0c5e40c74d56d16f7bc7e958a2767 100644 (file)
--- a/bin/tests/system/mkeys/ns5/named2.args
+++ b/bin/tests/system/mkeys/ns5/named2.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T mkeytimers=2/20/40
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=2/20/40

diff --git a/bin/tests/system/mkeys/ns6/named.args b/bin/tests/system/mkeys/ns6/named.args
index 74ea7e0a813d27d72cbabe2e1a0ce0be9e867eb0..65a8fcaa974225f0e959c4ab4a58eed76885fdef 100644 (file)
--- a/bin/tests/system/mkeys/ns6/named.args
+++ b/bin/tests/system/mkeys/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T mkeytimers=5/10/20
+-m record,size,mctx -c named.conf -d 99 -X named.lock -g -T maxcachesize=2097152 -T mkeytimers=5/10/20

diff --git a/bin/tests/system/nsupdate/ns5/named.args b/bin/tests/system/nsupdate/ns5/named.args
index 6555b33a530c9cf2423bc5f4b66aaff652b2daaf..a1ebb6f7631678fe11358677de46e8469a82c397 100644 (file)
--- a/bin/tests/system/nsupdate/ns5/named.args
+++ b/bin/tests/system/nsupdate/ns5/named.args
@@ -1 +1 @@
--D nsupdate-ns5 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T fixedlocal
+-D nsupdate-ns5 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal

diff --git a/bin/tests/system/nsupdate/ns6/named.args b/bin/tests/system/nsupdate/ns6/named.args
index 827afb99487be0e28b8eb462a072fb70bd5c0301..11e544952626f17a39bdfb681e3619b18b3746be 100644 (file)
--- a/bin/tests/system/nsupdate/ns6/named.args
+++ b/bin/tests/system/nsupdate/ns6/named.args
@@ -1 +1 @@
--D nsupdate-ns6 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T fixedlocal
+-D nsupdate-ns6 -m record,size,mctx -c named.conf -d 99 -X named.lock -g -U 4 -T maxcachesize=2097152 -T fixedlocal

diff --git a/bin/tests/system/rndc/ns6/named.args b/bin/tests/system/rndc/ns6/named.args
index e876eb89305246423ee7bb8b816f5c87fc58b4f3..9d7d03aaac42200bbfb1979f8e00573b7ecc23e6 100644 (file)
--- a/bin/tests/system/rndc/ns6/named.args
+++ b/bin/tests/system/rndc/ns6/named.args
@@ -1,3 +1,3 @@
 # teardown of a huge zone with tracing enabled takes way too long 
 # -m none is set so that stop.pl does not timeout
--D rndc-ns6 -X named.lock -m none -c named.conf -d 99 -g -U 4
+-D rndc-ns6 -X named.lock -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152

diff --git a/bin/tests/system/rpz/ns5/named.args b/bin/tests/system/rpz/ns5/named.args
index 14371cc8f35b2588cd593d5c2654d67d39c749a9..56edbe343b7d7e064f7805507e5e63cd43bc09fe 100644 (file)
--- a/bin/tests/system/rpz/ns5/named.args
+++ b/bin/tests/system/rpz/ns5/named.args
@@ -1,2 +1,2 @@
 # run the performance test close to real life
--c named.conf -D rpz-ns5 -X named.lock -gd3
+-c named.conf -D rpz-ns5 -X named.lock -gd3 -T maxcachesize=2097152

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 1ecbd70f22694d8acde339e310ed41b9019306c8..9951cd264ad7c3fef342ad51a1b10c7e891925bd 100755 (executable)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -267,7 +267,7 @@ sub construct_ns_command {
                        }
                }
 
-               $command .= "-c named.conf -d 99 -g -U 4";
+               $command .= "-c named.conf -d 99 -g -U 4 -T maxcachesize=2097152";
        }
 
        if (-e "$testdir/$server/named.notcp") {