Fix summary output in cryptest.sh

1 files changed, 325 insertions, 13 deletions

diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh
index 32997024..fc6d119a 100755
--- a/TestScripts/cryptest.sh
+++ b/TestScripts/cryptest.sh
@@ -67,6 +67,9 @@ unset CRYPTOPP_DATA_DIR
 # Avoid Malloc and Scribble guards on OS X (they are tested below)
 unset MallocScribble MallocPreScribble MallocGuardEdges
 
+# List of tests performed
+TEST_LIST=()
+
 ############################################
 # Setup tools and platforms
 
@@ -973,6 +976,7 @@ if true; then
 	echo "Testing: No Posix NDEBUG or assert" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("No Posix NDEBUG or assert")
 	FAILED=0
 
 	# Filter out C++ and Doxygen comments.
@@ -1011,6 +1015,7 @@ if true; then
 	echo "Testing: C++ std::min and std::max" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("C++ std::min and std::max")
 	FAILED=0
 
 	# If this fires, then use the library's STDMIN(a,b) or (std::min)(a, b);
@@ -1046,6 +1051,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_X86" -ne "0" || "$IS_X64" -ne "0")) ]]; t
 		echo "Testing: X86 rotate immediate code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("X86 rotate immediate code generation")
+
 		OBJFILE=sha.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1092,6 +1099,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_X86" -ne "0" || "$IS_X64" -ne "0")) ]]; t
 		echo "Testing: X86 CRC32 code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("X86 CRC32 code generation")
+
 		OBJFILE=crc-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1130,6 +1139,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_X86" -ne "0" || "$IS_X64" -ne "0")) ]]; t
 		echo "Testing: X86 AES-NI code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("X86 AES-NI code generation")
+
 		OBJFILE=rijndael-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1192,6 +1203,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_X86" -ne "0" || "$IS_X64" -ne "0")) ]]; t
 		echo "Testing: X86 carryless multiply code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("X86 carryless multiply code generation")
+
 		OBJFILE=gcm-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1234,6 +1247,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_X86" -ne "0" || "$IS_X64" -ne "0")) ]]; t
 		echo "Testing: X86 RDRAND and RDSEED code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("X86 RDRAND and RDSEED code generation")
+
 		OBJFILE=rdrand.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1276,6 +1291,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_X86" -ne "0" || "$IS_X64" -ne "0")) ]]; t
 		echo "Testing: X86 SHA code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("X86 SHA code generation")
+
 		OBJFILE=sha-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1345,6 +1362,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		echo "Testing: ARM NEON code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("ARM NEON code generation")
+
 		OBJFILE=aria-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1451,6 +1470,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		echo "Testing: ARM CRC32 code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("ARM CRC32 code generation")
+
 		OBJFILE=crc-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1501,6 +1522,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		echo "Testing: ARM carryless multiply code generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("ARM carryless multiply code generation")
+
 		OBJFILE=gcm-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1539,6 +1562,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		echo "Testing: ARM AES generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("ARM AES generation")
+
 		OBJFILE=rijndael-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1589,6 +1614,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0")) ]
 		echo "Testing: ARM SHA generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("ARM SHA generation")
+
 		OBJFILE=sha-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1691,6 +1718,8 @@ if [[ ("$HAVE_DISASS" -ne "0" && ("$IS_PPC32" -ne "0" || "$IS_PPC64" -ne "0")) ]
 		echo "Testing: Power8 AES generation" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Power8 AES generation")
+
 		OBJFILE=rijndael-simd.o; rm -f "$OBJFILE" 2>/dev/null
 		CXX="$CXX" CXXFLAGS="$RELEASE_CXXFLAGS $PPC_AES_FLAGS" "$MAKE" "${MAKEARGS[@]}" $OBJFILE 2>&1 | tee -a "$TEST_RESULTS"
 
@@ -1738,6 +1767,8 @@ if true; then
 	echo "Testing: Debug, default CXXFLAGS" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, default CXXFLAGS")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1764,6 +1795,8 @@ if true; then
 	echo "Testing: Release, default CXXFLAGS" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, default CXXFLAGS")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1795,6 +1828,8 @@ if [[ "$HAVE_LD_LIBRARY_PATH" -ne "0" ]]; then
 	echo "Testing: Debug, shared object" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, shared object")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1825,6 +1860,8 @@ if [[ "$HAVE_LD_LIBRARY_PATH" -ne "0" ]]; then
 	echo "Testing: Release, shared object" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, shared object")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1859,6 +1896,8 @@ if [[ "$HAVE_DYLD_LIBRARY_PATH" -ne "0" ]]; then
 	echo "Testing: Debug, dynamic library" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, dynamic library")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1889,6 +1928,8 @@ if [[ "$HAVE_DYLD_LIBRARY_PATH" -ne "0" ]]; then
 	echo "Testing: Release, dynamic library" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, dynamic library")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1930,6 +1971,8 @@ if [[ ("$IS_DEBIAN" -ne "0" || "$IS_UBUNTU" -ne "0") ]]; then
 	echo "Testing: Debian standard build" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debian standard build")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -1971,6 +2014,8 @@ if [[ ("$IS_FEDORA" -ne "0") ]]; then
 	echo "Testing: Fedora standard build" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Fedora standard build")
+
 	if [[ ! -f /usr/lib/rpm/redhat/redhat-hardened-cc1 ]]; then
 		echo "ERROR: please install redhat-rpm-config package"
 	else
@@ -2007,6 +2052,8 @@ if [[ ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0" || "$INTEL_COMPILER"
 		echo "Testing: Debug, i686 minimum arch CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Debug, i686 minimum arch CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2033,6 +2080,8 @@ if [[ ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0" || "$INTEL_COMPILER"
 		echo "Testing: Release, i686 minimum arch CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Release, i686 minimum arch CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2062,6 +2111,8 @@ if [[ ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0" || "$INTEL_COMPILER"
 		echo "Testing: Debug, x86_64 minimum arch CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Debug, x86_64 minimum arch CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2088,6 +2139,8 @@ if [[ ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -ne "0" || "$INTEL_COMPILER"
 		echo "Testing: Release, x86_64 minimum arch CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Release, x86_64 minimum arch CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2122,6 +2175,8 @@ if [[ ( ("$IS_X86" -ne "0" || "$IS_X32" -ne "0" || "$IS_X64" -ne "0") && "$HAVE_
 		echo "Testing: Debug, mismatched arch capabilities" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Debug, mismatched arch capabilities")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2152,6 +2207,8 @@ if [[ ( ("$IS_X86" -ne "0" || "$IS_X32" -ne "0" || "$IS_X64" -ne "0") && "$HAVE_
 		echo "Testing: Release, mismatched arch capabilities" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Release, mismatched arch capabilities")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2185,6 +2242,8 @@ if [[ ( ("$IS_X86" -ne "0" || "$IS_X32" -ne "0" || "$IS_X64" -ne "0") && "$HAVE_
 		echo "Testing: Debug, mismatched arch capabilities" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Debug, mismatched arch capabilities")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2215,6 +2274,8 @@ if [[ ( ("$IS_X86" -ne "0" || "$IS_X32" -ne "0" || "$IS_X64" -ne "0") && "$HAVE_
 		echo "Testing: Release, mismatched arch capabilities" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Release, mismatched arch capabilities")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2251,6 +2312,8 @@ if true; then
 	echo "Testing: Debug, DISABLE_ASM" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, DISABLE_ASM")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2277,6 +2340,8 @@ if true; then
 	echo "Testing: Release, DISABLE_ASM" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, DISABLE_ASM")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2308,6 +2373,8 @@ if true; then
 	echo "Testing: Debug, NO_CPU_FEATURE_PROBES" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, NO_CPU_FEATURE_PROBES")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2334,6 +2401,8 @@ if true; then
 	echo "Testing: Release, NO_CPU_FEATURE_PROBES" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, NO_CPU_FEATURE_PROBES")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2365,6 +2434,8 @@ if [[ "$HAVE_CXX11" -ne "0" ]] || [[ "$HAVE_GNU11" -ne "0" ]]; then
 	echo "Testing: Debug, CRYPTOPP_NO_CXX11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, CRYPTOPP_NO_CXX11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2391,6 +2462,8 @@ if [[ "$HAVE_CXX11" -ne "0" ]] || [[ "$HAVE_GNU11" -ne "0" ]]; then
 	echo "Testing: Release, CRYPTOPP_NO_CXX11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, CRYPTOPP_NO_CXX11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2422,6 +2495,8 @@ if [[ "$HAVE_CXX03" -ne "0" ]]; then
 	echo "Testing: Debug, c++03" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++03")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2448,6 +2523,8 @@ if [[ "$HAVE_CXX03" -ne "0" ]]; then
 	echo "Testing: Release, c++03" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++03")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2479,6 +2556,8 @@ if [[ "$HAVE_GNU03" -ne "0" ]]; then
 	echo "Testing: Debug, gnu++03" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, gnu++03")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2505,6 +2584,8 @@ if [[ "$HAVE_GNU03" -ne "0" ]]; then
 	echo "Testing: Release, gnu++03" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, gnu++03")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2536,6 +2617,8 @@ if [[ "$HAVE_CXX11" -ne "0" ]]; then
 	echo "Testing: Debug, c++11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2562,6 +2645,8 @@ if [[ "$HAVE_CXX11" -ne "0" ]]; then
 	echo "Testing: Release, c++11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2593,6 +2678,8 @@ if [[ "$HAVE_GNU11" -ne "0" ]]; then
 	echo "Testing: Debug, gnu++11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, gnu++11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2619,6 +2706,8 @@ if [[ "$HAVE_GNU11" -ne "0" ]]; then
 	echo "Testing: Release, gnu++11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, gnu++11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2650,6 +2739,8 @@ if [[ "$HAVE_CXX14" -ne "0" ]]; then
 	echo "Testing: Debug, c++14" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++14")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2676,6 +2767,8 @@ if [[ "$HAVE_CXX14" -ne "0" ]]; then
 	echo "Testing: Release, c++14" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++14")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2707,6 +2800,8 @@ if [[ "$HAVE_GNU14" -ne "0" ]]; then
 	echo "Testing: Debug, gnu++14" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, gnu++14")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2733,6 +2828,8 @@ if [[ "$HAVE_GNU14" -ne "0" ]]; then
 	echo "Testing: Release, gnu++14" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, gnu++14")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2764,6 +2861,8 @@ if [[ "$HAVE_CXX17" -ne "0" ]]; then
 	echo "Testing: Debug, c++17" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++17")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2790,6 +2889,8 @@ if [[ "$HAVE_CXX17" -ne "0" ]]; then
 	echo "Testing: Release, c++17" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++17")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2821,6 +2922,8 @@ if [[ "$HAVE_GNU17" -ne "0" ]]; then
 	echo "Testing: Debug, gnu++17" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, gnu++17")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2847,6 +2950,8 @@ if [[ "$HAVE_GNU17" -ne "0" ]]; then
 	echo "Testing: Release, gnu++17" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, gnu++17")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2878,6 +2983,8 @@ if [[ "$HAVE_X32" -ne "0" ]]; then
 	echo "Testing: Debug, X32" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, X32")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2904,6 +3011,8 @@ if [[ "$HAVE_X32" -ne "0" ]]; then
 	echo "Testing: Release, X32" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, X32")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2935,6 +3044,8 @@ if true; then
 	echo "Testing: Debug, INIT_PRIORITY (0)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, INIT_PRIORITY (0)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2961,6 +3072,8 @@ if true; then
 	echo "Testing: Release, INIT_PRIORITY (0)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, INIT_PRIORITY (0)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -2992,6 +3105,8 @@ if true; then
 	echo "Testing: Debug, NO_OS_DEPENDENCE" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, NO_OS_DEPENDENCE")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3018,6 +3133,8 @@ if true; then
 	echo "Testing: Release, NO_OS_DEPENDENCE" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, NO_OS_DEPENDENCE")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3049,6 +3166,8 @@ if [[ "$HAVE_LDGOLD" -ne "0" ]]; then
 	echo "Testing: Debug, ld-gold linker" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, ld-gold linker")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3075,6 +3194,8 @@ if [[ "$HAVE_LDGOLD" -ne "0" ]]; then
 	echo "Testing: Release, ld-gold linker" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, ld-gold linker")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3106,6 +3227,8 @@ if [[ "$HAVE_O3" -ne "0" ]]; then
 	echo "Testing: Debug, -O3 optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, -O3 optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3132,6 +3255,8 @@ if [[ "$HAVE_O3" -ne "0" ]]; then
 	echo "Testing: Release, -O3 optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, -O3 optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3163,6 +3288,8 @@ if [[ "$HAVE_O5" -ne "0" ]]; then
 	echo "Testing: Debug, -O5 optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, -O5 optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3189,6 +3316,8 @@ if [[ "$HAVE_O5" -ne "0" ]]; then
 	echo "Testing: Release, -O5 optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, -O5 optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3220,6 +3349,8 @@ if [[ "$HAVE_OS" -ne "0" ]]; then
 	echo "Testing: Debug, -Os optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, -Os optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3246,6 +3377,8 @@ if [[ "$HAVE_OS" -ne "0" ]]; then
 	echo "Testing: Release, -Os optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, -Os optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3277,6 +3410,8 @@ if [[ "$HAVE_OFAST" -ne "0" ]]; then
 	echo "Testing: Debug, -Ofast optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, -Ofast optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3303,6 +3438,8 @@ if [[ "$HAVE_OFAST" -ne "0" ]]; then
 	echo "Testing: Release, -Ofast optimizations" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, -Ofast optimizations")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3334,6 +3471,8 @@ if [[ ("$GNU_LINKER" -eq "1") ]]; then
 	echo "Testing: Debug, dead code strip" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, dead code strip")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3360,6 +3499,8 @@ if [[ ("$GNU_LINKER" -eq "1") ]]; then
 	echo "Testing: Release, dead code strip" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, dead code strip")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3383,11 +3524,16 @@ fi
 ############################################
 # OpenMP
 if [[ ("$HAVE_OMP" -ne "0") ]]; then
+
+	############################################
+	# Debug build
 	echo
 	echo "************************************" | tee -a "$TEST_RESULTS"
 	echo "Testing: Debug, OpenMP" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, OpenMP")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3407,11 +3553,15 @@ if [[ ("$HAVE_OMP" -ne "0") ]]; then
 		fi
 	fi
 
+	############################################
+	# Release build
 	echo
 	echo "************************************" | tee -a "$TEST_RESULTS"
 	echo "Testing: Release, OpenMP" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, OpenMP")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3443,6 +3593,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && "$HAVE_UBSAN" -ne "0") ]]; then
 	echo "Testing: Debug, c++03, UBsan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++03, UBsan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3469,6 +3621,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && "$HAVE_UBSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++03, UBsan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++03, UBsan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3500,6 +3654,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && "$HAVE_ASAN" -ne "0") ]]; then
 	echo "Testing: Debug, c++03, Asan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++03, Asan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3538,6 +3694,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && "$HAVE_ASAN" -ne "0") ]]; then
 	echo "Testing: Release, c++03, Asan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++03, Asan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3580,6 +3738,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && "$HAVE_BSAN" -ne "0") ]]; then
 	echo "Testing: Debug, c++03, Bounds Sanitizer" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++03, Bounds Sanitizer")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3618,6 +3778,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && "$HAVE_BSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++03, Bounds Sanitizer" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++03, Bounds Sanitizer")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3659,6 +3821,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_CET" -ne "0") ]]; then
 	echo "Testing: Debug, c++03, CET" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++03, CET")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3685,6 +3849,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_CET" -ne "0") ]]; then
 	echo "Testing: Release, c++03, CET" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++03, CET")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3716,6 +3882,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_UBSAN" -ne "0") ]]; then
 	echo "Testing: Debug, c++11, UBsan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++11, UBsan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3742,6 +3910,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_UBSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++11, UBsan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++11, UBsan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3773,6 +3943,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_ASAN" -ne "0") ]]; then
 	echo "Testing: Debug, c++11, Asan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++11, Asan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3811,6 +3983,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_ASAN" -ne "0") ]]; then
 	echo "Testing: Release, c++11, Asan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++11, Asan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3853,6 +4027,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_BSAN" -ne "0") ]]; then
 	echo "Testing: Debug, c++11, Bounds Sanitizer" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++11, Bounds Sanitizer")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3891,6 +4067,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_BSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++11, Bounds Sanitizer" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++11, Bounds Sanitizer")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3933,6 +4111,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_CET" -ne "0") ]]; then
 	echo "Testing: Debug, c++11, CET" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++11, CET")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3959,6 +4139,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && "$HAVE_CET" -ne "0") ]]; then
 	echo "Testing: Release, c++11, CET" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++11, CET")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -3987,6 +4169,8 @@ if [[ ("$HAVE_CXX14" -ne "0" && "$HAVE_UBSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++14, UBsan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++14, UBsan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4015,6 +4199,8 @@ if [[ ("$HAVE_CXX14" -ne "0" && "$HAVE_ASAN" -ne "0") ]]; then
 	echo "Testing: Release, c++14, Asan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++14, Asan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4054,6 +4240,8 @@ if [[ ("$HAVE_CXX14" -ne "0" && "$HAVE_BSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++14, Bounds Sanitizer" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++14, Bounds Sanitizer")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4082,6 +4270,8 @@ if [[ ("$HAVE_CXX14" -ne "0" && "$HAVE_CET" -ne "0") ]]; then
 	echo "Testing: Release, c++14, CET" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++14, CET")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4110,6 +4300,8 @@ if [[ ("$HAVE_CXX17" -ne "0" && "$HAVE_UBSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++17, UBsan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++17, UBsan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4138,6 +4330,8 @@ if [[ ("$HAVE_CXX17" -ne "0" && "$HAVE_ASAN" -ne "0") ]]; then
 	echo "Testing: Release, c++17, Asan" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++17, Asan")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4177,6 +4371,8 @@ if [[ ("$HAVE_CXX17" -ne "0" && "$HAVE_BSAN" -ne "0") ]]; then
 	echo "Testing: Release, c++17, Bounds Sanitizer" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++17, Bounds Sanitizer")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4205,6 +4401,8 @@ if [[ ("$HAVE_CXX17" -ne "0" && "$HAVE_CET" -ne "0") ]]; then
 	echo "Testing: Release, c++17, CET" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++17, CET")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4240,6 +4438,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.2, debug, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Sun Studio 12.2, debug, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4266,6 +4466,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.2, release, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Testing: Sun Studio 12.2, release, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4297,6 +4499,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.3, debug, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Sun Studio 12.3, debug, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4323,6 +4527,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.3, release, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Sun Studio 12.3, release, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4354,7 +4560,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.4, debug, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
-		# No workarounds... SunCC 5.13 does AES, PCLMUL, RDRAND, AVX, BMI, ADX...
+		TEST_LIST+=("Sun Studio 12.4, debug, platform CXXFLAGS")
 
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
@@ -4382,6 +4588,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.4, release, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Sun Studio 12.4, release, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4413,7 +4621,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.5, debug, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
-		# No workarounds... SunCC 5.14 does AES, PCLMUL, RDRAND, AVX, BMI, ADX...
+		TEST_LIST+=("Sun Studio 12.5, debug, platform CXXFLAGS")
 
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
@@ -4441,6 +4649,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.5, release, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Sun Studio 12.5, release, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4472,7 +4682,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.6, debug, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
-		# No workarounds... SunCC 5.15 does AES, PCLMUL, RDRAND, AVX, BMI, ADX...
+		TEST_LIST+=("Sun Studio 12.6, debug, platform CXXFLAGS")
 
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
@@ -4500,6 +4710,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Sun Studio 12.6, release, platform CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Sun Studio 12.6, release, platform CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4531,6 +4743,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Solaris GCC, debug, default CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Solaris GCC, debug, default CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4557,6 +4771,8 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		echo "Testing: Soalris GCC, release, default CXXFLAGS" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Soalris GCC, release, default CXXFLAGS")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4589,6 +4805,8 @@ if [[ ("$IS_DARWIN" -ne "0") && ("$HAVE_CXX03" -ne "0" && "$CLANG_COMPILER" -ne
 	echo "Testing: Darwin, c++03, libc++ (LLVM)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++03, libc++ (LLVM)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4617,6 +4835,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX03" -ne "0") ]]; then
 	echo "Testing: Darwin, c++03, libstdc++ (GNU)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++03, libstdc++ (GNU)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4645,6 +4865,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX11" -ne "0" && "$CLANG_COMPILER" -ne "0
 	echo "Testing: Darwin, c++11, libc++ (LLVM)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++11, libc++ (LLVM)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4673,6 +4895,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX11" -ne "0") ]]; then
 	echo "Testing: Darwin, c++11, libstdc++ (GNU)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++11, libstdc++ (GNU)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4701,6 +4925,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX14" -ne "0" && "$CLANG_COMPILER" -ne "0
 	echo "Testing: Darwin, c++14, libc++ (LLVM)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++14, libc++ (LLVM)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4729,6 +4955,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX14" -ne "0") ]]; then
 	echo "Testing: Darwin, c++14, libstdc++ (GNU)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++14, libstdc++ (GNU)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4757,6 +4985,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0" && "$CLANG_COMPILER" -ne "0
 	echo "Testing: Darwin, c++17, libc++ (LLVM)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++17, libc++ (LLVM)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4785,6 +5015,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0") ]]; then
 	echo "Testing: Darwin, c++17, libstdc++ (GNU)" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++17, libstdc++ (GNU)")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4813,6 +5045,8 @@ if [[ "$IS_DARWIN" -ne "0" && "$HAVE_INTEL_MULTIARCH" -ne "0" && "$HAVE_CXX03" -
 	echo "Testing: Darwin, Intel multiarch, c++03" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, Intel multiarch, c++03")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4852,6 +5086,8 @@ if [[ "$IS_DARWIN" -ne "0" && "$HAVE_INTEL_MULTIARCH" -ne "0" && "$HAVE_CXX11" -
 	echo "Testing: Darwin, Intel multiarch, c++11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, Intel multiarch, c++11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4891,6 +5127,8 @@ if [[ "$IS_DARWIN" -ne "0" && "$HAVE_INTEL_MULTIARCH" -ne "0" && "$HAVE_CXX14" -
 	echo "Testing: Darwin, Intel multiarch, c++14" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, Intel multiarch, c++14")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4930,6 +5168,8 @@ if [[ "$IS_DARWIN" -ne "0" && "$HAVE_INTEL_MULTIARCH" -ne "0" && "$HAVE_CXX17" -
 	echo "Testing: Darwin, Intel multiarch, c++17" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, Intel multiarch, c++17")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -4969,6 +5209,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_PPC_MULTIARCH" -ne "0") ]]; then
 	echo "Testing: Darwin, PowerPC multiarch" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, PowerPC multiarch")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5008,6 +5250,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX03" -ne "0") ]]; then
 	echo "Testing: Darwin, c++03, Malloc Guards" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++03, Malloc Guards")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5042,6 +5286,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX11" -ne "0") ]]; then
 	echo "Testing: Darwin, c++11, Malloc Guards" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++11, Malloc Guards")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5076,6 +5322,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX14" -ne "0") ]]; then
 	echo "Testing: Darwin, c++14, Malloc Guards" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++14, Malloc Guards")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5110,6 +5358,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0") ]]; then
 	echo "Testing: Darwin, c++17, Malloc Guards" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Darwin, c++17, Malloc Guards")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5148,7 +5398,10 @@ if [[ "$WANT_BENCHMARKS" -ne "0" ]]; then
 		echo "Testing: Benchmarks, c++03" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Testing: Benchmarks, c++03")
+
 		"$MAKE" clean > /dev/null 2>&1
+		rm -f adhoc.cpp > /dev/null 2>&1
 
 		CXXFLAGS="$RELEASE_CXXFLAGS -std=c++03 $USER_CXXFLAGS"
 		CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
@@ -5172,6 +5425,8 @@ if [[ "$WANT_BENCHMARKS" -ne "0" ]]; then
 		echo "Testing: Benchmarks, c++11" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Testing: Benchmarks, c++11")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5197,6 +5452,8 @@ if [[ "$WANT_BENCHMARKS" -ne "0" ]]; then
 		echo "Testing: Benchmarks, c++14" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Benchmarks, c++14")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5226,6 +5483,8 @@ if [[ "$IS_MINGW" -ne "0" ]]; then
 	echo "Testing: MinGW, PREFER_BERKELEY_STYLE_SOCKETS" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("MinGW, PREFER_BERKELEY_STYLE_SOCKETS")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5254,6 +5513,8 @@ if [[ "$IS_MINGW" -ne "0" ]]; then
 	echo "Testing: MinGW, PREFER_WINDOWS_STYLE_SOCKETS" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("MinGW, PREFER_WINDOWS_STYLE_SOCKETS")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5282,6 +5543,8 @@ if [[ "$HAVE_CXX03" -ne "0" && "$HAVE_VALGRIND" -ne "0" ]]; then
 	echo "Testing: Valgrind, c++03" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Valgrind, c++03")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5304,6 +5567,8 @@ if [[ ("$HAVE_VALGRIND" -ne "0" && "$HAVE_CXX11" -ne "0") ]]; then
 	echo "Testing: Valgrind, c++11" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Valgrind, c++11")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5326,6 +5591,8 @@ if [[ ("$HAVE_VALGRIND" -ne "0" && "$HAVE_CXX14" -ne "0") ]]; then
 	echo "Testing: Valgrind, c++14" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Valgrind, c++14")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5348,6 +5615,8 @@ if [[ ("$HAVE_VALGRIND" -ne "0" && "$HAVE_CXX17" -ne "0") ]]; then
 	echo "Testing: Valgrind, c++17" | tee -a "$TEST_RESULTS"
 	echo
 
+	TEST_LIST+=("Valgrind, c++17")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5373,6 +5642,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Debug, c++03, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++03, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5390,6 +5661,8 @@ if [[ ("$HAVE_CXX03" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Release, c++03, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++03, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5411,6 +5684,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Debug, c++11, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++11, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5428,6 +5703,8 @@ if [[ ("$HAVE_CXX11" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Release, c++11, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++11, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5449,6 +5726,8 @@ if [[ ("$HAVE_CXX14" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Debug, c++14, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++14, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5466,6 +5745,8 @@ if [[ ("$HAVE_CXX14" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Release, c++14, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++14, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5487,6 +5768,8 @@ if [[ ("$HAVE_CXX17" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Debug, c++17, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Debug, c++17, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5504,6 +5787,8 @@ if [[ ("$HAVE_CXX17" -ne "0" && ("$GCC_COMPILER" -ne "0" || "$CLANG_COMPILER" -n
 	echo "Testing: Release, c++17, elevated warnings" | tee -a "$WARN_RESULTS"
 	echo
 
+	TEST_LIST+=("Release, c++17, elevated warnings")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5531,6 +5816,8 @@ if [[ ("$CLANG_COMPILER" -eq "0") ]]; then
 		echo "Testing: Clang compiler" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Clang compiler")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5566,6 +5853,8 @@ if [[ ("$GCC_COMPILER" -eq "0") ]]; then
 		echo "Testing: GCC compiler" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("GCC compiler")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5598,12 +5887,14 @@ if [[ ("$INTEL_COMPILER" -eq "0") ]]; then
 	if [[ "$?" -eq "0" ]]; then
 
 		############################################
-		# INTEL build
+		# Intel build
 		echo
 		echo "************************************" | tee -a "$TEST_RESULTS"
-		echo "Testing: INTEL compiler" | tee -a "$TEST_RESULTS"
+		echo "Testing: Intel compiler" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Intel compiler")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5640,6 +5931,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 4.x GCC compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 4.x GCC compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5673,6 +5966,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 5.x GCC compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 5.x GCC compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5706,6 +6001,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 6.x GCC compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 6.x GCC compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5739,6 +6036,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 7.x GCC compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 7.x GCC compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5772,6 +6071,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 3.7 Clang compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 3.7 Clang compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5804,6 +6105,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 3.8 Clang compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 3.8 Clang compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5836,6 +6139,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 3.9 Clang compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 3.9 Clang compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5868,6 +6173,8 @@ if [[ ("$IS_DARWIN" -ne "0" && "$MACPORTS_COMPILER" -eq "0") ]]; then
 			echo "Testing: MacPorts 4.x Clang compiler" | tee -a "$TEST_RESULTS"
 			echo
 
+			TEST_LIST+=("MacPorts 4.x Clang compiler")
+
 			"$MAKE" clean > /dev/null 2>&1
 			rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5903,6 +6210,8 @@ if [[ "$IS_DARWIN" -ne "0" ]]; then
 		echo "Testing: Xcode Clang compiler" | tee -a "$TEST_RESULTS"
 		echo
 
+		TEST_LIST+=("Xcode Clang compiler")
+
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5930,9 +6239,11 @@ if [[ ("$IS_CYGWIN" -eq "0") && ("$IS_MINGW" -eq "0") ]]; then
 
 	echo
 	echo "************************************" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
-	echo "Testing: Test install with data directory" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
+	echo "Testing: Install with data directory" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
 	echo
 
+	TEST_LIST+=("Install with data directory")
+
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
@@ -5998,9 +6309,11 @@ if [[ ("$IS_CYGWIN" -eq "0" && "$IS_MINGW" -eq "0") ]]; then
 
 	echo
 	echo "************************************" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
-	echo "Testing: Test remove with data directory" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
+	echo "Testing: Remove with data directory" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
 	echo
 
+	TEST_LIST+=("Remove with data directory")
+
 	"$MAKE" "${MAKEARGS[@]}" remove PREFIX="$INSTALL_DIR" 2>&1 | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
 	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
 		echo "ERROR: failed to make remove" | tee -a "$TEST_RESULTS" "$INSTALL_RESULTS"
@@ -6053,15 +6366,14 @@ echo "************************************************" | tee -a "$TEST_RESULTS"
 echo "************************************************" | tee -a "$TEST_RESULTS"
 echo | tee -a "$TEST_RESULTS"
 
-COUNT=$("$GREP" 'Testing:' "$TEST_RESULTS" "$WARN_RESULTS" | wc -l | "$AWK" '{print $1}')
+COUNT="${#TEST_LIST[@]}"
 if (( "$COUNT" == "0" )); then
 	echo "No configurations tested" | tee -a "$TEST_RESULTS"
 else
-	echo "$COUNT configurations tested" | tee -a "$TEST_RESULTS"
-	ESCAPED=$("$GREP" 'Testing: ' "$TEST_RESULTS" | "$AWK" -F ": " '{print " - " $2 "$"}')
-	echo " $ESCAPED" | tr $ '\n' | tee -a "$TEST_RESULTS"
-	ESCAPED=$("$GREP" 'Testing: ' "$WARN_RESULTS" | "$AWK" -F ": " '{print " - " $2 "$"}')
-	echo " $ESCAPED" | tr '$' '\n' | tee -a "$TEST_RESULTS"
+	for TEST in "${TEST_LIST[@]}"
+	do
+	  echo "  - $TEST"
+	done
 fi
 echo | tee -a "$TEST_RESULTS"