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 cf641cc79735998f19677d2009203b215f0c74fa..5af2fd77649d215bb5ae52387478b4248da6bcc1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -199,7 +199,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 38bbe77f8a4f5fe8b00262f6dd698cbe88e4d29c..0dd9a29cfd3b4e43b526e8bec2413122be501eea 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -123,7 +123,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 "$TOP/util/prepare-softhsm2.sh"
+        sh "$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 554e9f3e91a7d1430e3ed279c0d8d5f57f9f3369..8d1bc25f76da2abe2cd7b98d13be7c0131a4b369 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -348,6 +348,7 @@
 ./bin/tests/pkcs11/benchmarks/sha1.c           C       2014,2015,2016,2018,2019
 ./bin/tests/pkcs11/benchmarks/sign.c           C       2014,2015,2016,2018,2019
 ./bin/tests/pkcs11/benchmarks/verify.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
@@ -2632,7 +2633,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