upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 18:08:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include prepare-softhsm2.sh in source tarballs

Browse source 
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 c0be772ebc)
This commit is contained in:
Michał Kępień 2019-12-11 12:04:29 +01:00
parent 89cccc53ba
commit f60cd0c730
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -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

0
util/prepare-softhsm2.sh → bin/tests/prepare-softhsm2.sh Normal file → Executable file
View file

2
bin/tests/system/runtime/tests.sh
View file

@ -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 & )

2
util/copyrights
View file

@ -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