From 11f0186fd0c74feddc2b55cbb8083860fc88c663 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 19 Feb 2017 22:30:02 -0500 Subject: [PATCH] Add DragonFly support to cryptest.sh --- TestScripts/cryptest.sh | 5 ++++- cryptest.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh index d6ede414..6fa4d458 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -83,6 +83,7 @@ IS_LINUX=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c linux) IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c cygwin) IS_MINGW=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c mingw) IS_OPENBSD=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c openbsd) +IS_DRAGONFLY=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c dragonfly) IS_FREEBSD=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c freebsd) IS_NETBSD=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c netbsd) IS_SOLARIS=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c sunos) @@ -130,7 +131,7 @@ if [[ "$IS_DARWIN" -ne 0 ]]; then fi # Fixup -if [[ ("$IS_FREEBSD" -ne "0" || "$IS_OPENBSD" -ne "0" || "$IS_NETBSD" -ne "0") ]]; then +if [[ ("$IS_FREEBSD" -ne "0" || "$IS_OPENBSD" -ne "0" || "$IS_NETBSD" -ne "0" || "$IS_DRAGONFLY" -ne "0") ]]; then MAKE=gmake elif [[ ("$IS_SOLARIS" -ne "0") ]]; then MAKE=$(which gmake 2>/dev/null | "$GREP" -v "no gmake" | head -1) @@ -149,6 +150,8 @@ if [[ ("$IS_X86" -ne "0" || "$IS_X64" -ne "0") ]]; then X86_CPU_FLAGS=$(isainfo -v 2>/dev/null) elif [[ ("$IS_FREEBSD" -ne "0") ]]; then X86_CPU_FLAGS=$(grep Features /var/run/dmesg.boot) + elif [[ ("$IS_DRAGONFLY" -ne "0") ]]; then + X86_CPU_FLAGS=$(dmesg | grep Features) else X86_CPU_FLAGS=$(cat /proc/cpuinfo 2>&1 | "$AWK" '{IGNORECASE=1}{if ($1 == "flags"){print;exit}}' | cut -f 2 -d ':') fi diff --git a/cryptest.sh b/cryptest.sh index d6ede414..6fa4d458 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -83,6 +83,7 @@ IS_LINUX=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c linux) IS_CYGWIN=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c cygwin) IS_MINGW=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c mingw) IS_OPENBSD=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c openbsd) +IS_DRAGONFLY=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c dragonfly) IS_FREEBSD=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c freebsd) IS_NETBSD=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c netbsd) IS_SOLARIS=$(echo -n "$THIS_SYSTEM" | "$GREP" -i -c sunos) @@ -130,7 +131,7 @@ if [[ "$IS_DARWIN" -ne 0 ]]; then fi # Fixup -if [[ ("$IS_FREEBSD" -ne "0" || "$IS_OPENBSD" -ne "0" || "$IS_NETBSD" -ne "0") ]]; then +if [[ ("$IS_FREEBSD" -ne "0" || "$IS_OPENBSD" -ne "0" || "$IS_NETBSD" -ne "0" || "$IS_DRAGONFLY" -ne "0") ]]; then MAKE=gmake elif [[ ("$IS_SOLARIS" -ne "0") ]]; then MAKE=$(which gmake 2>/dev/null | "$GREP" -v "no gmake" | head -1) @@ -149,6 +150,8 @@ if [[ ("$IS_X86" -ne "0" || "$IS_X64" -ne "0") ]]; then X86_CPU_FLAGS=$(isainfo -v 2>/dev/null) elif [[ ("$IS_FREEBSD" -ne "0") ]]; then X86_CPU_FLAGS=$(grep Features /var/run/dmesg.boot) + elif [[ ("$IS_DRAGONFLY" -ne "0") ]]; then + X86_CPU_FLAGS=$(dmesg | grep Features) else X86_CPU_FLAGS=$(cat /proc/cpuinfo 2>&1 | "$AWK" '{IGNORECASE=1}{if ($1 == "flags"){print;exit}}' | cut -f 2 -d ':') fi