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

Added guards for Install test on Cygwin and MinGW. Added new file cryptest-install.txt for install log

pull/3/head
Jeffrey Walton 2016-01-01 02:04:08 -05:00
parent 3afcf528d6
commit 0e26a3317a
1 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
cryptest.sh
View File

@ -15,6 +15,7 @@
TEST_RESULTS=cryptest-result.txt TEST_RESULTS=cryptest-result.txt
BENCHMARK_RESULTS=cryptest-bench.txt BENCHMARK_RESULTS=cryptest-bench.txt
WARN_RESULTS=cryptest-warn.txt WARN_RESULTS=cryptest-warn.txt
INSTALL_RESULTS=cryptest-install.txt
# Respect user's preferred flags, but filter the stuff we expliclty test # Respect user's preferred flags, but filter the stuff we expliclty test
#if [ ! -z "CXXFLAGS" ]; then #if [ ! -z "CXXFLAGS" ]; then
@ -1079,7 +1080,7 @@ if [ "$HAVE_VALGRIND" -ne "0" ] && [ "$HAVE_CXX11" -ne "0" ]; then
fi fi
############################################ ############################################
# Build with elevated warnings
if [ "$CXX" == "g++" ] && [ "$HAVE_CXX11" -ne "0" ]; then if [ "$CXX" == "g++" ] && [ "$HAVE_CXX11" -ne "0" ]; then
############################################ ############################################
@ -1116,7 +1117,6 @@ if [ "$CXX" == "g++" ] && [ "$HAVE_CXX11" -ne "0" ]; then
fi fi
############################################ ############################################
# If using GCC (likely Linux), then perform a quick check with Clang. # If using GCC (likely Linux), then perform a quick check with Clang.
# This check was added after testing on Ubuntu 14.04 with Clang 3.4. # This check was added after testing on Ubuntu 14.04 with Clang 3.4.
if [ "$CXX" == "g++" ]; then if [ "$CXX" == "g++" ]; then
@ -1146,57 +1146,58 @@ if [ "$CXX" == "g++" ]; then
fi fi
############################################ ############################################
# Test an install with CRYPTOPP_DATA_DIR # Test an install with CRYPTOPP_DATA_DIR
if [ "$IS_CYGWIN" -eq "0" ] && [ "$IS_MINGW" -eq "0" ]; then
echo
echo "************************************" | tee -a "$TEST_RESULTS"
echo "Testing: Test install with data directory" | tee -a "$TEST_RESULTS"
echo
unset CXXFLAGS
"$MAKE" clean > /dev/null 2>&1
rm -rf /tmp/cryptopp_test/ > /dev/null 2>&1
export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_DATA_DIR='\"/tmp/cryptopp_test/share/\"' "
"$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
# Still need to manulally place TestData and TestVectors
mkdir -p /tmp/cryptopp_test/share/TestData /tmp/cryptopp_test/share/TestVectors
cp -r TestData /tmp/cryptopp_test/share/
cp -r TestVectors /tmp/cryptopp_test/share/
OLD_DIR=$(pwd)
make install PREFIX=/tmp/cryptopp_test/ 2>&1 | tee -a "$TEST_RESULTS"
cd /tmp/cryptopp_test/bin
echo echo
echo "************************************" | tee -a "$TEST_RESULTS" echo "************************************" | tee -a "$INSTALL_RESULTS"
echo "Testing: Install (validation suite)" | tee -a "$TEST_RESULTS" echo "Testing: Test install with data directory" | tee -a "$INSTALL_RESULTS"
echo echo
./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
echo unset CXXFLAGS
echo "************************************" | tee -a "$TEST_RESULTS" "$MAKE" clean > /dev/null 2>&1
echo "Testing: Install (test vectors)" | tee -a "$TEST_RESULTS" rm -rf /tmp/cryptopp_test/ > /dev/null 2>&1
echo
./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
echo export CXXFLAGS="-DNDEBUG -g2 -O2 -DCRYPTOPP_DATA_DIR='\"/tmp/cryptopp_test/share/\"' "
echo "************************************" | tee -a "$TEST_RESULTS" "$MAKE" static dynamic cryptest.exe 2>&1 | tee -a "$INSTALL_RESULTS"
echo "Testing: Install (benchmarks)" | tee -a "$TEST_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then
echo echo "ERROR: failed to make cryptest.exe" | tee -a "$INSTALL_RESULTS"
./cryptest.exe b 1 2.4+1e9 2>&1 | tee -a "$BENCHMARK_RESULTS" else
# Still need to manulally place TestData and TestVectors
mkdir -p /tmp/cryptopp_test/share/TestData /tmp/cryptopp_test/share/TestVectors
cp -r TestData /tmp/cryptopp_test/share/
cp -r TestVectors /tmp/cryptopp_test/share/
echo OLD_DIR=$(pwd)
echo "************************************" | tee -a "$TEST_RESULTS" make install PREFIX=/tmp/cryptopp_test/ 2>&1 | tee -a "$INSTALL_RESULTS"
echo "Testing: Test install (help file)" | tee -a "$TEST_RESULTS" cd /tmp/cryptopp_test/bin
echo
./cryptest.exe h 2>&1 | tee -a "$BENCHMARK_RESULTS"
cd "$OLD_DIR" echo
echo "************************************" | tee -a "$INSTALL_RESULTS"
echo "Testing: Install (validation suite)" | tee -a "$INSTALL_RESULTS"
echo
./cryptest.exe v 2>&1 | tee -a "$INSTALL_RESULTS"
echo
echo "************************************" | tee -a "$INSTALL_RESULTS"
echo "Testing: Install (test vectors)" | tee -a "$INSTALL_RESULTS"
echo
./cryptest.exe tv all 2>&1 | tee -a "$INSTALL_RESULTS"
echo
echo "************************************" | tee -a "$INSTALL_RESULTS"
echo "Testing: Install (benchmarks)" | tee -a "$INSTALL_RESULTS"
echo
./cryptest.exe b 1 2.4+1e9 2>&1 | tee -a "$INSTALL_RESULTS"
echo
echo "************************************" | tee -a "$INSTALL_RESULTS"
echo "Testing: Install (help file)" | tee -a "$INSTALL_RESULTS"
echo
./cryptest.exe h 2>&1 | tee -a "$INSTALL_RESULTS"
cd "$OLD_DIR"
fi
fi fi
############################################ ############################################