Commit Graph

25322 Commits

Author SHA1 Message Date
Evan Hunt
90ae2fce20 final cleanup
- add CHANGES note
- update copyrights and license headers
2018-02-25 01:04:16 -08:00
Evan Hunt
6653dcab3d tidying up after backport
(cherry picked from commit 854f7846d8)
2018-02-25 01:04:16 -08:00
Evan Hunt
6a5092f537 improve reliability of the xfer test on slow systems
- lengthed the wait loop for the transfers to complete

(cherry picked from commit b9246ce773)
(cherry picked from commit a5015d7791)
(cherry picked from commit c369fc06ca)
2018-02-24 23:57:18 -08:00
Evan Hunt
62f239f5cf 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)
2018-02-24 23:57:06 -08:00
Evan Hunt
539be337d9 removed some unnecessary greps
(cherry picked from commit 731ad28be2)
(cherry picked from commit 17245b86d5)
(cherry picked from commit 350f18b0d1)
2018-02-24 23:56:54 -08:00
Evan Hunt
438dcd9f9c reorder tests to get better use of parallelism
(cherry picked from commit 56e440f65f)
(cherry picked from commit 4429f8b291)
(cherry picked from commit fa8740feda)
2018-02-24 23:56:37 -08:00
Evan Hunt
1f297d33a0 parallelize most system tests
(cherry picked from commit c032c54dda)
(cherry picked from commit 2b81f322cb)
(cherry picked from commit 167fa161d1)
2018-02-24 23:55:48 -08:00
Evan Hunt
f0dc9f4698 Merge branch 'rt46602-v9_11-v9_10' into 'v9_10'
Allow parallel run of system tests

See merge request isc-projects/bind9!7
2018-02-24 20:08:06 -08:00
Stephen Morris
ee3d232d8e [rt46602] Update CHANGES for parallel tests
(cherry picked from commit dbf753b52d)
(cherry picked from commit 8aaa92693c)
2018-02-24 20:04:42 -08:00
Stephen Morris
e954c0fa41 [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 7bb9a97904)
(cherry picked from commit c4f5d07c1c)
2018-02-24 20:04:41 -08:00
Stephen Morris
ffa41f6cd3 [rt46602] Miscellaneous changes to fix rebase issues
(cherry picked from commit 7222c9fc76)
(cherry picked from commit 3d4a425266)
2018-02-24 20:04:41 -08:00
Stephen Morris
4a29e3ba65 [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)
2018-02-24 19:53:34 -08:00
Michał Kępień
ddb84ca0af [rt46602] Export environment variables in a portable manner
(cherry picked from commit 2c519531a7)
(cherry picked from commit 747df7d66a)
2018-02-24 19:53:33 -08:00
Michał Kępień
fac15bf973 [rt46602] Sanitize test names to fix "make check" on Solaris
(cherry picked from commit e005fb948d)
(cherry picked from commit cfaeb55e8e)
2018-02-24 19:53:33 -08:00
Stephen Morris
4fbaafa480 [rt46602] Pass noclean option to Makefile via exported variable
(cherry picked from commit 59d88ee192)
(cherry picked from commit 0ae7e64829)
2018-02-24 19:53:32 -08:00
Stephen Morris
d9740c20da [rt46602] Mention conf.sh.win32 in instructions for adding a test.
(cherry picked from commit 23dfa27a84)
(cherry picked from commit 06a9a37d3b)
2018-02-24 19:53:32 -08:00
Michał Kępień
85f03bb30f [rt46602] Fix various typos, formatting issues and stylistic nits
(cherry picked from commit f0721de624)
(cherry picked from commit b40e75a75c)
2018-02-24 19:53:32 -08:00
Michał Kępień
90654248f6 [rt46602] Remove redundant variable assignment
(cherry picked from commit 42cf18d239)
(cherry picked from commit 4436930712)
2018-02-24 19:53:31 -08:00
Michał Kępień
2e3d58ad30 [rt46602] named.port is no longer created by setup.sh for allow_query
(cherry picked from commit 1ac4c3e4e5)
(cherry picked from commit 77e6ff0fae)
2018-02-24 19:53:31 -08:00
Michał Kępień
66985fad62 [rt46602] Consistently print usage for runall.sh to stderr
(cherry picked from commit fe1ccafc34)
(cherry picked from commit 47e278b7c9)
2018-02-24 19:53:30 -08:00
Michał Kępień
6d9fb2b429 [rt46602] Clean up getopts usage
Ensure case clauses are in sync with the string passed to getopts.
Remove catch-all clauses as they will never be evaluated.

(cherry picked from commit 0dcee1cad3)
(cherry picked from commit 0c8e56568f)
2018-02-24 19:53:30 -08:00
Michał Kępień
1adbfeb3ed [rt46602] Assign default values to variables set by command line options and consistently treat them as integers
(cherry picked from commit fe51c34df3)
(cherry picked from commit 3752edb28e)
2018-02-24 19:53:30 -08:00
Michał Kępień
01e21e3ee2 [rt46602] named.port cannot be ignored by git because it is required to be present by notify/ns4
(cherry picked from commit 1960de5530)
(cherry picked from commit f47ed5ceb0)
2018-02-24 19:53:29 -08:00
Stephen Morris
52f784315e [rt46602] Remove option to format the printed start time of a test
There was too much incompatibility between operating systems as to
the allowed options for "date".

(cherry picked from commit 451b7309ca)
(cherry picked from commit 8376949ea8)
2018-02-24 19:53:29 -08:00
Stephen Morris
82ffebc73a [rt46602] Escape line ends in shell script variable assignment
Escape the line ends in a multi-line variable assignment.  Under some
circumstances, substituting the variable caused syntax errors when
used as the list of values in a shell script "for" statement.

(cherry picked from commit 462766cd76)
(cherry picked from commit 53ebdf225f)
2018-02-24 19:53:26 -08:00
Stephen Morris
c8880ce14a [rt46602] Fix EXTRAPORT substitutions in copy_setport
Fix problems where all EXTRAPORT macros were being replaced by
the EXTRAPORT1 value. (Copy and paste issue.)

(cherry picked from commit fb78f82ba1)
(cherry picked from commit 8513c4256b)
2018-02-24 19:53:01 -08:00
Stephen Morris
04120c4223 [rt46602] Minor documentation changes
(cherry picked from commit cdf18a5009)
(cherry picked from commit 4731a82eef)
2018-02-24 19:53:00 -08:00
Stephen Morris
7125bddda8 [rt46602] Correct way allow_query test produces RNDC output
(cherry picked from commit 7f2d41d4c4)
(cherry picked from commit 36136dec55)
2018-02-24 19:53:00 -08:00
Stephen Morris
5d69915cd8 [rt46602] Simplify the cleanup code
(cherry picked from commit 0855a8a6cc)
(cherry picked from commit fb5974f902)
2018-02-24 19:52:59 -08:00
Stephen Morris
5be3ea811e [rt46602] Extensions to README
Added descriptions of how nameservers are started and stopped
during the tests, and how the framework cleans up the files created.

(cherry picked from commit f606b17dfb)
(cherry picked from commit 56ba2e822b)
2018-02-24 19:52:59 -08:00
Stephen Morris
d2e214bff3 [rt46602] Miscellenous small changes
(cherry picked from commit b88b508b22)
(cherry picked from commit 3329876ffd)
2018-02-24 19:52:58 -08:00
Stephen Morris
c136a2fdb2 [rt46602] Handle echoing of multi-line output from tests
(cherry picked from commit 1f07c69f25)
(cherry picked from commit 6602a31229)
2018-02-24 19:52:58 -08:00
Stephen Morris
b2319386f4 [rt46602] Rename "test" variable to "systest"
... to avoid confusion between the variable and the command of the
same name.

(cherry picked from commit c12e06755f)
(cherry picked from commit 7a5476173a)
2018-02-24 19:52:57 -08:00
Stephen Morris
9040d3d367 [rt46602] Add ability to prevent deletion of output files when running all tests
Some tests may need to examine all output files from all system tests.
Allow the deletion of these files to be inhibited if required.

(cherry picked from commit 00bc29640b)
(cherry picked from commit 6917ea971a)
2018-02-24 19:52:57 -08:00
Stephen Morris
5a1b50c023 [rt46602] Error messages before start of test are output to stderr
Error messages concerning the invocation of run.sh are output to
stderr.  Messages after the test has started are output to stdout.

(cherry picked from commit 244d1c30e2)
(cherry picked from commit ff5349b3b3)
2018-02-24 19:52:57 -08:00
Stephen Morris
67ff8ef970 [rt46602] Ensure that output sent to stderr is routed to the output file
(cherry picked from commit a5cf6bd12a)
(cherry picked from commit 6bd944c9d0)
2018-02-24 19:52:56 -08:00
Stephen Morris
2a5707943a [rt46602] Minor tidying up of documentation
(cherry picked from commit ce66752adc)
(cherry picked from commit 6b5e5a2da2)
2018-02-24 19:52:56 -08:00
Stephen Morris
6dd8c2ab08 [rt46602] Check prerequsities before network interfaces when running test.
(cherry picked from commit 549a6c6bc8)
(cherry picked from commit 0afcdf658d)
2018-02-24 19:52:55 -08:00
Stephen Morris
09e1b5e143 [rt46602] Minor formatting changes to Perl files
(cherry picked from commit f0f5b5f045)
(cherry picked from commit 5fc5b514e4)
2018-02-24 19:52:55 -08:00
Stephen Morris
dc0078e03b [rt46603] Provide echostart() and echoend() to output test start/end messages.
(cherry picked from commit c344e1d768)
(cherry picked from commit 88081b765e)
2018-02-24 19:52:55 -08:00
Stephen Morris
818ac05cfc [rt46602] Ensure test output in systests.output is not mixed up
When running all the system tests, output from a test is sent to a
test.output file in the test directory.  These are combined in to
systests.output when the run finishes.

(cherry picked from commit 055e5be9fd)
(cherry picked from commit 50769a4a9e)
2018-02-24 19:52:54 -08:00
Stephen Morris
f55e2791fc [rt46602] Miscellaneous minor fixes
... for misspellings, typos, trailing spaces, duplicated lines etc.

(cherry picked from commit 3c25e5fa02)
(cherry picked from commit 0e2e251a0d)
2018-02-24 19:52:54 -08:00
Stephen Morris
21e33308d1 [rt46602] Allocate 100 ports to each test
(cherry picked from commit edc7a18d84)
(cherry picked from commit 61514873e9)
2018-02-24 19:52:53 -08:00
Stephen Morris
73d3527931 [rt46602] Pass port numbers to tests via environment variables
(cherry picked from commit f5d8f07900)
(cherry picked from commit f10b6cfeb6)
2018-02-24 19:52:53 -08:00
Stephen Morris
3ddf401b1b [rt46602] Ensure parallel tests are in alphabetical order
(cherry picked from commit b2d90da0c2)
(cherry picked from commit bf2992dbe6)
2018-02-24 19:52:47 -08:00
Stephen Morris
67f135c1d0 [rt46602] Expanded system tests README
Add more information on running the tests, together with a section
on how the tests are organised, aimed at new developers.

(cherry picked from commit af005cdbcf)
(cherry picked from commit 3952d4631e)
2018-02-24 19:52:16 -08:00
Stephen Morris
28c2b0be93 [rt46602] More updates to the test running framework
Tidy up the stop/start files and make switch usage consistent. Also
tidy up the various "clean" targets in the Makefile.

(cherry picked from commit b24c2e11d8)
(cherry picked from commit 78494c3a4d)
2018-02-24 19:52:16 -08:00
Stephen Morris
ca76477b36 [rt46602] Modify some test files to cope with the "-p" flag
(cherry picked from commit 517d990bd4)
(cherry picked from commit b01b553d72)
2018-02-24 19:52:16 -08:00
Stephen Morris
dec6d02f28 [rt46602] Tidy up run management
Miscellaneous tidying up of run management.  The most significant
change is that "runall.sh" now runs _all_ the tests, even the
ones that can run in parallel.  runsequential.sh is the script
to run tests that have not been converted to parallel running.

(cherry picked from commit 32fe6f7682)
(cherry picked from commit a49afdaeb8)
2018-02-24 19:52:15 -08:00
Stephen Morris
c64af8abe5 [rt46602] Assign block of ports for each test
Some tests use more ports than just the query and control ports.
Each test that can run in parallel with other tests is now assigned
a unique block of 10 ports.

(cherry picked from commit e0ff77f9d3)
(cherry picked from commit df1348ad2b)
2018-02-24 19:52:15 -08:00