From c52ad8905f63cd24ff4baeef4d8ab78f16fc48fc Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Mon, 7 Nov 2016 03:13:56 -0500
Subject: Use latest makefile for building lastest library. Whitespace cleanup

---
 TestScripts/cryptest-symbols.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'TestScripts/cryptest-symbols.sh')

diff --git a/TestScripts/cryptest-symbols.sh b/TestScripts/cryptest-symbols.sh
index d8072797..8ab30265 100755
--- a/TestScripts/cryptest-symbols.sh
+++ b/TestScripts/cryptest-symbols.sh
@@ -181,11 +181,13 @@ fi
 
 "$MAKE" distclean &>/dev/null
 
-git checkout "$OLD_VERSION_TAG" -f &>/dev/null
-
 rm -f GNUmakefile-symbols
+
+git checkout master -f &>/dev/null
 cp GNUmakefile GNUmakefile-symbols
 
+git checkout "$OLD_VERSION_TAG" -f &>/dev/null
+
 if [[ "$IS_DARWIN" -ne "0" ]]; then
 	"$SED" "$SED_OPTS" -e 's|libcryptopp.a $(TESTOBJS)|libcryptopp.dylib $(TESTOBJS)|g' GNUmakefile-symbols
 	"$SED" "$SED_OPTS" -e 's|$(TESTOBJS) ./libcryptopp.a |$(TESTOBJS) ./libcryptopp.dylib |g' GNUmakefile-symbols
@@ -205,11 +207,11 @@ echo "******************************************************"
 
 if [[ -f "cryptest.exe" ]]; then
 	if [[ "$IS_DARWIN" -ne "0" ]]; then
-		DYLD_LIBRARY_PATH=".:$DYLD_LIBRARY_PATH" ./cryptest.exe v 2>&1 | c++filt
-		DYLD_LIBRARY_PATH=".:$DYLD_LIBRARY_PATH" ./cryptest.exe tv all 2>&1 | c++filt
+		DYLD_LIBRARY_PATH="$PWD:$DYLD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | c++filt
+		DYLD_LIBRARY_PATH="$PWD:$DYLD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | c++filt
 	else
-		LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH" ./cryptest.exe v 2>&1 | c++filt
-		LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH" ./cryptest.exe tv all 2>&1 | c++filt
+		LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | c++filt
+		LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | c++filt
 	fi
 else
 	echo "Failed to make cryptest.exe"
@@ -219,12 +221,12 @@ echo "******************************************************"
 echo "Removing the dynamic library for $OLD_VERSION_TAG"
 echo "******************************************************"
 
-rm -f *.o *.so *.dylib 
+rm -f *.o *.so *.dylib
 
 git checkout "$NEW_VERSION_TAG" -f &>/dev/null
 
 echo "******************************************************"
-echo "Building dynamic library for $NEW_VERSION_TAG and linking into $OLD_VERSION_TAG cryptest.exe"
+echo "Building dynamic library for $NEW_VERSION_TAG"
 echo "******************************************************"
 
 "$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic
@@ -235,14 +237,14 @@ echo "******************************************************"
 
 if [[ -f "cryptest.exe" ]]; then
 	if [[ "$IS_DARWIN" -ne "0" ]]; then
-		DYLD_LIBRARY_PATH=".:$DYLD_LIBRARY_PATH" ./cryptest.exe v 2>&1 | c++filt
-		DYLD_LIBRARY_PATH=".:$DYLD_LIBRARY_PATH" ./cryptest.exe tv all 2>&1 | c++filt
+		DYLD_LIBRARY_PATH="$PWD:$DYLD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | c++filt
+		DYLD_LIBRARY_PATH="$PWD:$DYLD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | c++filt
 	else
-		LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH" ./cryptest.exe v 2>&1 | c++filt
-		LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH" ./cryptest.exe tv all 2>&1 | c++filt
+		LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" v 2>&1 | c++filt
+		LD_LIBRARY_PATH="$PWD:$LD_LIBRARY_PATH" "$PWD/cryptest.exe" tv all 2>&1 | c++filt
 	fi
 else
 	echo "Failed to make cryptest.exe"
 fi
 
-git checkout master -f
+git checkout master -f &>/dev/null
-- 
cgit v1.2.1