Merge branch 'develop' into 654-grb-set-matrix-to-matrix-broken-in-mi…

…xed-domain

tests/performance/performancetests.sh

@@ -338,7 +338,7 @@ runMultiplicationKernels()
 			echo "Test DISABLED: no sparse level-3 operations recommended for 1D distributions."
 			echo " "
 		elif [ "$i" -gt "14" ]; then
-			echo "Tests DISABLED: by default, long-running sparse matrix--sparse matrix multiplications are disabled (skipping dataset ${dataSet})."
+			echo "Test DISABLED: by default, long-running sparse matrix--sparse matrix multiplications are disabled (skipping dataset ${dataSet})."
 			echo " "
 		else
 			$runner ${TEST_BIN_DIR}/driver_spmspm_${backend} ${INPUT_DIR}/${dataSet} ${INPUT_DIR}/${dataSet} ${parseMode} &> ${TEST_OUT_DIR}/driver_spmspm_${backend}_${dataSet}

tests/summarise.sh

@@ -15,12 +15,14 @@ fi
 
 NUM_OK=`grep -i "Test OK" "$1" | wc -l`
 NUM_DISABLED=`grep -i "Test DISABLED" "$1" | wc -l`
+NUM_CDISABLED=`grep -i "Tests DISABLED" "$1" | wc -l`
 NUM_FAILED=`grep -i "Test FAILED" "$1" | wc -l`
 
 echo "Summary of $1:"
 printf "  %4s PASSED\n" ${NUM_OK}
 printf "  %4s SKIPPED\n" ${NUM_DISABLED}
 printf "  %4s FAILED\n" ${NUM_FAILED}
+printf "  %4s TEST CATEGORIES SKIPPED\n" ${NUM_CDISABLED}
 
 if [ ${NUM_FAILED} -gt 0 ]; then
 	printf "\nOne or more failures detected. Log contents:\n\n"