From 3b915803081fe35c4d8cbf29f3f4a16c198f5179 Mon Sep 17 00:00:00 2001 From: DevJPM Date: Wed, 20 Jan 2016 16:36:23 +0100 Subject: [PATCH] added multi-job make added the -j option to $MAKE, removed all the "" from all calls to make as documented in the SO answer linked in #117 --- cryptest.sh | 212 +++++++++++++++++++++++++++------------------------- 1 file changed, 111 insertions(+), 101 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index 3b6ea16f..ff3c1d09 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -77,6 +77,16 @@ else MAKE=make fi +# Use multiple cores with make to speed things up +# restricted to x86 AND Linux as ARM linuxes may not have the RAM to do it +if [ "$IS_LINUX" -ne "0" ] && [ "$IS_X86" -ne "0" ]; then +CPU=$(cat /proc/cpuinfo | grep -c '^processor') +if [ "$CPU" -gt "1" ]; then + echo "$CPU processors, using \"$MAKE -j $CPU\"" + MAKE="$MAKE -j $CPU" +fi +fi + if [ -z "$TMP" ]; then TMP=/tmp fi @@ -194,10 +204,10 @@ echo "Testing: debug, default CXXFLAGS" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O2" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -219,10 +229,10 @@ echo "Testing: release, default CXXFLAGS" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -244,10 +254,10 @@ echo "Testing: debug, default CXXFLAGS, DISABLE_ASM" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O2 -DCRYPTOPP_DISABLE_ASM" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -269,10 +279,10 @@ echo "Testing: release, default CXXFLAGS, DISABLE_ASM" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_DISABLE_ASM" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -295,10 +305,10 @@ if [ "$HAVE_CXX03" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O2 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -322,10 +332,10 @@ if [ "$HAVE_CXX03" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -349,10 +359,10 @@ if [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O2 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -376,10 +386,10 @@ if [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -402,10 +412,10 @@ echo "Testing: debug, MAINTAIN_BACKWARDS_COMPATIBILITY" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O2 -DCRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -427,10 +437,10 @@ echo "Testing: release, MAINTAIN_BACKWARDS_COMPATIBILITY" | tee -a "$TEST_RESULT echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" fi @@ -452,10 +462,10 @@ echo "Testing: debug, INIT_PRIORITY" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O1 -DCRYPTOPP_INIT_PRIORITY=250 $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -477,10 +487,10 @@ echo "Testing: release, INIT_PRIORITY" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_INIT_PRIORITY=250 $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -503,10 +513,10 @@ echo "Testing: release, NO_UNALIGNED_DATA_ACCESS" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -529,10 +539,10 @@ echo "Testing: release, NO_BACKWARDS_COMPATIBILITY_562" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -554,10 +564,10 @@ echo "Testing: debug, NO_OS_DEPENDENCE" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O1 -DNO_OS_DEPENDENCE $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -579,10 +589,10 @@ echo "Testing: release, NO_OS_DEPENDENCE" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DNO_OS_DEPENDENCE $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -604,10 +614,10 @@ echo "Testing: debug, -O3 optimizations" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O3 $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -629,10 +639,10 @@ echo "Testing: release, -O3 optimizations" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O3 $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -654,10 +664,10 @@ echo "Testing: debug, -Os optimizations" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -Os $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -679,10 +689,10 @@ echo "Testing: release, -Os optimizations" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -Os $ADD_CXXFLAGS" -"$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" +$MAKE static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -704,10 +714,10 @@ echo "Testing: debug, dead code strip" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O2 $ADD_CXXFLAGS" -"$MAKE" lean 2>&1 | tee -a "$TEST_RESULTS" +$MAKE lean 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -729,10 +739,10 @@ echo "Testing: release, dead code strip" | tee -a "$TEST_RESULTS" echo unset CXXFLAGS -"$MAKE" clean > /dev/null 2>&1 +$MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 $ADD_CXXFLAGS" -"$MAKE" lean 2>&1 | tee -a "$TEST_RESULTS" +$MAKE lean 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -755,10 +765,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$HAVE_UBSAN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O1 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" ubsan | tee -a "$TEST_RESULTS" + $MAKE ubsan | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -782,10 +792,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$HAVE_UBSAN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" ubsan | tee -a "$TEST_RESULTS" + $MAKE ubsan | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -809,10 +819,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$HAVE_ASAN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DDEBUG -g2 -O1 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" asan | tee -a "$TEST_RESULTS" + $MAKE asan | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -836,10 +846,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$HAVE_ASAN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" asan | tee -a "$TEST_RESULTS" + $MAKE asan | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -862,10 +872,10 @@ if [ "$HAVE_CXX11" -ne "0" ] && [ "$HAVE_UBSAN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" ubsan | tee -a "$TEST_RESULTS" + $MAKE ubsan | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -889,10 +899,10 @@ if [ "$HAVE_CXX11" -ne "0" ] && [ "$HAVE_ASAN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" asan | tee -a "$TEST_RESULTS" + $MAKE asan | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -919,10 +929,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$IS_DARWIN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 -stdlib=libc++ $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -946,10 +956,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$IS_DARWIN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 -stdlib=libstdc++ $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -973,10 +983,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -stdlib=libc++ $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1000,10 +1010,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -stdlib=libstdc++ $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1027,10 +1037,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_INTEL_MULTIARCH" -ne "0" ] && [ "$HAVE_C echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -arch i386 -arch x86_64 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1065,10 +1075,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_INTEL_MULTIARCH" -ne "0" ] && [ "$HAVE_C echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -arch i386 -arch x86_64 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1103,10 +1113,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_PPC_MULTIARCH" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -arch ppc -arch ppc64 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1141,10 +1151,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_CXX03" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1174,10 +1184,10 @@ if [ "$IS_DARWIN" -ne "0" ] && [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1213,11 +1223,11 @@ if [ "$IS_DARWIN" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXX="$XCODE_COMPILER" export CXXFLAGS="-DNDEBUG -g2 -O2 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1242,10 +1252,10 @@ if [ "$HAVE_CXX03" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -O3 -std=c++03 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1265,10 +1275,10 @@ if [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -O3 -std=c++11 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1291,10 +1301,10 @@ if [ "$IS_MINGW" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DPREFER_BERKELEY_STYLE_SOCKETS -DNO_WINDOWS_STYLE_SOCKETS $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1318,10 +1328,10 @@ if [ "$IS_MINGW" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DPREFER_WINDOWS_STYLE_SOCKETS -DNO_BERKELEY_STYLE_SOCKETS $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1345,10 +1355,10 @@ if [ "$HAVE_CXX03" -ne "0" ] && [ "$HAVE_VALGRIND" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -std=c++03 -g3 -O1 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1366,10 +1376,10 @@ if [ "$HAVE_VALGRIND" -ne "0" ] && [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -std=c++11 -g3 -O1 $ADD_CXXFLAGS" - "$MAKE" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1390,7 +1400,7 @@ if [ "$HAVE_CXX03" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 if [ "$CXX" == "g++" ]; then export CXXFLAGS="-DDEBUG -g2 -O2 -std=c++03 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-aliasing=3 -Wstrict-overflow -Waggressive-loop-optimizations -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security -Wtrampolines" @@ -1398,7 +1408,7 @@ if [ "$HAVE_CXX03" -ne "0" ]; then export CXXFLAGS="-DDEBUG -g2 -O2 -std=c++03 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-overflow -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security" fi - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$WARN_RESULTS" fi @@ -1411,7 +1421,7 @@ if [ "$HAVE_CXX03" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 if [ "$CXX" == "g++" ]; then export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-aliasing=3 -Wstrict-overflow -Waggressive-loop-optimizations -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security -Wtrampolines" @@ -1419,7 +1429,7 @@ if [ "$HAVE_CXX03" -ne "0" ]; then export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++03 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-overflow -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security" fi - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" if [ "$?" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$WARN_RESULTS" fi @@ -1437,7 +1447,7 @@ if [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 if [ "$CXX" == "g++" ]; then export CXXFLAGS="-DDEBUG -g2 -O2 -std=c++11 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-aliasing=3 -Wstrict-overflow -Waggressive-loop-optimizations -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security -Wtrampolines" @@ -1445,7 +1455,7 @@ if [ "$HAVE_CXX11" -ne "0" ]; then export CXXFLAGS="-DDEBUG -g2 -O2 -std=c++11 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-overflow -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security" fi - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$WARN_RESULTS" fi @@ -1458,7 +1468,7 @@ if [ "$HAVE_CXX11" -ne "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 if [ "$CXX" == "g++" ]; then export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-aliasing=3 -Wstrict-overflow -Waggressive-loop-optimizations -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security -Wtrampolines" @@ -1466,7 +1476,7 @@ if [ "$HAVE_CXX11" -ne "0" ]; then export CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562 -Wall -Wextra -Wno-unknown-pragmas -Wstrict-overflow -Wcast-align -Wwrite-strings -Wformat=2 -Wformat-security" fi - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$WARN_RESULTS" if [ "$?" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$WARN_RESULTS" fi @@ -1489,9 +1499,9 @@ if [ "$CXX" == "g++" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 - "$MAKE" CXX="$CLANG_COMPILER" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" + $MAKE CXX="$CLANG_COMPILER" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else @@ -1517,19 +1527,19 @@ if [ "$IS_CYGWIN" -eq "0" ] && [ "$IS_MINGW" -eq "0" ]; then echo unset CXXFLAGS - "$MAKE" clean > /dev/null 2>&1 + $MAKE clean > /dev/null 2>&1 INSTALL_DIR="/tmp/cryptopp_test" rm -rf "$INSTALL_DIR" > /dev/null 2>&1 export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_DATA_DIR='\"$INSTALL_DIR/share/cryptopp/\"'" - "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$INSTALL_RESULTS" + $MAKE static dynamic cryptest.exe 2>&1 | tee -a "$INSTALL_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$INSTALL_RESULTS" else # Still need to manulally place TestData and TestVectors OLD_DIR=$(pwd) - "$MAKE" install PREFIX="$INSTALL_DIR" 2>&1 | tee -a "$INSTALL_RESULTS" + $MAKE install PREFIX="$INSTALL_DIR" 2>&1 | tee -a "$INSTALL_RESULTS" cd "$INSTALL_DIR/bin" echo