Include prepare-softhsm2.sh in source tarballs

The util/prepare-softhsm2.sh script is useful for initializing a working
SoftHSM environment which can be used by unit tests and system tests.
However, since it is a test-specific script, it does not really belong
in the util/ subdirectory which is mostly pruned during the BIND source
tarball creation process.  Move the prepare-softhsm2.sh script to
bin/tests/ so that its location is more appropriate for its purpose and
also so that it does not get removed during the BIND source tarball
creation process, allowing it to be used for setting up test
environments for tarball-based builds.

(cherry picked from commit c0be772ebc1406b761eb870d97acd72ebebad541)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89749972971087b1bf2c4658611682e63a1102e6..302f3c4ef10698405b9316868e05ce6a8189df2a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,7 +200,7 @@ stages:
     fi
 
 .setup_softhsm: &setup_softhsm |
-    sh -x util/prepare-softhsm2.sh
+    sh -x bin/tests/prepare-softhsm2.sh
 
 .system_test: &system_test_job
   <<: *default_triggering_rules

diff --git a/util/prepare-softhsm2.sh b/bin/tests/prepare-softhsm2.sh
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from util/prepare-softhsm2.sh
rename to bin/tests/prepare-softhsm2.sh

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 5c77a9cabbccb5c784fc80f6010f804d5ecd9d3b..f52c159f63c5947367d65635be51edb60d56df67 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -159,7 +159,7 @@ if [ "`id -u`" = 0 ] && [ ! "$CYGWIN" ]; then
     if [ -d "${TEMP_NAMED_DIR}" ]; then
         copy_setports ns2/named-alt9.conf.in "${TEMP_NAMED_DIR}/named-alt9.conf"
         export SOFTHSM2_CONF="${TEMP_NAMED_DIR}/softhsm2.conf"
-        sh -x "$TOP/util/prepare-softhsm2.sh"
+        sh -x "$TOP/bin/tests/prepare-softhsm2.sh"
         chown -R nobody "${TEMP_NAMED_DIR}"
         chmod 0700 "${TEMP_NAMED_DIR}"
         ( cd "${TEMP_NAMED_DIR}" && $NAMED -u nobody -c named-alt9.conf -d 99 -g -U 4 >> named9.run 2>&1 & )

diff --git a/util/copyrights b/util/copyrights
index a2aeebcd1da27aa400597b2abf0367209c8bf5be..0fc530beca484173887a4ef9db9f100c576cfb84 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -492,6 +492,7 @@
 ./bin/tests/pkcs11/benchmarks/verify.c         C       2014,2015,2016,2018,2019
 ./bin/tests/pkcs11/pkcs11-hmacmd5.c            C       2014,2015,2016,2018,2019
 ./bin/tests/pkcs11/pkcs11-md5sum.c             C       2014,2015,2016,2018,2019
+./bin/tests/prepare-softhsm2.sh                        X       2018,2019
 ./bin/tests/startperf/README                   X       2011,2018,2019
 ./bin/tests/startperf/clean.sh                 SH      2011,2012,2016,2018,2019
 ./bin/tests/startperf/makenames.pl             PERL    2011,2012,2016,2018,2019
@@ -4585,7 +4586,6 @@
 ./util/nanny.pl                                        PERL    2000,2001,2004,2007,2012,2016,2018,2019
 ./util/new-func                                        PERL    2005,2007,2012,2016,2018,2019
 ./util/nt-kit                                  SH      1999,2000,2001,2004,2007,2012,2016,2018,2019
-./util/prepare-softhsm2.sh                     X       2018,2019
 ./util/spacewhack.pl                           PERL    2000,2001,2004,2007,2012,2016,2018,2019
 ./util/tabify-changes                          SH      2004,2007,2012,2016,2018,2019
 ./util/update-drafts.pl                                PERL    2000,2001,2004,2007,2012,2016,2018,2019