use a specific version number in test scripts

This avoids issue reported in #1041 with file glob confusing cd.
Also remove extra newline from VERSION when update.sh runs.
This commit is contained in:
Brent Cook
2024-04-08 20:05:29 -05:00
parent 1a7dced4cd
commit 5fdb83c9c3
2 changed files with 6 additions and 5 deletions

View File

@@ -4,6 +4,7 @@ set -x
unset CC
ENABLE_ASM="${ENABLE_ASM:=ON}"
VERSION=`cat VERSION`
if type apt-get >/dev/null 2>&1; then
sudo apt-get update
@@ -26,8 +27,8 @@ if [ `uname` = "Darwin" ]; then
make -j 4 distcheck
# test cmake
tar zxvf libressl-*.tar.gz
cd libressl-*
tar zxvf libressl-$VERSION.tar.gz
cd libressl-$VERSION
(
mkdir build-static
@@ -57,8 +58,8 @@ elif [ "$ARCH" = "native" ]; then
# make distribution
make -j 4 distcheck
tar zxvf libressl-*.tar.gz
cd libressl-*
tar zxvf libressl-$VERSION.tar.gz
cd libressl-$VERSION
# test cmake and ninja

View File

@@ -151,7 +151,7 @@ else
$CP $libcrypto_src/opensslv.h include/openssl
fi
awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 | head -n1 > VERSION
echo "LibreSSL version `cat VERSION`"
# copy libcrypto source