Skip to content

Commit

Permalink
use a specific version number in test scripts
Browse files Browse the repository at this point in the history
This avoids issue reported in #1041 with file glob confusing cd.
Also remove extra newline from VERSION when update.sh runs.
  • Loading branch information
busterb committed Apr 9, 2024
1 parent 1a7dced commit 5fdb83c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5fdb83c

Please sign in to comment.