Skip to content

Commit b0f7a60

Browse files
committed
Unit test: Use 'easyrsa write safe-cnf' if 'make-safe-ssl' fails
This is due to Linux test using EasyRSA-Master and Windows test using EasyRSA-release 3.1.x (currently) Signed-off-by: Richard T Bonhomme <[email protected]>
1 parent 0cfe916 commit b0f7a60

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

dev/easytls-unit-tests.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,12 @@ elif [ -n "${EASYTLS_REMOTE_CI}" ]; then
662662
print "*** Update safessl-easyrsa.cnf - easyrsa init-pki"
663663
"${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch init-pki || fail "init-pki"
664664

665-
"${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch make-safe-ssl
665+
if "${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch make-safe-ssl
666+
then
667+
: # ok
668+
else
669+
"${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch write safe-cnf || fail "write safe-cnf"
670+
fi
666671

667672
cp -vf "${WORK_DIR}/et-tdir${loops}/safessl-easyrsa.cnf" ./safessl-easyrsa.cnf || \
668673
fail "(1) cp ${WORK_DIR}/et-tdir${loops}/safessl-easyrsa.cnf ./safessl-easyrsa.cnf"

0 commit comments

Comments
 (0)