X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=host%2Fget_test.rb;h=8b3f940c5be60f7b5c85d7ad02fb7902f038b825;hb=69d6349f8ad9d35c2acdb4e4e38ad42cd28b426c;hp=cfc3b33a093a67e2e6382c5638132ad1003e0f2c;hpb=d3db763eeb456ce00849ecf658782f95b9f5634c;p=avr-crypto-lib.git

diff --git a/host/get_test.rb b/host/get_test.rb
index cfc3b33..8b3f940 100644
--- a/host/get_test.rb
+++ b/host/get_test.rb
@@ -2,7 +2,7 @@
 # get_test.rb
 =begin
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2008, 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,12 +18,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
+require 'rubygems'
 require 'serialport'
 
-def read_line
+def read_line(error_msg=true)
   s = $sp.gets()
   if s==nil
-    puts "ERROR: read timeout!\n";
+    puts("ERROR: read timeout!\n") if error_msg
 	return nil
   end	
   s.gsub(/\006/, '');	
@@ -36,7 +37,7 @@ def readTestVector(param)
   set=0;
   vector=0;
   begin
-    lb = read_line()
+    lb = read_line(false)
 	if (m=/unknown command/.match(lb) || m=/[Ee][Rr]{2}[Oo][Rr]/.match(lb))
       puts("ERROR: "+lb);
       exit(2);
@@ -60,8 +61,9 @@ def readTestVector(param)
     if(m) 
       fname+=m[1]+".";
     end
+    return false if lb==nil
     buffer+=lb;
-	lb = read_line();
+    lb = read_line();
   end
   if(param!="")
     fname+=param+".";
@@ -110,13 +112,13 @@ 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=1*60*1000; # 5 minutes
+$sp.read_timeout=1000; # 1 secound
 $extended_wait=100;
 $sp.write(command);
 
 if(readTestVector(param)==false)
   puts("ERROR: test seems not to be implemented");
-  exit(3);
+  exit(0); # 3 
 end
 
 while(readTestVector(param))