ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Drop support for sequential system tests

Browse Source 
System test used to have sequential system tests, which can't run in
parallel with the rest of system tests. As there are no such tests
anymore the underlying infrastructure can be dropped.
This commit is contained in:
Michal Nowak
2022-01-26 13:49:32 +01:00
parent 9d398572f0
commit 8109e924b5
4 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/tests/system/README
View File

@@ -598,13 +598,10 @@ Adding a Test to the System Test Suite
---
Once a test has been created, the following files should be edited:
* conf.sh.in The name of the test should be added to the PARALLELDIRS or
SEQUENTIALDIRS variables as appropriate. The former is used for tests that
can run in parallel with other tests, the latter for tests that are unable to
do so.
* conf.sh.common The name of the test should be added to the PARALLEL_COMMON
variable.
* Makefile.in The name of the test should be added to one of the the PARALLEL
or SEQUENTIAL variables.
* Makefile.am The name of the test should be added to the TESTS variable.
(It is likely that a future iteration of the system test suite will remove the
need to edit multiple files to add a test.)

7
bin/tests/system/conf.sh.common
View File

@@ -31,13 +31,6 @@ export LANG=C
# The "dialup", "delzone", and "dupsigs" tests are also not run by
# default because they take a very long time to complete.
#
# The following tests are hard-coded to use ports 5300 and 9953. For
# this reason, these must be run sequentially.
#
# Sequential tests that only run on unix/linux should be added to
# SEQUENTIAL_UNIX in conf.sh.in
#
SEQUENTIAL_COMMON=""
#
# These tests can use ports assigned by the caller (other than 5300

6
bin/tests/system/conf.sh.in
View File

@@ -73,8 +73,6 @@ KRB5_KTNAME=dns.keytab
#
# Construct the lists of tests to run
#
SEQUENTIAL_UNIX=""
SEQUENTIALDIRS="$SEQUENTIAL_COMMON $SEQUENTIAL_UNIX"
PARALLEL_UNIX="chain
checkds
@@ -93,9 +91,7 @@ pipelined
qmin
shutdown
tcp"
PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_UNIX"
SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"
SUBDIRS="$PARALLEL_COMMON $PARALLEL_UNIX"
# Use the CONFIG_SHELL detected by configure for tests
SHELL=@SHELL@

26
bin/tests/system/runsequential.sh
View File

@@ -1,26 +0,0 @@
#!/bin/sh
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# SPDX-License-Identifier: MPL-2.0
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
# Run system tests that must be run sequentially
#
# Note: Use "make check" to run all the system tests. This script will just
# run those tests that require that each of their nameservers is the only one
# running on an IP address.
#
. ./conf.sh
for d in $SEQUENTIALDIRS
do
$SHELL run.sh "${@}" "$d" 2>&1 | tee "test.output.$d"
done