From dcabbd2112df647952d2ee42cae277c7431c7311 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 30 Oct 2017 08:33:16 -0400 Subject: [PATCH] Fix Elevated Warnings test We were using HAVE_GCC and HAVE_CLANG instead of GCC_COMPILER and CLANG_COMPIELR --- TestScripts/cryptest.sh | 8 ++++---- cryptest.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh index ddfef9f3..cc4a737b 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -5170,7 +5170,7 @@ fi ############################################ # C++03 with elevated warnings -if [[ ("$HAVE_CXX03" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX03" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build @@ -5208,7 +5208,7 @@ fi ############################################ # C++11 with elevated warnings -if [[ ("$HAVE_CXX11" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX11" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build @@ -5246,7 +5246,7 @@ fi ############################################ # C++14 with elevated warnings -if [[ ("$HAVE_CXX14" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX14" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build @@ -5284,7 +5284,7 @@ fi ############################################ # C++17 with elevated warnings -if [[ ("$HAVE_CXX17" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX17" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build diff --git a/cryptest.sh b/cryptest.sh index ddfef9f3..cc4a737b 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -5170,7 +5170,7 @@ fi ############################################ # C++03 with elevated warnings -if [[ ("$HAVE_CXX03" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX03" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build @@ -5208,7 +5208,7 @@ fi ############################################ # C++11 with elevated warnings -if [[ ("$HAVE_CXX11" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX11" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build @@ -5246,7 +5246,7 @@ fi ############################################ # C++14 with elevated warnings -if [[ ("$HAVE_CXX14" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX14" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build @@ -5284,7 +5284,7 @@ fi ############################################ # C++17 with elevated warnings -if [[ ("$HAVE_CXX17" -ne "0" && ("$HAVE_GCC" -ne "0" || "$HAVE_CLANG" -ne "0")) ]]; then +if [[ ("$HAVE_CXX17" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0")) ]]; then ############################################ # Debug build