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

Simplified IS_X86 and IS_X64 un SunOS. Add separator for benchmark tests

pull/186/head
Jeffrey Walton 2016-06-10 03:05:34 -04:00
parent b8c062247c
commit 454f528d3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile
View File

@ -39,10 +39,8 @@ HAS_SOLIB_VERSION := $(IS_LINUX)
# Fixup SunOS # Fixup SunOS
ifeq ($(IS_SUN),1) ifeq ($(IS_SUN),1)
IS_X64 := $(shell isainfo 2>/dev/null | grep -i -c "amd64") IS_X86 := $(shell isainfo -k 2>/dev/null | grep -i -c "i386")
ifeq ($(IS_X64),1) IS_X64 := $(shell isainfo -k 2>/dev/null | grep -i -c "amd64")
IS_X86 := 0
endif
endif endif
########################################################### ###########################################################

2
cryptest.sh
View File

@ -2016,6 +2016,7 @@ if [ "$HAVE_CXX03" -ne "0" ]; then
if [ "${PIPESTATUS[0]}" -ne "0" ]; then if [ "${PIPESTATUS[0]}" -ne "0" ]; then
echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS"
else else
echo "**************************************" >> "$BENCHMARK_RESULTS"
./cryptest.exe b 3 "$CPU_FREQ" 2>&1 | tee -a "$BENCHMARK_RESULTS" ./cryptest.exe b 3 "$CPU_FREQ" 2>&1 | tee -a "$BENCHMARK_RESULTS"
if [ "${PIPESTATUS[0]}" -ne "0" ]; then if [ "${PIPESTATUS[0]}" -ne "0" ]; then
echo "ERROR: failed to execute benchmarks" | tee -a "$BENCHMARK_RESULTS" echo "ERROR: failed to execute benchmarks" | tee -a "$BENCHMARK_RESULTS"
@ -2046,6 +2047,7 @@ if [ "$HAVE_CXX11" -ne "0" ]; then
if [ "${PIPESTATUS[0]}" -ne "0" ]; then if [ "${PIPESTATUS[0]}" -ne "0" ]; then
echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS"
else else
echo "**************************************" >> "$BENCHMARK_RESULTS"
./cryptest.exe b 3 "$CPU_FREQ" 2>&1 | tee -a "$BENCHMARK_RESULTS" ./cryptest.exe b 3 "$CPU_FREQ" 2>&1 | tee -a "$BENCHMARK_RESULTS"
if [ "${PIPESTATUS[0]}" -ne "0" ]; then if [ "${PIPESTATUS[0]}" -ne "0" ]; then
echo "ERROR: failed to execute benchmarks" | tee -a "$BENCHMARK_RESULTS" echo "ERROR: failed to execute benchmarks" | tee -a "$BENCHMARK_RESULTS"