arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add additional error chcking

pull/339/head
Jeffrey Walton 2016-11-07 09:28:55 -05:00
parent 9866a7d148
commit 0d753f8014
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
TestScripts/cryptest-symbols.sh
View File

@ -15,7 +15,7 @@ NEW_VERSION_TAG=master
############################################ ############################################
# If repo is dirty, then promt first # If repo is dirty, then promt first
DIRTY=$(git diff --shortstat 2> /dev/null | tail -n1) DIRTY=$(git diff --shortstat 2> /dev/null | tail -1)
if [[ ! (-z "$DIRTY") ]]; then if [[ ! (-z "$DIRTY") ]]; then
echo echo
@ -215,9 +215,14 @@ cp GNUmakefile GNUmakefile-symbols
git checkout "$OLD_VERSION_TAG" -f &>/dev/null git checkout "$OLD_VERSION_TAG" -f &>/dev/null
if [[ "$?" -ne "0" ]]; then
echo "Failed to checkout $OLD_VERSION_TAG"
[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
fi
echo echo
echo "****************************************************************" echo "****************************************************************"
echo "Patching makefile to use dynamic linking for cryptest.exe" echo "Patching makefile for dynamic linking by cryptest.exe"
echo "****************************************************************" echo "****************************************************************"
echo echo
@ -237,6 +242,17 @@ echo
"$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic "$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic
if [[ "$IS_DARWIN" -ne "0" ]]; then
LIBNAME=libcryptopp.dylib
else
LIBNAME=libcryptopp.so
fi
if [[ ! -f "$LIBNAME" ]]; then
echo "Failed to make $OLD_VERSION_TAG library"
[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
fi
echo echo
echo "****************************************************************" echo "****************************************************************"
echo "Building cryptest.exe for $OLD_VERSION_TAG" echo "Building cryptest.exe for $OLD_VERSION_TAG"
@ -245,7 +261,10 @@ echo
"$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols cryptest.exe "$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols cryptest.exe
if [[ -f "cryptest.exe" ]]; then if [[ ! -f "cryptest.exe" ]]; then
echo "Failed to make cryptest.exe"
[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
fi
echo echo
echo "****************************************************************" echo "****************************************************************"
@ -260,9 +279,6 @@ if [[ -f "cryptest.exe" ]]; then
LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | "$CXXFILT" LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | "$CXXFILT"
LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | "$CXXFILT" LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | "$CXXFILT"
fi fi
else
echo "Failed to make cryptest.exe"
fi
echo echo
echo "****************************************************************" echo "****************************************************************"
@ -270,10 +286,15 @@ echo "Removing dynamic library for $OLD_VERSION_TAG"
echo "****************************************************************" echo "****************************************************************"
echo echo
rm -f *.o *.so *.dylib rm -f adhoc.cpp *.o *.so *.dylib
git checkout "$NEW_VERSION_TAG" -f &>/dev/null git checkout "$NEW_VERSION_TAG" -f &>/dev/null
if [[ "$?" -ne "0" ]]; then
echo "Failed to checkout $OLD_VERSION_TAG"
[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
fi
echo echo
echo "****************************************************************" echo "****************************************************************"
echo "Building dynamic library for $NEW_VERSION_TAG" echo "Building dynamic library for $NEW_VERSION_TAG"
@ -282,7 +303,10 @@ echo
"$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic "$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic
if [[ -f "cryptest.exe" ]]; then if [[ ! -f "cryptest.exe" ]]; then
echo "Failed to make $NEW_VERSION_TAG library"
[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
fi
echo echo
echo "****************************************************************" echo "****************************************************************"
@ -297,10 +321,12 @@ if [[ -f "cryptest.exe" ]]; then
LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | "$CXXFILT" LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | "$CXXFILT"
LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | "$CXXFILT" LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | "$CXXFILT"
fi fi
else
echo "Failed to make cryptest.exe"
fi
git checkout master -f &>/dev/null git checkout master -f &>/dev/null
if [[ "$?" -ne "0" ]]; then
echo "Failed to checkout Master"
[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
fi
[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0 [[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0