X-Git-Url: https://git.cryptolib.org/?p=arm-crypto-lib.git;a=blobdiff_plain;f=host%2Fshavs_test2.rb;h=3c06e2f966f8bd0ab4f42786c11845b75668c551;hp=4d554fbcf39b37f0287c46015f544886e572215a;hb=1cdc772d04bae747c339badaa99f6132eedbcd2f;hpb=e5296441c98c35140f909ca1dbdb8d6852f996d3 diff --git a/host/shavs_test2.rb b/host/shavs_test2.rb index 4d554fb..3c06e2f 100644 --- a/host/shavs_test2.rb +++ b/host/shavs_test2.rb @@ -241,12 +241,13 @@ end # -f also read config from # -i skip until test nr. # -j start with testfile +# -o use just one testfile # -h ??? # -d enable debug mode # -c ??? # -a ??? -opts = Getopt::Std.getopts("s:f:i:j:hdca") +opts = Getopt::Std.getopts("s:f:i:j:hdcao") conf = Hash.new conf = readconfigfile("/etc/testport.conf", conf) @@ -306,16 +307,16 @@ algo_tasks.each do |algoa| puts("No test-set defined for #{algo} \r\n") next else - i=0 - i = opts["j"].to_i if opts["j"] - logfile=File.open(conf["PORT"]["testlogbase"]+algo+".txt", "a") - while conf[algo]["file_#{i}"] != nil - puts("Testing #{algo} with #{conf[algo]["file_#{i}"]}") - reset_system() - init_system(algoa[1]) - skip=0 - skip=opts["i"].to_i if opts["i"] - nerrors=run_test(conf[algo]["file_#{i}"], skip) + i=0 + i = opts["j"].to_i if opts["j"] + logfile=File.open(conf["PORT"]["testlogbase"]+algo+".txt", "a") + while conf[algo]["file_#{i}"] != nil + puts("Testing #{algo} with #{conf[algo]["file_#{i}"]}") + reset_system() + init_system(algoa[1]) + skip=0 + skip=opts["i"].to_i if opts["i"] + nerrors=run_test(conf[algo]["file_#{i}"], skip) if nerrors == 0 puts("\n[ok]") logfile.puts("[ok] "+conf[algo]["file_#{i}"]+ " ("+Time.now.to_s()+")") @@ -324,6 +325,7 @@ algo_tasks.each do |algoa| logfile.puts("[error] "+nerrors.to_s+" "+conf[algo]["file_#{i}"]+ " ("+Time.now.to_s()+")") end i = i+1 + break if opts["o"] end logfile.close() end