X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=host%2Fget_test.rb;h=3c88cfd524531b4b7aec24debf967b14137aceaf;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=2e5985cd4ca4aaef5e32c062fb338ab7c11e1e90;hpb=e9d58dce0a1eca2c78aec260406e1605ae29fff7;p=avr-crypto-lib.git

diff --git a/host/get_test.rb b/host/get_test.rb
index 2e5985c..3c88cfd 100644
--- a/host/get_test.rb
+++ b/host/get_test.rb
@@ -1,7 +1,46 @@
 #!/usr/bin/ruby 
+# get_test.rb
+=begin
+    This file is part of the AVR-Crypto-Lib.
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+require 'rubygems'
 require 'serialport'
 
+$debug = false
+$progress_dots = false
+
+def read_line(error_msg=true)
+  begin
+    i = $extended_wait
+    begin
+      s = $sp.gets()
+      i -= 1
+    end while !s && i > 0
+    if s==nil
+      puts("ERROR: read timeout!\n") if error_msg
+      return nil
+    end
+  putc('.') if s.include?(6.chr) && $progress_dots	
+  puts(s.inspect) if $debug
+  end while s == 6.chr
+  s.gsub(/\006/, '')
+end
+
 def readTestVector(param)
   fname=$dir;
   lb="";
@@ -9,11 +48,8 @@ def readTestVector(param)
   set=0;
   vector=0;
   begin
-    ctr=$extended_wait;
-    while((lb=$sp.gets())==nil && ctr>=0)do
-      ctr -= 1;
-    end
-    if (m=/unknown command/.match(lb) || m=/[Ee][Rr]{2}[Oo][Rr]/.match(lb))
+    lb = read_line(false)
+	if (m=/unknown command/.match(lb) || m=/[Ee][Rr]{2}[Oo][Rr]/.match(lb))
       puts("ERROR: "+lb);
       exit(2);
     end
@@ -24,10 +60,7 @@ def readTestVector(param)
   
   buffer += lb;
   begin
-    ctr=$extended_wait;
-    while((lb=$sp.gets())==nil && ctr>=0)do
-      ctr -= 1;
-    end
+    lb = read_line()
     if(lb==nil)
       return false;
     end
@@ -39,17 +72,16 @@ def readTestVector(param)
     if(m) 
       fname+=m[1]+".";
     end
+    return false if lb==nil
     buffer+=lb;
-    ctr=$extended_wait;
-    while((lb=$sp.gets())==nil && ctr>=0)do
-      ctr -= 1;
-    end
+    lb = read_line();
   end
   if(param!="")
     fname+=param+".";
   end
   puts("-> "+fname+"txt");
   file=File.new(fname+"txt", "w");
+  file.sync = true
     buffer+=lb;
     file.write(buffer);
     begin
@@ -65,10 +97,7 @@ def readTestVector(param)
 	end
         printf(" %4u", vector);
       end
-      ctr=$extended_wait;
-      while((lb=$sp.gets())==nil && ctr>=0)do
-        ctr -= 1;
-      end
+      lb=read_line();
       if(lb==nil)
         file.close();
         return false;
@@ -95,13 +124,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
-$extended_wait=100;
+$sp.read_timeout=1000; # 1 second
+$extended_wait=100000;
 $sp.write(command);
 
 if(readTestVector(param)==false)
   puts("ERROR: test seems not to be implemented");
-  exit(3);
+  exit(0); # 3 
 end
 
 while(readTestVector(param))