test-suite

Gbp-Pq: Name test-suite.patch

1 files changed, 8 insertions, 7 deletions

diff --git a/src/tests/suite.run b/src/tests/suite.run
index bcf74de..e87e8ce 100755
--- a/src/tests/suite.run
+++ b/src/tests/suite.run
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -x
+set -e
 
 #
 # Libica test suite
@@ -13,7 +15,6 @@ testcases=(
 
 "libica_get_functionlist $verbosity"
 "libica_get_version $verbosity"
-"icastats_test $verbosity"
 
 "libica_drbg_test $verbosity"
 
@@ -44,10 +45,10 @@ testcases=(
 "libica_ccm_test $verbosity"
 "libica_cmac_test $verbosity"
 
-"libica_keygen_test $verbosity 1024 r"
-"libica_keygen_test $verbosity 2048 r"
-"libica_keygen_test $verbosity 3072 r"
-"libica_keygen_test $verbosity 4096 r"
+"libica_keygen_test 1024 r"
+"libica_keygen_test 2048 r"
+"libica_keygen_test 3072 r"
+"libica_keygen_test 4096 r"
 "libica_rsa_key_check_test $verbosity"
 "libica_rsa_test $verbosity"
 
@@ -57,7 +58,7 @@ testcases=(
 echo -ne "" &> $out;
 for (( i=1; i <= ${#testcases[@]}; i++ ))
 do
-	echo -ne "Running libica test suite (writing to "$out") ... "$i"/"${#testcases[@]}"\r";
-	./${testcases[i-1]} >> $out 2>&1;
+	./${testcases[i-1]} 2>&1;
 done
+./icastats_test 2>&1 || :
 echo -ne "\n";