X-Git-Url: https://git.cryptolib.org/?p=arm-crypto-lib.git;a=blobdiff_plain;f=host%2Fget_test.rb;h=d14d632d3ead615e4dd0e9a83e6faf17f98db784;hp=663deabab78935b9379cc591cb7141d6208ce417;hb=c88d99752182184f54d3b6897705d47cea6a9562;hpb=4f19c43af8afeb3c569eb7b4aa15907832cf8e5c diff --git a/host/get_test.rb b/host/get_test.rb index 663deab..d14d632 100644 --- a/host/get_test.rb +++ b/host/get_test.rb @@ -27,7 +27,7 @@ def read_line(error_msg=true) puts("ERROR: read timeout!\n") if error_msg return nil end - s.gsub(/\006/, ''); + return s.delete("\006"); end def readTestVector(param) @@ -77,7 +77,7 @@ def readTestVector(param) set=m[1].to_i; print("\nSet "+m[1]+":"); end - if (m=/Set [0-9]*, vector#[\s]*([0-9]+):/.match(lb)) + if (m=/Set [0-9], vector#[\s]*([0-9]+):/.match(lb)) vector=m[1].to_i; #print(" "+m[1]); if(vector!=0 && vector % $linewidth==0) @@ -112,7 +112,7 @@ param=(ARGV.size>=7)?ARGV[6]:""; puts("\nPort: "+ARGV[0]+ "@"+ARGV[1]+" "+ARGV[2]+"N"+ARGV[3]+"\n"); $linewidth = 16 $sp = SerialPort.new(ARGV[0], ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, SerialPort::NONE); -$sp.read_timeout=1000; # 1 secound +$sp.read_timeout=10000; # 1 secound $extended_wait=100; $sp.write(command);