From 0f57732d137a29c7cfafce82ee4e78ac183d33c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Tue, 1 Dec 2020 15:18:10 +0100 Subject: [PATCH] Skip the zero, xfer and ixfr tests on non-Linux platforms Due to the platform differences, on non-Linux platforms, the xfer and ixfr tests fails and zero test gets stuck. This commit will get reverted when we add support for netmgr multi-threading. --- bin/tests/system/ixfr/prereq.sh | 19 +++++++++++++++++++ bin/tests/system/xfer/prereq.sh | 19 +++++++++++++++++++ bin/tests/system/zero/prereq.sh | 19 +++++++++++++++++++ util/copyrights | 3 +++ 4 files changed, 60 insertions(+) create mode 100755 bin/tests/system/ixfr/prereq.sh create mode 100755 bin/tests/system/xfer/prereq.sh create mode 100755 bin/tests/system/zero/prereq.sh diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh new file mode 100755 index 0000000000..55d18ace17 --- /dev/null +++ b/bin/tests/system/ixfr/prereq.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# 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. + +. ../conf.sh + +if [ "$(uname -s)" != "Linux" ]; then + echo_i "This test is currently broken on non-Linux platforms" + exit 255 +fi + +exit 0 diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh new file mode 100755 index 0000000000..55d18ace17 --- /dev/null +++ b/bin/tests/system/xfer/prereq.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# 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. + +. ../conf.sh + +if [ "$(uname -s)" != "Linux" ]; then + echo_i "This test is currently broken on non-Linux platforms" + exit 255 +fi + +exit 0 diff --git a/bin/tests/system/zero/prereq.sh b/bin/tests/system/zero/prereq.sh new file mode 100755 index 0000000000..55d18ace17 --- /dev/null +++ b/bin/tests/system/zero/prereq.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# 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. + +. ../conf.sh + +if [ "$(uname -s)" != "Linux" ]; then + echo_i "This test is currently broken on non-Linux platforms" + exit 255 +fi + +exit 0 diff --git a/util/copyrights b/util/copyrights index 71420be276..78903dea7b 100644 --- a/util/copyrights +++ b/util/copyrights @@ -505,6 +505,7 @@ ./bin/tests/system/ixfr/ans2/startme X 2011,2018,2019,2020 ./bin/tests/system/ixfr/clean.sh SH 2001,2004,2007,2011,2012,2014,2015,2016,2018,2019,2020 ./bin/tests/system/ixfr/ixfr-stats.good X 2019,2020 +./bin/tests/system/ixfr/prereq.sh SH 2020 ./bin/tests/system/ixfr/setup.sh SH 2001,2004,2007,2011,2012,2013,2014,2016,2018,2019,2020 ./bin/tests/system/ixfr/tests.sh SH 2001,2004,2007,2011,2012,2014,2016,2018,2019,2020 ./bin/tests/system/kasp/README TXT.BRIEF 2019,2020 @@ -961,6 +962,7 @@ ./bin/tests/system/xfer/dig2.good X 2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./bin/tests/system/xfer/knowngood.mapped X 2016,2018,2019,2020 ./bin/tests/system/xfer/ns4/named.conf.base X 2011,2013,2016,2018,2019,2020 +./bin/tests/system/xfer/prereq.sh SH 2020 ./bin/tests/system/xfer/setup.sh SH 2001,2002,2004,2007,2011,2012,2013,2014,2015,2016,2018,2019,2020 ./bin/tests/system/xfer/tests.sh SH 2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016,2018,2019,2020 ./bin/tests/system/xferquota/clean.sh SH 2000,2001,2004,2007,2012,2014,2015,2016,2018,2019,2020 @@ -969,6 +971,7 @@ ./bin/tests/system/xferquota/tests.sh SH 2000,2001,2004,2007,2012,2016,2018,2019,2020 ./bin/tests/system/zero/ans5/ans.pl PERL 2016,2018,2019,2020 ./bin/tests/system/zero/clean.sh SH 2013,2014,2015,2016,2018,2019,2020 +./bin/tests/system/zero/prereq.sh SH 2020 ./bin/tests/system/zero/setup.sh SH 2013,2014,2016,2018,2019,2020 ./bin/tests/system/zero/tests.sh SH 2013,2016,2017,2018,2019,2020 ./bin/tests/system/zonechecks/clean.sh SH 2004,2007,2012,2014,2015,2016,2018,2019,2020