Removed 'make zip' test.
The recipe cleans our result file, which is not very useful if the Terminal window cannot be searchedpull/263/head
parent
3074541e92
commit
b8adfde288
80
cryptest.sh
80
cryptest.sh
|
|
@ -631,24 +631,6 @@ if [[ (-z "$HAVE_UNIFIED_ASM") ]]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Testing 'make zip'
|
||||
if [[ (-z "$HAVE_ZIP") ]]; then
|
||||
HAVE_ZIP=0
|
||||
ZIP_PROG=$(which zip 2>&1 | "$GREP" -v "no zip" | head -1)
|
||||
UNZIP_PROG=$(which unzip 2>&1 | "$GREP" -v "no unzip" | head -1)
|
||||
if [[ (! -z "$ZIP_PROG" && ! -z "$UNZIP_PROG") ]]; then
|
||||
HAVE_ZIP=1
|
||||
zip -v > /dev/null 2>&1
|
||||
if [[ "$?" -ne "0" ]]; then
|
||||
HAVE_ZIP=0
|
||||
fi
|
||||
unzip -v > /dev/null 2>&1
|
||||
if [[ "$?" -ne "0" ]]; then
|
||||
HAVE_ZIP=0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# ARMv7 and ARMv8, including NEON, CRC32 and Crypto extensions
|
||||
if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
|
||||
|
||||
|
|
@ -5296,68 +5278,6 @@ if [[ ("$IS_CYGWIN" -eq "0" && "$IS_MINGW" -eq "0") ]]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
############################################
|
||||
# Test 'make zip'
|
||||
if [[ ("$HAVE_ZIP" -ne "0") ]]; then
|
||||
|
||||
OLD_DIR=$(pwd)
|
||||
"$MAKE" zip > /dev/null 2>&1
|
||||
|
||||
unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/" > /dev/null 2>&1
|
||||
if [[ "$?" -eq "0" ]]; then
|
||||
cd "$TMP/cryptopp563-zip/"
|
||||
|
||||
############################################
|
||||
# Debug
|
||||
echo
|
||||
echo "************************************" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
|
||||
echo "Testing: Debug, 'make zip'" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
|
||||
echo
|
||||
|
||||
"$MAKE" clean > /dev/null 2>&1
|
||||
rm -f adhoc.cpp > /dev/null 2>&1
|
||||
|
||||
CXX="$CXX" CXXFLAGS="$DEBUG_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" 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
|
||||
./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
|
||||
if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
|
||||
echo "ERROR: failed to execute validation suite" | tee -a "$TEST_RESULTS"
|
||||
fi
|
||||
./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
|
||||
if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
|
||||
echo "ERROR: failed to execute test vectors" | tee -a "$TEST_RESULTS"
|
||||
fi
|
||||
fi
|
||||
|
||||
############################################
|
||||
# Release
|
||||
echo
|
||||
echo "************************************" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
|
||||
echo "Testing: Release, 'make zip'" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
|
||||
echo
|
||||
|
||||
"$MAKE" clean > /dev/null 2>&1
|
||||
rm -f adhoc.cpp > /dev/null 2>&1
|
||||
|
||||
CXX="$CXX" CXXFLAGS="$RELEASECXXFLAGS" "$MAKE" "${MAKEARGS[@]}" 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
|
||||
./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
|
||||
if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
|
||||
echo "ERROR: failed to execute validation suite" | tee -a "$TEST_RESULTS"
|
||||
fi
|
||||
./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
|
||||
if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
|
||||
echo "ERROR: failed to execute test vectors" | tee -a "$TEST_RESULTS"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
cd "$OLD_DIR"
|
||||
fi
|
||||
|
||||
#############################################
|
||||
#############################################
|
||||
################ END TESTING ################
|
||||
|
|
|
|||
Loading…
Reference in New Issue