From 454f528d3c45bfd74e4944e349391c3f593e3f50 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 10 Jun 2016 03:05:34 -0400 Subject: [PATCH] Simplified IS_X86 and IS_X64 un SunOS. Add separator for benchmark tests --- GNUmakefile | 6 ++---- cryptest.sh | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 80bf9803..0f56b804 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -39,10 +39,8 @@ HAS_SOLIB_VERSION := $(IS_LINUX) # Fixup SunOS ifeq ($(IS_SUN),1) -IS_X64 := $(shell isainfo 2>/dev/null | grep -i -c "amd64") -ifeq ($(IS_X64),1) - IS_X86 := 0 -endif +IS_X86 := $(shell isainfo -k 2>/dev/null | grep -i -c "i386") +IS_X64 := $(shell isainfo -k 2>/dev/null | grep -i -c "amd64") endif ########################################################### diff --git a/cryptest.sh b/cryptest.sh index 69d97914..f1cda7c1 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -2016,6 +2016,7 @@ if [ "$HAVE_CXX03" -ne "0" ]; then if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else + echo "**************************************" >> "$BENCHMARK_RESULTS" ./cryptest.exe b 3 "$CPU_FREQ" 2>&1 | tee -a "$BENCHMARK_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then 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 echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS" else + echo "**************************************" >> "$BENCHMARK_RESULTS" ./cryptest.exe b 3 "$CPU_FREQ" 2>&1 | tee -a "$BENCHMARK_RESULTS" if [ "${PIPESTATUS[0]}" -ne "0" ]; then echo "ERROR: failed to execute benchmarks" | tee -a "$BENCHMARK_RESULTS"