Commit Graph
25334 Commits
Author SHA1 Message Date
Mark Andrews d17558a874 redefine CHECK so cppcheck see the definition
(cherry picked from commit a4186b1867)
2018-02-26 10:47:56 +11:00
Mark Andrews 00799ab805 remove unused struct dst_context declaration
(cherry picked from commit f2c22662cc)
2018-02-26 10:47:56 +11:00
Mark Andrews 981d548a66 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)
2018-02-26 10:46:03 +11:00
Evan Hunt 5e214b3682 Merge branch 'upforwd-error-v9_10' into 'v9_10'
Resolve "upforwd test error"

See merge request isc-projects/bind9!72
2018-02-25 13:56:10 -08:00
Evan Hunt a8ad652b79 fixed an upforwd test error.
(cherry picked from commit 54e010d51e)
2018-02-25 13:56:10 -08:00
Evan Hunt 7f6cd18d7f Merge branch 'tidy-runall.sh-environment-variables-v9_11-v9_10' into 'v9_10'
Tidy runall.sh environment variables

See merge request isc-projects/bind9!18
2018-02-25 01:06:40 -08:00
Michał KępieńandEvan Hunt fdcac29f63 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)
2018-02-25 01:06:40 -08:00
Michał KępieńandEvan Hunt 2f3b3b7aff 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)
2018-02-25 01:06:40 -08:00
Michał KępieńandEvan Hunt 0e3840e4b4 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)
2018-02-25 01:06:40 -08:00
Evan Hunt 7b0c00aebd Merge branch '71-xfer-system-test-fails-intermittently-v9_12-v9_11-v9_10' into 'v9_10'
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 01:06:17 -08:00
Evan Hunt 4160936c92 improve reliability of xfer test
(cherry picked from commit 5d7d6881a1)
(cherry picked from commit 09a1a261dc)
(cherry picked from commit 948bd83ce5)
2018-02-25 01:06:17 -08:00
Evan Hunt 06e37db0df Merge branch 'parallel-v9_10' into v9_10
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 01:04:51 -08:00
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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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ńandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 04120c4223 [rt46602] Minor documentation changes
(cherry picked from commit cdf18a5009)
(cherry picked from commit 4731a82eef)
2018-02-24 19:53:00 -08:00
Stephen MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt d2e214bff3 [rt46602] Miscellenous small changes
(cherry picked from commit b88b508b22)
(cherry picked from commit 3329876ffd)
2018-02-24 19:52:58 -08:00
Stephen MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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 MorrisandEvan Hunt 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