Commit Graph

24335 Commits

Author SHA1 Message Date
Mark Andrews
83990e9bdc wait for 'all zones loaded' rather than 'reloading zones succeeded' which just indicates that everything kicked off ok
(cherry picked from commit 4cb0873a0a)
2018-02-28 14:57:19 +01:00
Evan Hunt
0e91065b57 Merge branch '113-minor-testsummary.sh-improvements-v9_9' into 'v9_9'
Minor testsummary.sh improvements (handling colored output, failure summary)

Closes #113

See merge request isc-projects/bind9!80
2018-02-27 10:04:37 -08:00
Evan Hunt
be98afaecf Do not destroy systests.output if there are no test.output files
(cherry picked from commit 38940619c6)
2018-02-27 10:04:37 -08:00
Michał Kępień
d241bf9d4c Use echoinfo for printing test summary
This ensures testsummary.sh is consistent with other scripts belonging
to the test framework.

(cherry picked from commit 642e20db8a)
2018-02-27 10:04:37 -08:00
Michał Kępień
b18292a208 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 28068857e7)
2018-02-27 10:04:36 -08:00
Michał Kępień
1709486103 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 9006d6dbbd)
2018-02-27 10:04:36 -08:00
Evan Hunt
91725c199f Merge branch 'test-output-v9_11-v9_10-v9_9' into 'v9_9'
Clean up test output

See merge request isc-projects/bind9!66
2018-02-27 10:03:23 -08:00
Evan Hunt
92c9e7c045 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 0e52fbd0b3)
(cherry picked from commit d57e8f6df3)
(cherry picked from commit 053c06d5e1)
2018-02-27 10:03:21 -08:00
Michał Kępień
56cb381518 Merge branch '98-add-util-git-replay-merge.sh-v9_9' into 'v9_9'
Put git-replay-merge in source tree

Closes #98

See merge request isc-projects/bind9!83
2018-02-27 10:45:08 +01:00
Michał Kępień
9063b31f49 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 f7fe1e3098)
2018-02-27 10:45:08 +01:00
Evan Hunt
4cb037a6e2 Merge branch '112-fix-mx-checks-for-dynamic-updates-v9_9' into 'v9_9'
Fix MX checks for dynamic updates

Closes #112

See merge request isc-projects/bind9!79
2018-02-26 15:20:49 -08:00
Michał Kępień
309e2aebae 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 1d403f9d3c)
2018-02-26 15:20:26 -08:00
Michał Kępień
d86a7dbe69 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 857a40c87b)
2018-02-26 15:20:06 -08:00
Evan Hunt
cdf3f823bb Merge branch 'check-for-test-interfaces-before-running-system-tests-v9_9' into 'v9_9'
Check for test interfaces before running system tests

See merge request isc-projects/bind9!19
2018-02-26 15:10:40 -08:00
Evan Hunt
699fffc34f test interfaces directly in runall.sh and parallel.mk
(cherry picked from commit a8b583e78b)
2018-02-26 15:10:40 -08:00
Michał Kępień
98b3b5bba7 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 e0221f2d25)
2018-02-26 15:10:40 -08:00
Evan Hunt
5353168bb7 Merge branch '66-ixfr-system-test-fails-intermittently-v9_9' into 'v9_9'
chg: dev: Improved the reliability of the 'ixfr' system test. [GL #66]

Closes #66

See merge request isc-projects/bind9!67
2018-02-26 15:03:05 -08:00
Evan Hunt
8c6e4b205c wait for synchronization; re-notify slave if the transfer doesn't happen
(cherry picked from commit 67a8b5ec17)
2018-02-26 15:03:03 -08:00
Evan Hunt
8668c2eeab Merge branch 'fix-merge' into v9_9 2018-02-25 23:08:18 -08:00
Evan Hunt
7124e34835 Fix merge error 2018-02-25 23:07:38 -08:00
Mark Andrews
56202244de Merge branch '51-fix-cppcheck-detected-source-code-errors-v9_10-v9_9' into 'v9_9'
Resolve "Fix cppcheck-detected source code errors"

Closes #51

See merge request isc-projects/bind9!46
2018-02-26 10:58:19 +11:00
Mark Andrews
7d459e36be update printf format to match type
(cherry picked from commit 48ca11df5f)
(cherry picked from commit 9a0373b896)
2018-02-26 10:58:11 +11:00
Mark Andrews
6d2ddd3c49 improve the conditional declaration and use of variable to silence cppcheck
(cherry picked from commit a04bb76973)
(cherry picked from commit 8e046acb50)
2018-02-26 10:58:09 +11:00
Mark Andrews
5ef8b93129 remove deadcode
(cherry picked from commit b71a1386ed)
(cherry picked from commit 0beff002bd)
2018-02-26 10:54:19 +11:00
Mark Andrews
e76df9d04f silence unread assignment warning by using POST macro
(cherry picked from commit e8249dcd49)
(cherry picked from commit cdb6c5c106)
2018-02-26 10:54:19 +11:00
Mark Andrews
750467e284 update the sscanf format strings so they match the pointer types
(cherry picked from commit 70d192eb97)
(cherry picked from commit 06b7a4397a)
2018-02-26 10:54:19 +11:00
Mark Andrews
d65c60d894 redefine CHECK so cppcheck see the definition
(cherry picked from commit a4186b1867)
(cherry picked from commit d17558a874)
2018-02-26 10:54:18 +11:00
Mark Andrews
9d0effb471 remove unused struct dst_context declaration
(cherry picked from commit f2c22662cc)
(cherry picked from commit 00799ab805)
2018-02-26 10:54:18 +11:00
Mark Andrews
7c3734f920 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 7b27be54ee)
(cherry picked from commit 981d548a66)
2018-02-26 10:54:18 +11:00
Evan Hunt
8f4610f773 Merge branch 'tidy-runall.sh-environment-variables-v9_11-v9_10-v9_9' into 'v9_9'
Tidy runall.sh environment variables

See merge request isc-projects/bind9!18
2018-02-25 13:34:35 -08:00
Michał Kępień
1f42e865d2 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 d989d20fe5)
(cherry picked from commit 2cd174dda9)
(cherry picked from commit fdcac29f63)
2018-02-25 13:34:35 -08:00
Michał Kępień
a7ae215925 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 a324031a82)
(cherry picked from commit cbebf7ef59)
(cherry picked from commit 2f3b3b7aff)
2018-02-25 13:34:35 -08:00
Michał Kępień
fcefc77d35 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 3862043879)
(cherry picked from commit e9c4dbe361)
(cherry picked from commit 0e3840e4b4)
2018-02-25 13:34:35 -08:00
Evan Hunt
812c83f876 Merge branch '71-xfer-system-test-fails-intermittently-v9_12-v9_11-v9_10-v9_9' into 'v9_9'
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
2018-02-25 13:34:23 -08:00
Evan Hunt
8315e76561 improve reliability of xfer test
(cherry picked from commit 5d7d6881a1)
(cherry picked from commit 09a1a261dc)
(cherry picked from commit 948bd83ce5)
(cherry picked from commit 4160936c92)
2018-02-25 13:34:23 -08:00
Evan Hunt
99db49b439 Merge branch 'parallel-v9_9' into v9_9
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
2018-02-25 13:29:36 -08:00
Evan Hunt
7677cb277a final cleanup
- add CHANGES note
- update copyrights and license headers
2018-02-25 13:13:26 -08:00
Evan Hunt
ae6c141f7b tidying up after backport
(cherry picked from commit 854f7846d8)
(cherry picked from commit 6653dcab3d)
2018-02-25 13:10:00 -08:00
Evan Hunt
b65aa505e6 improve reliability of the xfer test on slow systems
- lengthened the wait loop for the transfers to complete

(cherry picked from commit b9246ce773)
(cherry picked from commit a5015d7791)
(cherry picked from commit c369fc06ca)
(cherry picked from commit 6a5092f537)
2018-02-25 11:19:26 -08:00
Evan Hunt
37d6f7b624 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 474b10a133)
(cherry picked from commit 7971873639)
(cherry picked from commit 626566c72d)
(cherry picked from commit 62f239f5cf)
2018-02-25 11:19:07 -08:00
Evan Hunt
87c7455b4c removed some unnecessary greps
(cherry picked from commit 731ad28be2)
(cherry picked from commit 17245b86d5)
(cherry picked from commit 350f18b0d1)
(cherry picked from commit 539be337d9)
2018-02-25 11:19:05 -08:00
Evan Hunt
a236a1e2b4 reorder tests to get better use of parallelism
(cherry picked from commit 56e440f65f)
(cherry picked from commit 4429f8b291)
(cherry picked from commit fa8740feda)
(cherry picked from commit 438dcd9f9c)
2018-02-25 11:18:48 -08:00
Evan Hunt
f8fe59f279 parallelize most system tests
(cherry picked from commit c032c54dda)
(cherry picked from commit 2b81f322cb)
(cherry picked from commit 167fa161d1)
(cherry picked from commit 1f297d33a0)
2018-02-25 11:17:55 -08:00
Evan Hunt
29e7466e04 Merge branch 'rt46602-v9_11-v9_10-v9_9' into v9_9
Allow parallel run of system tests

See merge request isc-projects/bind9!7
2018-02-25 09:41:59 -08:00
Stephen Morris
f5a3bd48d4 [rt46602] Update CHANGES for parallel tests
(cherry picked from commit dbf753b52d)
(cherry picked from commit 8aaa92693c)
(cherry picked from commit ee3d232d8e)
2018-02-25 09:33:29 -08:00
Stephen Morris
58c2522b85 [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 30cd931a0d)
(cherry picked from commit 78f2976087)
(cherry picked from commit 4a29e3ba65)
2018-02-25 09:28:46 -08:00
Michał Kępień
1240f51426 [rt46602] Export environment variables in a portable manner
(cherry picked from commit 2c519531a7)
(cherry picked from commit 747df7d66a)
(cherry picked from commit ddb84ca0af)
2018-02-25 09:28:46 -08:00
Michał Kępień
8945f29fb1 [rt46602] Sanitize test names to fix "make check" on Solaris
(cherry picked from commit e005fb948d)
(cherry picked from commit cfaeb55e8e)
(cherry picked from commit fac15bf973)
2018-02-25 09:28:46 -08:00
Stephen Morris
2ee63a76c0 [rt46602] Pass noclean option to Makefile via exported variable
(cherry picked from commit 59d88ee192)
(cherry picked from commit 0ae7e64829)
(cherry picked from commit 4fbaafa480)
2018-02-25 09:28:46 -08:00
Stephen Morris
2a24aac12e [rt46602] Mention conf.sh.win32 in instructions for adding a test.
(cherry picked from commit 23dfa27a84)
(cherry picked from commit 06a9a37d3b)
(cherry picked from commit d9740c20da)
2018-02-25 09:28:45 -08:00