From 9cc01defde81e65503fbb1a5ba14693ecaa7fd1f Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 1 Jan 2017 17:47:33 -0500 Subject: [PATCH] Add test for CRYPTOPP_INIT_PRIORITY=0 Once we made config.recommend the default, we needed to start testing the disabling of init_priority --- 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 0024d9d7..0a427f9b 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -2667,13 +2667,13 @@ if true; then # Debug build echo echo "************************************" | tee -a "$TEST_RESULTS" - echo "Testing: Debug, INIT_PRIORITY" | tee -a "$TEST_RESULTS" + echo "Testing: Debug, INIT_PRIORITY (0)" | tee -a "$TEST_RESULTS" echo "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 - CXXFLAGS="$DEBUG_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=250 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=0 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then @@ -2693,13 +2693,13 @@ if true; then # Release build echo echo "************************************" | tee -a "$TEST_RESULTS" - echo "Testing: Release, INIT_PRIORITY" | tee -a "$TEST_RESULTS" + echo "Testing: Release, INIT_PRIORITY (0)" | tee -a "$TEST_RESULTS" echo "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 - CXXFLAGS="$RELEASE_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=250 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" + CXXFLAGS="$RELEASE_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=0 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then diff --git a/cryptest.sh b/cryptest.sh index 0024d9d7..0a427f9b 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -2667,13 +2667,13 @@ if true; then # Debug build echo echo "************************************" | tee -a "$TEST_RESULTS" - echo "Testing: Debug, INIT_PRIORITY" | tee -a "$TEST_RESULTS" + echo "Testing: Debug, INIT_PRIORITY (0)" | tee -a "$TEST_RESULTS" echo "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 - CXXFLAGS="$DEBUG_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=250 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=0 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then @@ -2693,13 +2693,13 @@ if true; then # Release build echo echo "************************************" | tee -a "$TEST_RESULTS" - echo "Testing: Release, INIT_PRIORITY" | tee -a "$TEST_RESULTS" + echo "Testing: Release, INIT_PRIORITY (0)" | tee -a "$TEST_RESULTS" echo "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 - CXXFLAGS="$RELEASE_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=250 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" + CXXFLAGS="$RELEASE_CXXFLAGS -DCRYPTOPP_INIT_PRIORITY=0 ${PLATFORM_CXXFLAGS[@]} $USER_CXXFLAGS" CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS" if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then