final cleanup

- update Kyuafiles to match Atffiles
- copyrights
- CHANGES note

diff --git a/CHANGES b/CHANGES
index 2d2b85e6a23313223d155c8d286589b0d7c02b40..3a250caa292127093122727f18b0d4d504b0fdaa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4913.  [test]          Re-implemented older unit tests in bin/tests as ATF,
+                       removed the lib/tests unit testing library. [GL #115]
+
 4912.  [test]          Improved the reliability of the 'cds' system test.
                        [GL #136]
 

diff --git a/lib/dns/tests/Kyuafile b/lib/dns/tests/Kyuafile
index 221fb54ffe0586ba5876efea113c14625f2a67cf..52bd99a4c15944e96d18256b97309514646d62a5 100644 (file)
--- a/lib/dns/tests/Kyuafile
+++ b/lib/dns/tests/Kyuafile
@@ -9,6 +9,7 @@ atf_test_program{name='dbversion_test'}
 atf_test_program{name='dh_test'}
 atf_test_program{name='dispatch_test'}
 atf_test_program{name='dnstap_test'}
+atf_test_program{name='dst_test'}
 atf_test_program{name='dstrandom_test'}
 atf_test_program{name='geoip_test'}
 atf_test_program{name='gost_test'}
@@ -23,6 +24,7 @@ atf_test_program{name='rbt_test'}
 atf_test_program{name='rdata_test'}
 atf_test_program{name='rdataset_test'}
 atf_test_program{name='rdatasetstats_test'}
+atf_test_program{name='resolver_test'}
 atf_test_program{name='rsa_test'}
 atf_test_program{name='time_test'}
 atf_test_program{name='tsig_test'}

diff --git a/lib/dns/tests/testdata/db/data.db b/lib/dns/tests/testdata/db/data.db
index ab61c9584c52364a0f30976a7612d3258e17b975..9ac043eb2ff7e93b7a2db0b6bf035afe61c70def 100644 (file)
--- a/lib/dns/tests/testdata/db/data.db
+++ b/lib/dns/tests/testdata/db/data.db
@@ -1,3 +1,12 @@
+; 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 http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 $TTL 1000
 @              in      soa     localhost. postmaster.localhost. (
                                1993050801      ;serial

diff --git a/lib/isc/tests/Kyuafile b/lib/isc/tests/Kyuafile
index fce8cfbfa9693ebab77f37a1b78788598b7541d0..1c510c1211963f975070c3b1facd2f5460283a0b 100644 (file)
--- a/lib/isc/tests/Kyuafile
+++ b/lib/isc/tests/Kyuafile
@@ -2,6 +2,7 @@ syntax(2)
 test_suite('bind9')
 
 atf_test_program{name='aes_test'}
+atf_test_program{name='atomic_test'}
 atf_test_program{name='buffer_test'}
 atf_test_program{name='counter_test'}
 atf_test_program{name='errno_test'}
@@ -28,3 +29,4 @@ atf_test_program{name='symtab_test'}
 atf_test_program{name='task_test'}
 atf_test_program{name='taskpool_test'}
 atf_test_program{name='time_test'}
+atf_test_program{name='timer_test'}

diff --git a/util/copyrights b/util/copyrights
index a583d52f2c17ed3f28ea37ead5b12c082d805510..6fb3ae7552d07f7bf27d0017db4bca8324e4f6d9 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -331,34 +331,17 @@
 ./bin/rndc/win32/rndcutil.vcxproj.in           X       2013,2015,2016,2017,2018
 ./bin/rndc/win32/rndcutil.vcxproj.user         X       2013,2018
 ./bin/tests/.gitignore                         X       2012,2013,2017,2018
-./bin/tests/Kchild.example.+003+04017.key      X       2000,2001,2018
-./bin/tests/Kchild.example.+003+04017.private  X       2000,2001,2018
 ./bin/tests/Makefile.in                                MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/adb_test.c                         C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
-./bin/tests/backtrace_test.c                   C       2009,2013,2015,2016,2018
 ./bin/tests/bigtest/README                     TXT.BRIEF       2013,2016,2018
 ./bin/tests/bigtest/buildzones.sh              SH      2013,2016,2018
 ./bin/tests/bigtest/rndc.key                   X       2013,2018
 ./bin/tests/bigtest/tests.sh                   SH      2013,2016,2018
 ./bin/tests/bigtest/zones                      X       2013,2018
-./bin/tests/byaddr_test.c                      C       2000,2001,2002,2004,2005,2007,2012,2015,2016,2018
-./bin/tests/byname_test.c                      C       2000,2001,2004,2005,2007,2009,2012,2015,2016,2017,2018
 ./bin/tests/cfg_test.c                         C       2001,2002,2004,2005,2007,2009,2010,2011,2015,2016,2018
 ./bin/tests/fromhex.pl                         PERL    2015,2016,2018
-./bin/tests/fsaccess_test.c                    C       2000,2001,2004,2005,2007,2012,2015,2016,2018
-./bin/tests/hash_test.c                                C       2000,2001,2004,2005,2006,2007,2014,2015,2016,2017,2018
 ./bin/tests/headerdep_test.sh.in               SH      2000,2001,2004,2007,2012,2016,2018
-./bin/tests/inter_test.c                       C       2000,2001,2003,2004,2005,2007,2008,2015,2016,2018
-./bin/tests/keyboard_test.c                    C       2000,2001,2004,2005,2007,2015,2016,2018
-./bin/tests/lex_test.c                         C       1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
-./bin/tests/lfsr_test.c                                C       1999,2000,2001,2004,2005,2007,2015,2016,2018
-./bin/tests/log_test.c                         C       1999,2000,2001,2004,2007,2011,2014,2015,2016,2018
 ./bin/tests/makejournal.c                      C       2013,2015,2016,2017,2018
-./bin/tests/master_test.c                      C       1999,2000,2001,2004,2007,2009,2015,2016,2017,2018
-./bin/tests/mempool_test.c                     C       1999,2000,2001,2004,2007,2016,2018
-./bin/tests/name_test.c                                C       1998,1999,2000,2001,2003,2004,2005,2007,2009,2015,2016,2017,2018
 ./bin/tests/named.conf                         CONF-C  1999,2000,2001,2004,2007,2011,2015,2016,2018
-./bin/tests/ndc.conf                           CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/ndc.conf-include                   CONF-C  2001,2004,2007,2016,2018
 ./bin/tests/optional/Kchild.example.+003+04017.key     X       2000,2001,2018
 ./bin/tests/optional/Kchild.example.+003+04017.private X       2000,2001,2018
@@ -413,22 +396,12 @@
 ./bin/tests/pkcs11/benchmarks/verify.c         C       2014,2015,2016,2018
 ./bin/tests/pkcs11/pkcs11-hmacmd5.c            C       2014,2015,2016,2018
 ./bin/tests/pkcs11/pkcs11-md5sum.c             C       2014,2015,2016,2018
-./bin/tests/ratelimiter_test.c                 C       1999,2000,2001,2004,2007,2015,2016,2018
-./bin/tests/rbt_test.c                         C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2018
-./bin/tests/rbt_test.out                       X       1999,2000,2001,2018
-./bin/tests/rbt_test.txt                       SH      1999,2000,2001,2004,2007,2012,2016,2018
-./bin/tests/rwlock_test.c                      C       1998,1999,2000,2001,2004,2005,2007,2013,2016,2017,2018
-./bin/tests/serial_test.c                      C       1999,2000,2001,2003,2004,2007,2015,2016,2018
-./bin/tests/shutdown_test.c                    C       1998,1999,2000,2001,2004,2007,2011,2013,2016,2017,2018
-./bin/tests/sig0_test.c                                C       2000,2001,2004,2005,2007,2008,2009,2012,2015,2016,2018
-./bin/tests/sock_test.c                                C       1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/startperf/README                   X       2011,2018
 ./bin/tests/startperf/clean.sh                 SH      2011,2012,2016,2018
 ./bin/tests/startperf/makenames.pl             PERL    2011,2012,2016,2018
 ./bin/tests/startperf/mkzonefile.pl            PERL    2011,2012,2016,2018
 ./bin/tests/startperf/setup.sh                 SH      2011,2012,2016,2018
 ./bin/tests/startperf/smallzone.db             ZONE    2011,2016,2018
-./bin/tests/sym_test.c                         C       1998,1999,2000,2001,2004,2005,2007,2015,2016,2018
 ./bin/tests/system/.gitignore                  X       2012,2016,2018
 ./bin/tests/system/Makefile.in                 MAKE    2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/README                      TXT.BRIEF       2000,2001,2004,2010,2011,2013,2015,2016,2017,2018
@@ -1109,6 +1082,20 @@
 ./bin/tests/system/dnssec/prereq.sh            SH      2000,2001,2002,2004,2006,2007,2009,2012,2014,2015,2016,2018
 ./bin/tests/system/dnssec/setup.sh             SH      2000,2001,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/signer/example.db.in ZONE    2010,2016,2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+07065.key   X       2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+07065.private       X       2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+23362.key   X       2018
+./bin/tests/system/dnssec/signer/general/Kexample.com.+005+23362.private       X       2018
+./bin/tests/system/dnssec/signer/general/bogus-ksk.key X       2018
+./bin/tests/system/dnssec/signer/general/bogus-zsk.key X       2018
+./bin/tests/system/dnssec/signer/general/test1.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test2.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test3.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test4.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test5.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test6.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test7.zone    ZONE    2018
+./bin/tests/system/dnssec/signer/general/test8.zone    ZONE    2018
 ./bin/tests/system/dnssec/signer/remove.db.in  ZONE    2016,2018
 ./bin/tests/system/dnssec/signer/remove2.db.in ZONE    2016,2018
 ./bin/tests/system/dnssec/tests.sh             SH      2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -2346,9 +2333,10 @@
 ./bin/tests/system/zonechecks/prereq.sh                SH      2014,2016,2018
 ./bin/tests/system/zonechecks/setup.sh         SH      2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/zonechecks/tests.sh         SH      2004,2007,2009,2012,2013,2014,2015,2016,2018
-./bin/tests/t_api.pl                           PERL    1999,2000,2001,2004,2007,2012,2016,2018
-./bin/tests/task_test.c                                C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
-./bin/tests/timer_test.c                       C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
+./bin/tests/testdata/wire/wire_test.data       X       1999,2000,2001,2018
+./bin/tests/testdata/wire/wire_test.data2      X       1999,2000,2001,2018
+./bin/tests/testdata/wire/wire_test.data3      X       1999,2000,2001,2018
+./bin/tests/testdata/wire/wire_test.data4      X       1999,2000,2001,2018
 ./bin/tests/virtual-time/Makefile.in           MAKE    2010,2012,2016,2018
 ./bin/tests/virtual-time/README                        TXT.BRIEF       2010,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/clean.sh SH      2010,2012,2015,2016,2018
@@ -2413,11 +2401,6 @@
 ./bin/tests/win32/timer_test.vcxproj.in                X       2013,2015,2016,2017,2018
 ./bin/tests/win32/timer_test.vcxproj.user      X       2013,2018
 ./bin/tests/wire_test.c                                C       1999,2000,2001,2004,2005,2007,2015,2016,2018
-./bin/tests/wire_test.data                     X       1999,2000,2001,2018
-./bin/tests/wire_test.data2                    X       1999,2000,2001,2018
-./bin/tests/wire_test.data3                    X       1999,2000,2001,2018
-./bin/tests/wire_test.data4                    X       1999,2000,2001,2018
-./bin/tests/zone_test.c                                C       1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2015,2016,2018
 ./bin/tools/.gitignore                         X       2012,2014,2015,2016,2017,2018
 ./bin/tools/Makefile.in                                MAKE    2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tools/arpaname.1                         MAN     DOCBOOK
@@ -3505,6 +3488,7 @@
 ./lib/dns/tests/rdata_test.c                   C       2012,2013,2015,2016,2017,2018
 ./lib/dns/tests/rdataset_test.c                        C       2012,2016,2018
 ./lib/dns/tests/rdatasetstats_test.c           C       2012,2015,2016,2018
+./lib/dns/tests/resolver_test.c                        C       2018
 ./lib/dns/tests/rsa_test.c                     C       2016,2018
 ./lib/dns/tests/testdata/db/data.db            ZONE    2018
 ./lib/dns/tests/testdata/dbiterator/zone1.data ZONE    2011,2012,2016,2018
@@ -3854,6 +3838,7 @@
 ./lib/isc/tests/Kyuafile                       X       2017,2018
 ./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/tests/aes_test.c                     C       2014,2016,2018
+./lib/isc/tests/atomic_test.c                  C       2018
 ./lib/isc/tests/buffer_test.c                  C       2014,2015,2016,2017,2018
 ./lib/isc/tests/counter_test.c                 C       2014,2016,2018
 ./lib/isc/tests/errno_test.c                   C       2016,2018
@@ -3883,6 +3868,7 @@
 ./lib/isc/tests/taskpool_test.c                        C       2011,2012,2016,2018
 ./lib/isc/tests/testdata/file/keep             X       2014,2018
 ./lib/isc/tests/time_test.c                    C       2014,2015,2016,2018
+./lib/isc/tests/timer_test.c                   C       2018
 ./lib/isc/timer.c                              C       1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/timer_p.h                            C       2000,2001,2004,2005,2007,2009,2016,2017,2018
 ./lib/isc/tm.c                                 C       2014,2016,2018