From 5c1de7b5a5676a136e00eb2c2a8fcc18aded5bb9 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 4 May 2017 19:11:24 -0400 Subject: Add variable block size support to test and benchmarks CRYPTOPP_COVERAGE was added at 9614307ab7f4a4a4 to increase code coverage support. This commit enables additional validation routines when CRYPTOPP_COVERAGE is in effect. --- validat0.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'validat0.cpp') diff --git a/validat0.cpp b/validat0.cpp index 933f78ef..fd533df7 100644 --- a/validat0.cpp +++ b/validat0.cpp @@ -24,7 +24,7 @@ NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(Test) -#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS) +#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) bool TestRounding() { std::cout << "\nTesting RoundUpToMultipleOf/RoundDownToMultipleOf...\n\n"; @@ -470,7 +470,7 @@ bool TestRounding() } #endif -#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS) +#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) struct ASN1_TestTuple { int disposition; @@ -721,7 +721,7 @@ bool TestASN1Parse() } #endif -#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS) +#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) bool TestSecBlock() { std::cout << "\nTesting SecBlock...\n\n"; @@ -1685,7 +1685,7 @@ bool TestSecBlock() } #endif -#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS) +#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) bool TestHuffmanCodes() { std::cout << "\nTesting Huffman codes...\n\n"; @@ -1723,7 +1723,7 @@ bool TestHuffmanCodes() } #endif -#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS) +#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) bool TestIntegerBitops() { std::cout << "\nTesting Integer bitops...\n\n"; -- cgit v1.2.1