]> git.ipfire.org Git - thirdparty/bind9.git/log
thirdparty/bind9.git
8 years agoFix a race between "rndc reconfig" and waiting for a ./DNSKEY fetch to complete
Michał Kępień [Tue, 6 Mar 2018 10:33:16 +0000 (11:33 +0100)] 
Fix a race between "rndc reconfig" and waiting for a ./DNSKEY fetch to complete

Calling nextpart() after reconfiguring ns1 is not safe, because the
expected log message may appear in ns5/named.run before nextpart() is
run.  With the TTL for ./DNSKEY set to 20 seconds, ns5 will refresh it
after 10 seconds, by which time wait_for_log() will already have failed.
This results in a false negative.

However, just calling nextpart() before reconfiguring ns1 would
introduce a different problem: if ns5 refreshed ./DNSKEY between these
two steps, the subsequent wait_for_log() call would return immediately
as it would come across the log message about a failure while refreshing
./DNSKEY instead of the expected success.  This in turn would result in
a different false negative as the root key would still be uninitialized
by the time "rndc secroots" is called.

Prevent both kinds of false negatives by:

  - calling nextpart() before reconfiguring ns1, in order to prevent the
    first case described above,

  - looking for a more specific log message, in order to prevent the
    second case described above.

Also look for a more specific log message in the first part of the
relevant check, not to fix any problem, but just to emphasize that a
different fetch result is expected in that case.

With these tweaks in place, if a (failed) ./DNSKEY refresh is scheduled
between nextpart() and reconfiguring ns1, wait_for_log() will just wait
for two more seconds (one "hour"), at which point another refresh
attempt will be made that will succeed.

(cherry picked from commit 012ca0a27dc2058090d97027076cf09b1bb2474a)

8 years agoMerge branch '133-update-util-check-changes-to-work-on-release-branches-v9_11' into...
Mark Andrews [Thu, 8 Mar 2018 05:19:42 +0000 (16:19 +1100)] 
Merge branch '133-update-util-check-changes-to-work-on-release-branches-v9_11' into 'v9_11'

Resolve "Update util/check-changes to work on release branches."

Closes #133

See merge request isc-projects/bind9!110

8 years agoupdate util/check-changes to handle non master branched (util/check-changes master...
Mark Andrews [Thu, 8 Mar 2018 02:48:07 +0000 (13:48 +1100)] 
update util/check-changes to handle non master branched (util/check-changes master=0 CHANGES)

(cherry picked from commit 88a2202093c2b5712f3d1b5b7edc7223b8a02e9a)

8 years agofix changes number
Mark Andrews [Thu, 8 Mar 2018 01:40:28 +0000 (12:40 +1100)] 
fix changes number

(cherry picked from commit 586b547a7df9185db98f56f23aa2d1ba4e8501d4)

8 years agoMerge branch '125-in-view-duplicate-zone-not-detected-by-named-checkconf-v9_11' into...
Mark Andrews [Thu, 8 Mar 2018 01:21:14 +0000 (12:21 +1100)] 
Merge branch '125-in-view-duplicate-zone-not-detected-by-named-checkconf-v9_11' into 'v9_11'

Resolve "in-view duplicate zone not detected by named-checkconf"

Closes #125

See merge request isc-projects/bind9!97

8 years agoadd changes note for 'named-checkconf did not detect in-view zone collisions'
Mark Andrews [Wed, 7 Mar 2018 00:46:18 +0000 (11:46 +1100)] 
add changes note for 'named-checkconf did not detect in-view zone collisions'

(cherry picked from commit 83f85817aa7b282c99be472b297090aba8b57da3)

8 years agocheck for in-view zones colliding with other zone definitions; also check the syntax...
Mark Andrews [Mon, 5 Mar 2018 00:53:18 +0000 (11:53 +1100)] 
check for in-view zones colliding with other zone definitions; also check the syntax of the in-view zone name

(cherry picked from commit 3e7e280040e87e53176f9a002fee1307427e3e17)

8 years agoadd test configuration where a in-view zone collides with a existing zone
Mark Andrews [Mon, 5 Mar 2018 00:51:48 +0000 (11:51 +1100)] 
add test configuration where a in-view zone collides with a existing zone

(cherry picked from commit ca55c672b0cd8f0ba0c5013c9b05f093f3e657a4)

8 years agoMerge branch 'test-names-v9_11' into 'v9_11'
Evan Hunt [Wed, 7 Mar 2018 22:51:09 +0000 (14:51 -0800)] 
Merge branch 'test-names-v9_11' into 'v9_11'

use the test name in the -D string for each name server

See merge request isc-projects/bind9!107

8 years agouse the test name in the -D string for each name server
Evan Hunt [Wed, 7 Mar 2018 17:57:15 +0000 (09:57 -0800)] 
use the test name in the -D string for each name server

(cherry picked from commit 1eff695f337f831fc317ffdc88eeac4ff303ac3e)

8 years agoMerge branch 'longopts-v9_11' into 'v9_11'
Evan Hunt [Wed, 7 Mar 2018 22:35:31 +0000 (14:35 -0800)] 
Merge branch 'longopts-v9_11' into 'v9_11'

restore long options for run.sh

See merge request isc-projects/bind9!104

8 years agorestore long options for run.sh
Evan Hunt [Tue, 6 Mar 2018 18:59:25 +0000 (10:59 -0800)] 
restore long options for run.sh

(cherry picked from commit 4a714bffbca6dee4f3940a9855c15e3214ef10bc)

8 years agoMerge branch 'allow-query' into 'v9_11'
Evan Hunt [Wed, 7 Mar 2018 22:06:36 +0000 (14:06 -0800)] 
Merge branch 'allow-query' into 'v9_11'

speed up allow_query test

Closes #81

See merge request isc-projects/bind9!76

8 years agoeliminate unnecessary waiting in allow-query test
Evan Hunt [Tue, 27 Feb 2018 00:48:42 +0000 (16:48 -0800)] 
eliminate unnecessary waiting in allow-query test

- grep in the log to see if configuration is finished rather
  than sleeping for 5 seconds

(cherry picked from commit a9b6bed6af61b33ce58aebe90e5670f0ad569568)

8 years agorename allow_query to allow-query
Evan Hunt [Tue, 27 Feb 2018 00:44:57 +0000 (16:44 -0800)] 
rename allow_query to allow-query

(cherry picked from commit ffc3e73c3618d2eb6676ac957e2fd25f1fde9150)

8 years agoMerge branch 'fix-notify' into 'v9_11'
Evan Hunt [Tue, 6 Mar 2018 19:46:26 +0000 (11:46 -0800)] 
Merge branch 'fix-notify' into 'v9_11'

fix notify test

See merge request isc-projects/bind9!77

8 years agoaddress a possible notify test failure
Evan Hunt [Mon, 26 Feb 2018 03:44:19 +0000 (19:44 -0800)] 
address a possible notify test failure

- wait for the transfer completion message to apear in the log instead
  of the notify message. this ensures we don't check for the presense of
  transfered records during the time between the notify and the
  transfer.

(cherry picked from commit ad32553c1d06dcc77542c52ea386ecaea0004f6b)

8 years agoMerge branch '110-libirs-do-not-ignore-resolv.conf-syntax-errors-v9_11' into 'v9_11'
Michał Kępień [Tue, 6 Mar 2018 08:24:54 +0000 (09:24 +0100)] 
Merge branch '110-libirs-do-not-ignore-resolv.conf-syntax-errors-v9_11' into 'v9_11'

libirs: Do not ignore resolv.conf syntax errors

Closes #110

See merge request isc-projects/bind9!78

8 years agoAdd CHANGES entry
Michał Kępień [Mon, 26 Feb 2018 12:23:06 +0000 (13:23 +0100)] 
Add CHANGES entry

4905. [bug] irs_resconf_load() ignored resolv.conf syntax errors
when "domain" or "search" options were present in that
file. [GL #110]

(cherry picked from commit 1f18d3380416b0dc9ae91ee71133532d93d2cfc9)

8 years agoRemove duplicate irs_resconf_load() unit test
Michał Kępień [Mon, 26 Feb 2018 09:41:02 +0000 (10:41 +0100)] 
Remove duplicate irs_resconf_load() unit test

The "sortlist-v4.conf" unit test for irs_resconf_load() is always run
twice due to a duplicate entry in the "tests" table.  Remove one of them
to prevent this.

(cherry picked from commit 6c09f305ae975255210951b75bbb736a4a804453)

8 years agoDo not ignore resolv.conf syntax errors
Michał Kępień [Mon, 26 Feb 2018 09:52:58 +0000 (10:52 +0100)] 
Do not ignore resolv.conf syntax errors

irs_resconf_load() stores the value returned by add_search() into ret
without consulting its current value first.  This causes any previous
errors raised while parsing resolv.conf to be ignored as long as any
"domain" or "search" statement is present in the file.

Prevent this by returning early in case an error is detected while
parsing resolv.conf.  Ensure that "searchlist" and "magic" members of
the created irs_resconf_t structure are always initialized before
isc_resconf_destroy() is called.

(cherry picked from commit 1f400b68a8e6b7a1111151b512eaee2c49bae2ad)

8 years agoMerge branch '126-make-distclean-fail-v9_11' into 'v9_11'
Mark Andrews [Tue, 6 Mar 2018 05:11:43 +0000 (16:11 +1100)] 
Merge branch '126-make-distclean-fail-v9_11' into 'v9_11'

Resolve ""make distclean" fail."

Closes #126

See merge request isc-projects/bind9!102

8 years agodon't allow a macro to end in '\'
Mark Andrews [Tue, 6 Mar 2018 04:13:03 +0000 (15:13 +1100)] 
don't allow a macro to end in '\'

(cherry picked from commit 57f7cf211cf059dd5ec6047978816f164ea0e524)

8 years agoMerge branch 'test-fix' into v9_11
Evan Hunt [Sun, 4 Mar 2018 08:34:08 +0000 (00:34 -0800)] 
Merge branch 'test-fix' into v9_11

Fix merge errors in addzone test

8 years agofix addzone merge errors
Evan Hunt [Sun, 4 Mar 2018 08:33:50 +0000 (00:33 -0800)] 
fix addzone merge errors

8 years agoMerge branch '124-revert-deadlock-check-v9_12-v9_11' into 'v9_11'
Evan Hunt [Fri, 2 Mar 2018 20:02:52 +0000 (12:02 -0800)] 
Merge branch '124-revert-deadlock-check-v9_12-v9_11' into 'v9_11'

revert cname loop test due to effects on apex CNAMEs under insecure delegations

See merge request isc-projects/bind9!95

8 years agotemporarily revert change #4859
Evan Hunt [Fri, 2 Mar 2018 19:30:02 +0000 (11:30 -0800)] 
temporarily revert change #4859

(cherry picked from commit 84ec07999f66c8f639337e08aacbef2274d1d30b)

8 years agoMerge branch 'fix-fetchlimit-v9_11' into 'v9_11'
Michał Kępień [Thu, 1 Mar 2018 14:40:57 +0000 (15:40 +0100)] 
Merge branch 'fix-fetchlimit-v9_11' into 'v9_11'

Improve failure logging in fetchlimit system test

See merge request isc-projects/bind9!81

8 years agorevise soft limit test
Evan Hunt [Mon, 26 Feb 2018 21:10:44 +0000 (13:10 -0800)] 
revise soft limit test

- don't bail out of the loop if clients are exceeded, just count incidents
- verbosely describe expectations and results

(cherry picked from commit 86838b2a028146142602348285a6b2f89084df80)

8 years agoMerge branch '118-bind-9-10-cookie-system-test-failing-v9_11' into 'v9_11'
Michał Kępień [Thu, 1 Mar 2018 13:15:55 +0000 (14:15 +0100)] 
Merge branch '118-bind-9-10-cookie-system-test-failing-v9_11' into 'v9_11'

Fix cookie system test for BIND 9.10

See merge request isc-projects/bind9!84

8 years agoremove unnecessary copy_setports calls
Mark Andrews [Tue, 27 Feb 2018 23:28:03 +0000 (10:28 +1100)] 
remove unnecessary copy_setports calls

(cherry picked from commit d4040783f4e6d2c181318eefc08d0305de63b421)

8 years agoMerge branch '122-bind-9-10-nsupdate-system-test-fails-v9_11' into 'v9_11'
Michał Kępień [Thu, 1 Mar 2018 12:55:33 +0000 (13:55 +0100)] 
Merge branch '122-bind-9-10-nsupdate-system-test-fails-v9_11' into 'v9_11'

Fix nsupdate system test for BIND < 9.12

See merge request isc-projects/bind9!89

8 years agoremove unsupported command line argument (-4) from nsupdate call
Mark Andrews [Thu, 1 Mar 2018 05:44:03 +0000 (16:44 +1100)] 
remove unsupported command line argument (-4) from nsupdate call

(cherry picked from commit ac3d2a0ed9384610288e20565f36acbaa6f7c40b)

8 years agoMerge branch '121-views-system-test-has-wrong-test-strings-for-reload-completion...
Michał Kępień [Wed, 28 Feb 2018 13:56:25 +0000 (14:56 +0100)] 
Merge branch '121-views-system-test-has-wrong-test-strings-for-reload-completion-v9_11' into 'v9_11'

Resolve "views system test has wrong test strings for reload completion."

Closes #121

See merge request isc-projects/bind9!88

8 years agowait for 'all zones loaded' rather than 'reloading zones succeeded' which just indica...
Mark Andrews [Wed, 28 Feb 2018 06:14:30 +0000 (17:14 +1100)] 
wait for 'all zones loaded' rather than 'reloading zones succeeded' which just indicates that everything kicked off ok

(cherry picked from commit 4cb0873a0a44f3b6b6c99e9de5aea10b60d7eb2c)

8 years agoMerge branch '113-minor-testsummary.sh-improvements-v9_11' into 'v9_11'
Evan Hunt [Tue, 27 Feb 2018 18:04:24 +0000 (10:04 -0800)] 
Merge branch '113-minor-testsummary.sh-improvements-v9_11' into 'v9_11'

Minor testsummary.sh improvements (handling colored output, failure summary)

Closes #113

See merge request isc-projects/bind9!80

8 years agoDo not destroy systests.output if there are no test.output files
Evan Hunt [Mon, 26 Feb 2018 18:37:08 +0000 (10:37 -0800)] 
Do not destroy systests.output if there are no test.output files

(cherry picked from commit 38940619c632e7e67c7c34cd3c7ec0cc9ae329f9)

8 years agoUse echoinfo for printing test summary
Michał Kępień [Tue, 27 Feb 2018 08:46:22 +0000 (09:46 +0100)] 
Use echoinfo for printing test summary

This ensures testsummary.sh is consistent with other scripts belonging
to the test framework.

(cherry picked from commit 642e20db8a083cb9ce0e736d217b63fae599b7f0)

8 years agoMake testsummary.sh print a list of failed system tests
Michał Kępień [Thu, 22 Feb 2018 13:50:02 +0000 (14:50 +0100)] 
Make testsummary.sh print a list of failed system tests

Print a list of failed system tests, if any, below the system test
summary to avoid the need to manually search through the test log.

(cherry picked from commit 28068857e75482848b67f3d06cb5f336d4cfd9d0)

8 years agoTweak the regular expression used for extracting system test results
Michał Kępień [Thu, 22 Feb 2018 13:07:17 +0000 (14:07 +0100)] 
Tweak the regular expression used for extracting system test results

The current regular expression used for extracting system test results
from systests.output, "^R:", is anchored at the start of a line, which
prevents colored system test output from being properly processed.  As
just "R:" would arguably be too general, extend the pattern a bit to
ensure it will only match lines containing system test results.

(cherry picked from commit 9006d6dbbdad0bd2969c401e1e6bb468ffc85324)

8 years agoMerge branch 'test-output-v9_11' into 'v9_11'
Evan Hunt [Tue, 27 Feb 2018 17:52:12 +0000 (09:52 -0800)] 
Merge branch 'test-output-v9_11' into 'v9_11'

Clean up test output

See merge request isc-projects/bind9!66

8 years agoclean up test output
Evan Hunt [Sat, 24 Feb 2018 08:48:50 +0000 (00:48 -0800)] 
clean up test output

- removed a few remaing places where output wasn't being passed
  through echo_i or cat_i
- added a "digcomp" function to conf.sh.in to send digcomp.pl output
  through cat_i and return the correct exit value
- set SYSTESTDIR when calling echo_i from nsX directories, so that
  the test name will always be printed correctly
- fixed a test name typo in conf.sh.in

(cherry picked from commit 0e52fbd0b38b4a0dfc56915c821046325b87497d)

8 years agoMerge branch '98-add-util-git-replay-merge.sh-v9_11' into 'v9_11'
Michał Kępień [Tue, 27 Feb 2018 09:43:53 +0000 (10:43 +0100)] 
Merge branch '98-add-util-git-replay-merge.sh-v9_11' into 'v9_11'

Put git-replay-merge in source tree

Closes #98

See merge request isc-projects/bind9!83

8 years agoAdd util/git-replay-merge.sh
Michał Kępień [Tue, 27 Feb 2018 09:22:44 +0000 (10:22 +0100)] 
Add util/git-replay-merge.sh

git-replay-merge.sh is a script whose purpose is to make backporting
merge requests more convenient by automating the process as much as
possible.

For more information, including usage examples, see:

    https://gitlab.isc.org/isc-projects/bind9/wikis/Backporting-a-Merge-Request

(cherry picked from commit f7fe1e30987ae659d524da4600f79960af7f2259)

8 years agoMerge branch '112-fix-mx-checks-for-dynamic-updates-v9_12-v9_11' into 'v9_11'
Evan Hunt [Mon, 26 Feb 2018 23:17:56 +0000 (15:17 -0800)] 
Merge branch '112-fix-mx-checks-for-dynamic-updates-v9_12-v9_11' into 'v9_11'

Fix MX checks for dynamic updates

Closes #112

See merge request isc-projects/bind9!79

8 years agoAdd CHANGES entry
Michał Kępień [Mon, 26 Feb 2018 12:26:45 +0000 (13:26 +0100)] 
Add CHANGES entry

4903. [bug] "check-mx fail;" did not prevent MX records containing
IP addresses from being added to a zone by a dynamic
update. [GL #112]

(cherry picked from commit 1d403f9d3c09960fc443f33bd89d2645f1994b3b)
(cherry picked from commit 71a35bc8e58cdb210ebf29ed49ce9edf645f1f45)

8 years agoFix MX checks for dynamic updates
Michał Kępień [Mon, 26 Feb 2018 11:30:48 +0000 (12:30 +0100)] 
Fix MX checks for dynamic updates

The check_mx() function in lib/ns/update.c incorrectly tests whether the
DNS_RDATA_CHECKMX/DNS_RDATA_CHECKMXFAIL flags are set for each applied
MX record update as these flags are never set in code paths related to
dynamic updates; they can only be set when loading a zone from a master
file (DNS_ZONEOPT_CHECKMX -> DNS_MASTER_CHECKMX -> DNS_RDATA_CHECKMX).
This flaw allows MX records containing IP addresses to be added to a
zone even when "check-mx fail;" is used.

Ensure correct behavior by modifying the relevant tests in check_mx() so
that they use DNS_ZONEOPT_CHECKMX/DNS_ZONEOPT_CHECKMXFAIL instead.

(cherry picked from commit 857a40c87bb80669ecc5cf1c51301d967e7aba53)
(cherry picked from commit 590f092e00384fd897cdef5ac75940bf727f97a3)

8 years agoMerge branch 'check-for-test-interfaces-before-running-system-tests-v9_11' into ...
Evan Hunt [Mon, 26 Feb 2018 23:10:27 +0000 (15:10 -0800)] 
Merge branch 'check-for-test-interfaces-before-running-system-tests-v9_11' into 'v9_11'

Check for test interfaces before running system tests

See merge request isc-projects/bind9!19

8 years agotest interfaces directly in runall.sh and parallel.mk
Evan Hunt [Sat, 24 Feb 2018 20:35:17 +0000 (12:35 -0800)] 
test interfaces directly in runall.sh and parallel.mk

(cherry picked from commit a8b583e78ba2bda07953ba94ddd7d4128dba8a20)

8 years agoCheck for test interfaces before running system tests
Michał Kępień [Thu, 25 Jan 2018 14:26:27 +0000 (15:26 +0100)] 
Check for test interfaces before running system tests

Prevent runall.sh and "make test" from even attempting to run system
tests when "ifconfig.sh up" has not been run beforehand.  This ensures
the user is not flooded with error messages in such a case.

(cherry picked from commit e0221f2d25a88fb0025070ef35463288114048ea)

8 years agoadd missing CHANGES note
Evan Hunt [Mon, 26 Feb 2018 23:08:16 +0000 (15:08 -0800)] 
add missing CHANGES note

8 years agoMerge branch '66-ixfr-system-test-fails-intermittently-v9_11' into 'v9_11'
Evan Hunt [Mon, 26 Feb 2018 23:00:03 +0000 (15:00 -0800)] 
Merge branch '66-ixfr-system-test-fails-intermittently-v9_11' into 'v9_11'

chg: dev: Improved the reliability of the 'ixfr' system test. [GL #66]

Closes #66

See merge request isc-projects/bind9!67

8 years agowait for synchronization; re-notify slave if the transfer doesn't happen
Evan Hunt [Wed, 21 Feb 2018 06:09:54 +0000 (17:09 +1100)] 
wait for synchronization; re-notify slave if the transfer doesn't happen

(cherry picked from commit 67a8b5ec17b7f252cc96ba11935beb898dd211d6)

8 years agoMerge branch '51-fix-cppcheck-detected-source-code-errors-v9_11' into 'v9_11'
Mark Andrews [Sun, 25 Feb 2018 23:45:39 +0000 (10:45 +1100)] 
Merge branch '51-fix-cppcheck-detected-source-code-errors-v9_11' into 'v9_11'

Resolve "Fix cppcheck-detected source code errors"

Closes #51

See merge request isc-projects/bind9!46

8 years agominor cleanup and addressed a sprintf format warning
Evan Hunt [Sun, 25 Feb 2018 01:55:24 +0000 (17:55 -0800)] 
minor cleanup and addressed a sprintf format warning

(cherry picked from commit ab0fe63f071de06d201961151c93bdb5d4ad9b73)

8 years agoupdate printf format to match type
Mark Andrews [Tue, 20 Feb 2018 02:09:58 +0000 (13:09 +1100)] 
update printf format to match type

(cherry picked from commit 48ca11df5fd8bb95f7fb0dc214b9509dc5b39078)

8 years agoimprove the conditional declaration and use of variable to silence cppcheck
Mark Andrews [Tue, 20 Feb 2018 02:08:08 +0000 (13:08 +1100)] 
improve the conditional declaration and use of variable to silence cppcheck

(cherry picked from commit a04bb76973e5d30d0ec7cc268eaa8db2a91934e6)

8 years agoremove deadcode
Mark Andrews [Tue, 20 Feb 2018 02:04:58 +0000 (13:04 +1100)] 
remove deadcode

(cherry picked from commit b71a1386ed197d97852df604115ca1d2cafef067)

8 years agosilence unread assignment warning by using POST macro
Mark Andrews [Tue, 20 Feb 2018 01:57:29 +0000 (12:57 +1100)] 
silence unread assignment warning by using POST macro

(cherry picked from commit e8249dcd49296c408c9358c05f3a969b81634e65)

8 years agoupdate the sscanf format strings so they match the pointer types
Mark Andrews [Tue, 20 Feb 2018 01:54:55 +0000 (12:54 +1100)] 
update the sscanf format strings so they match the pointer types

(cherry picked from commit 70d192eb97b532c3a06529324e48cf3ea5f55e22)

8 years agoredefine CHECK so cppcheck see the definition
Mark Andrews [Tue, 20 Feb 2018 01:53:27 +0000 (12:53 +1100)] 
redefine CHECK so cppcheck see the definition

(cherry picked from commit a4186b18672e6698d42aec3a5dd68a3b289c55ec)

8 years agoremove unused struct dst_context declaration
Mark Andrews [Tue, 20 Feb 2018 01:51:16 +0000 (12:51 +1100)] 
remove unused struct dst_context declaration

(cherry picked from commit f2c22662cc9de5c9be4ec03c7248e177eec26487)

8 years agoconditionally typedef fstrmtable
Mark Andrews [Tue, 20 Feb 2018 01:48:29 +0000 (12:48 +1100)] 
conditionally typedef fstrmtable

(cherry picked from commit dcd309bea1a1e8029512d0d1045d2734215d88e1)

8 years agoadjust goto target and conditional compilation so that cleanup_spillattimer and clean...
Mark Andrews [Tue, 20 Feb 2018 01:46:35 +0000 (12:46 +1100)] 
adjust goto target and conditional compilation so that cleanup_spillattimer and cleanup_alglock labels match the element to be cleanup and so that they are always used

(cherry picked from commit 7b27be54ee9a97ef8caadb08ac6dec0966bdffcb)

8 years agoMerge branch 'upforwd-error-v9_11' into 'v9_11'
Evan Hunt [Sun, 25 Feb 2018 21:56:04 +0000 (13:56 -0800)] 
Merge branch 'upforwd-error-v9_11' into 'v9_11'

Resolve "upforwd test error"

See merge request isc-projects/bind9!72

8 years agofixed an upforwd test error.
Evan Hunt [Sun, 25 Feb 2018 21:43:14 +0000 (13:43 -0800)] 
fixed an upforwd test error.

(cherry picked from commit 54e010d51e18c38455e793565f1716227e77ee94)

8 years agoMerge branch 'tidy-runall.sh-environment-variables-v9_11' into 'v9_11'
Evan Hunt [Sun, 25 Feb 2018 01:37:44 +0000 (17:37 -0800)] 
Merge branch 'tidy-runall.sh-environment-variables-v9_11' into 'v9_11'

Tidy runall.sh environment variables

See merge request isc-projects/bind9!18

8 years agoPreserve values of environment variables which are already set
Michał Kępień [Wed, 21 Feb 2018 13:59:38 +0000 (14:59 +0100)] 
Preserve values of environment variables which are already set

This enables the environment variables controlling run.sh behavior to be
permanently set in a working environment (e.g. to automatically force
colored output without using "-c" in each runall.sh invocation).

Relevant runall.sh command line arguments still have a higher priority.

(cherry picked from commit d989d20fe526716c774357ff372b38995e1e5065)

8 years agoAllow forcing colored system test output
Michał Kępień [Wed, 21 Feb 2018 13:59:35 +0000 (14:59 +0100)] 
Allow forcing colored system test output

As parallel.mk and runsequential.sh both pipe system test output through
"tee" (for the purpose of creating test.output), run.sh invoked from
these two files detects it is not writing to a terminal, which prevents
colored output from being generated.  Allow forcing colored output using
a new command line argument for runall.sh, "-c", which sets an
environment variable (SYSTEMTEST_FORCE_COLOR) causing conf.sh to
unconditionally enable colored output.

The same environment variable can also be used directly to force colored
output when using "make test" instead of runall.sh.

(cherry picked from commit a324031a82a2b312d8f803040dd81eadb554785f)

8 years agoAllow retaining system test output using an environment variable
Michał Kępień [Wed, 21 Feb 2018 13:59:33 +0000 (14:59 +0100)] 
Allow retaining system test output using an environment variable

Instead of exporting an environment variable containing a command line
argument (NOCLEAN="-n"), extend run.sh to handle a "boolean" environment
variable (SYSTEMTEST_NO_CLEAN) itself.  The former method is buggy
because the value of NOCLEAN is set in parallel.mk when that file is
first created, but it is not subsequently updated upon each test run
(because make considers parallel.mk to be up to date).

To retain backward compatibility, the "-n" command line argument for
run.sh is still supported (and has a higher priority than the relevant
environment variable).

The SYSTEMTEST_NO_CLEAN environment variable can also be used directly
to prevent cleanup when using "make test" instead of runall.sh.

Apart from fixing a bug, this simplifies the way runall.sh controls
run.sh behavior due to the Makefile being bypassed.  Direct processing
of environment variables in run.sh is more scalable in the long run,
given that the previously utilized technique, even with its
implementation fixed, would still require Makefile.in to be modified in
two places each time a new flag needed to be passed from runall.sh to
run.sh.

(cherry picked from commit 3862043879534542a75e40d5e6c0cc09f37f8d6b)

8 years agoMerge branch '71-xfer-system-test-fails-intermittently-v9_12-v9_11' into 'v9_11'
Evan Hunt [Sat, 24 Feb 2018 09:46:54 +0000 (01:46 -0800)] 
Merge branch '71-xfer-system-test-fails-intermittently-v9_12-v9_11' into 'v9_11'

chg: dev: Improve the resilience of the xfer system test, which could be flaky under load.

Closes #71

See merge request isc-projects/bind9!61

8 years agoimprove reliability of xfer test
Evan Hunt [Fri, 23 Feb 2018 08:00:09 +0000 (00:00 -0800)] 
improve reliability of xfer test

(cherry picked from commit 5d7d6881a18de57f2c151ef4c58fb3a4fdc2597a)
(cherry picked from commit 09a1a261dc5c8e1f90a5a1f53078ea0796c3466a)

8 years agoMerge branch 'kyua-oot-v9_11' into 'v9_11'
Evan Hunt [Fri, 23 Feb 2018 23:50:35 +0000 (15:50 -0800)] 
Merge branch 'kyua-oot-v9_11' into 'v9_11'

chg: dev: Unit tests were broken in out-of-tree builds.

See merge request isc-projects/bind9!57

8 years agounit/unittest.sh is generated by configure. It will always be
Petr Menšík [Thu, 22 Feb 2018 14:32:16 +0000 (15:32 +0100)] 
unit/unittest.sh is generated by configure. It will always be
 generated into builddir. If out-of-tree build is used, make unit
will always fail. Kyuafiles and testdata still have to be copied
manually into the builddir.

(cherry picked from commit 95cde3608aab9e1e4025d5a73fa2c602b3082ea1)

8 years agoMerge branch 'master-v9_12-v9_11' into 'v9_11'
Evan Hunt [Fri, 23 Feb 2018 21:52:49 +0000 (13:52 -0800)] 
Merge branch 'master-v9_12-v9_11' into 'v9_11'

Code cleanups

See merge request isc-projects/bind9!36

8 years agoReduce repeated detection of mysql lib directory.
Petr Menšík [Thu, 15 Feb 2018 11:48:56 +0000 (12:48 +0100)] 
Reduce repeated detection of mysql lib directory.
Use common part once a bit later.

(cherry picked from commit 2a70eae04f901e13df814fc8b67b030d46cf90c6)
(cherry picked from commit d04af522226717c5d72271726446659ca87846e4)

8 years agoReuse new function from rt46864 for similar block elsewhere.
Petr Menšík [Wed, 17 Jan 2018 18:43:12 +0000 (19:43 +0100)] 
Reuse new function from rt46864 for similar block elsewhere.

(cherry picked from commit e7a93321f095c8a2018df253a38bd1fc40d639cd)
(cherry picked from commit cb98ce8e676990807184e21139d5bf2a63c1890b)

8 years agoMerge branch '95-fix-dyndb-v9_11' into 'v9_11'
Evan Hunt [Fri, 23 Feb 2018 21:44:57 +0000 (13:44 -0800)] 
Merge branch '95-fix-dyndb-v9_11' into 'v9_11'

Resolve "dyndb system test fails intermittently"

Closes #95

See merge request isc-projects/bind9!63

8 years agoimprove dyndb test resilience
Evan Hunt [Fri, 23 Feb 2018 18:08:51 +0000 (10:08 -0800)] 
improve dyndb test resilience

- no longer grep for specific line numbers when checking
  parameter logging, as those can change
- report the failure immediatey if parameter check fails

(cherry picked from commit 749df056be9972acb0d6691c63425ba61f9bcb90)

8 years agoMerge branch '91-parallel-tests-v9_12-v9_11' into 'v9_11'
Evan Hunt [Fri, 23 Feb 2018 21:34:45 +0000 (13:34 -0800)] 
Merge branch '91-parallel-tests-v9_12-v9_11' into 'v9_11'

chg: dev: Convert most of the remaining system tests to be able to run in parallel [GL #91]

Closes #91

See merge request isc-projects/bind9!59

8 years agotidying up after backport
Evan Hunt [Fri, 23 Feb 2018 21:28:47 +0000 (13:28 -0800)] 
tidying up after backport

8 years agoimprove reliability of the xfer test on slow systems
Evan Hunt [Fri, 23 Feb 2018 02:34:16 +0000 (18:34 -0800)] 
improve reliability of the xfer test on slow systems

- lengthed the wait loop for the transfers to complete

(cherry picked from commit b9246ce7731f6a69a1e90d2c8b004d0153e7043a)
(cherry picked from commit a5015d7791119abf3bfff20a433efd65e6cae3c3)

8 years agoremove v6synth
Evan Hunt [Thu, 22 Feb 2018 07:26:33 +0000 (23:26 -0800)] 
remove v6synth

- this was a test for the allow-v6-synthesis option, which was
  deprecated and no longer works. the test was removed
  from conf.sh.in long ago.

(cherry picked from commit 474b10a133faabaedeea201b96b42d87c4222f22)
(cherry picked from commit 79718736399653aa1a8472a09dbe2dd6d4fbed91)

8 years agoremoved some unnecessary greps
Evan Hunt [Thu, 22 Feb 2018 05:19:00 +0000 (21:19 -0800)] 
removed some unnecessary greps

(cherry picked from commit 731ad28be2a0a9705da2357d1051dad246dd8467)
(cherry picked from commit 17245b86d5a4fbbf6826214166f6417d099761e5)

8 years agoreorder tests to get better use of parallelism
Evan Hunt [Thu, 22 Feb 2018 08:39:08 +0000 (00:39 -0800)] 
reorder tests to get better use of parallelism

(cherry picked from commit 56e440f65f72939a79df92aeed21213155923602)
(cherry picked from commit 4429f8b2915515ed91d38f7b92b6e73ce61fd635)

8 years agoparallelize most system tests
Evan Hunt [Tue, 20 Feb 2018 23:43:27 +0000 (15:43 -0800)] 
parallelize most system tests

(cherry picked from commit c032c54dda2d75c0ec68017e1331bc9880c03ae1)
(cherry picked from commit 2b81f322cb499abd1164175a3767751aba7fec60)

8 years agoFixups after merge of branch 'rt46602-v9_11' into 'v9_11'
Stephen Morris [Thu, 22 Feb 2018 15:41:04 +0000 (15:41 +0000)] 
Fixups after merge of branch 'rt46602-v9_11' into 'v9_11'

8 years agoMerge branch 'rt46602-v9_11' into 'v9_11'
Stephen Morris [Thu, 22 Feb 2018 11:18:39 +0000 (11:18 +0000)] 
Merge branch 'rt46602-v9_11' into 'v9_11'

Allow parallel run of system tests

See merge request isc-projects/bind9!7

8 years ago[rt46602] Update CHANGES for parallel tests
Stephen Morris [Fri, 16 Feb 2018 18:17:21 +0000 (18:17 +0000)] 
[rt46602] Update CHANGES for parallel tests

(cherry picked from commit dbf753b52d7ce1c94f2157eb6b18684910b5eaa4)

8 years ago[rt46602] Changes to get tests running on Windows
Stephen Morris [Fri, 26 Jan 2018 19:42:57 +0000 (19:42 +0000)] 
[rt46602] Changes to get tests running on Windows

1. Track changes to conf.sh.in in conf.sh.win32
2. Modifications to prevent Windows "Configure" script replacing
   the sed "@PORT@" substitution tokens in conf.sh.win32.
3. runall.sh now runs Windows tests sequentially

(cherry picked from commit 7bb9a97904f1ecb1101f5bd4ed140c6d0b0f1634)

8 years ago[rt46602] Miscellaneous changes to fix rebase issues
Stephen Morris [Thu, 15 Feb 2018 15:58:38 +0000 (15:58 +0000)] 
[rt46602] Miscellaneous changes to fix rebase issues

(cherry picked from commit 7222c9fc76c2c6bdfc8bfa34ae650f4f47932c58)

8 years ago[rt46602] Change name of shell variable holding current test directory
Stephen Morris [Thu, 15 Feb 2018 15:55:57 +0000 (15:55 +0000)] 
[rt46602] Change name of shell variable holding current test directory

It was TESTNAME, but this is an obvious name and was used in one of
the system tests, something that interfered with the content of
progress messages.  It is now SYSTESTDIR.

(cherry picked from commit 30cd931a0d52744762472bfe7f1582bcf12bd6bf)

8 years ago[rt46602] Export environment variables in a portable manner
Michał Kępień [Mon, 29 Jan 2018 11:33:33 +0000 (12:33 +0100)] 
[rt46602] Export environment variables in a portable manner

(cherry picked from commit 2c519531a704f3ff8a59520b24c9571222e205b6)

8 years ago[rt46602] Sanitize test names to fix "make check" on Solaris
Michał Kępień [Mon, 29 Jan 2018 11:08:41 +0000 (12:08 +0100)] 
[rt46602] Sanitize test names to fix "make check" on Solaris

(cherry picked from commit e005fb948d367ea7ae06c9337a243664460be3e8)

8 years ago[rt46602] Add .gitignore file for catz
Stephen Morris [Fri, 26 Jan 2018 19:37:43 +0000 (19:37 +0000)] 
[rt46602] Add .gitignore file for catz

(cherry picked from commit 3dfb7c17ebba5629e082e7e69f9a879d33b89995)

8 years ago[rt46602] Pass noclean option to Makefile via exported variable
Stephen Morris [Fri, 26 Jan 2018 19:41:47 +0000 (19:41 +0000)] 
[rt46602] Pass noclean option to Makefile via exported variable

(cherry picked from commit 59d88ee192669689374e880c52227b335e622e15)

8 years ago[rt46602] Mention conf.sh.win32 in instructions for adding a test.
Stephen Morris [Fri, 26 Jan 2018 19:40:12 +0000 (19:40 +0000)] 
[rt46602] Mention conf.sh.win32 in instructions for adding a test.

(cherry picked from commit 23dfa27a84f6c724853fcad3f4a0222e2b02fd1f)

8 years ago[rt46602] Fix various typos, formatting issues and stylistic nits
Michał Kępień [Thu, 25 Jan 2018 11:29:31 +0000 (12:29 +0100)] 
[rt46602] Fix various typos, formatting issues and stylistic nits

(cherry picked from commit f0721de624b8134bfd7148be1034e68a4695e276)

8 years ago[rt46602] Remove redundant variable assignment
Michał Kępień [Thu, 25 Jan 2018 11:23:32 +0000 (12:23 +0100)] 
[rt46602] Remove redundant variable assignment

(cherry picked from commit 42cf18d239c48bd0d86325623c8bb20263f4b8d3)

8 years ago[rt46602] named.port is no longer created by setup.sh for allow_query
Michał Kępień [Thu, 25 Jan 2018 12:57:01 +0000 (13:57 +0100)] 
[rt46602] named.port is no longer created by setup.sh for allow_query

(cherry picked from commit 1ac4c3e4e586a72af47daf0bbb08249b8ce9af91)