origen_testers 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5388980bf86c1fd3a55da48e41bbb11675a335a4
-  data.tar.gz: b50038d56b9f7cc8a5a19d54ddadd3598a18142b
+  metadata.gz: b8a14f884b3123f77f58ed64615236f51f0f0e96
+  data.tar.gz: f3ec51579b567693dda3b9db6d045e75686a5286
 SHA512:
-  metadata.gz: 6b954a23fad17dbdc68f09cf884db156edc9e570a86ae64585f24f1af976f3279b1396bcf85c4acae39f79be35890d5479c1cb76b8cb971d0ff6e3677febcd2b
-  data.tar.gz: 88a977ee75b4f1eb9abf28b4a431d570ed2beae8beaf176a5990cbe2be8c64bbb5e692519a7e7f6ce678a04e0ffdd593991a6d705c3a6dc897d30804d605d760
+  metadata.gz: 17337cfec24d426ffa4fac60ef510ad7ab3b96d6d9f68dae16a04c72d55a736e80e79bf5b0eff6801424f3b1d30c71a896fe27bf54620bf062d5996dc25a49e5
+  data.tar.gz: 1bf8bfdbd6e3e151a9cc84ea3934143d5e5d731a7886b3c201bbaab8756a3fb213b778cd9f1b7e450d1f3e9016fb4a2c7b8f0846b46524098621559a4f76aa97

data/config/shared_commands.rb

@@ -36,6 +36,7 @@ case @command
     ARGV.delete("--compile")
   end
   $_testers_enable_vector_comments = ARGV.delete("-v") || ARGV.delete("--vector_comments")
+  $_testers_no_inline_comments = ARGV.delete("--no_inline_comments")
 
   when "testers:build"
    require "#{Origen.root!}/lib/commands/build"

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   MAJOR = 0
   MINOR = 8
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -385,11 +385,24 @@ module OrigenTesters
         else
           microcode = vec.microcode ? vec.microcode : ''
         end
+        header_comments = ''
+        vec.comments.each do |comment|
+          if comment.include? '#'
+            comment = comment.gsub(/# /, '')
+            comment = comment.gsub(/#/, '')
+            if comment != ''
+              header_comments << comment + "\cm"
+            end
+          end
+        end
         if vec.pin_vals && ($_testers_enable_vector_comments || vector_comments)
-          comment = " #{vec.comments.join("\cm")} #{vec.number}:#{vec.cycle} #{vec.inline_comment}"
+          comment = "#{header_comments}#{vec.number}:#{vec.cycle} #{vec.inline_comment}"
         else
           inline = vec.inline_comment.empty? ? '' : " # #{vec.inline_comment}"
-          comment = " #{vec.comments.join("\cm")} #{inline}"
+          comment = " #{header_comments}#{inline}"
+        end
+        if Origen.mode.simulation? || $_testers_no_inline_comments
+          comment = ''
         end
         "#{microcode.ljust(25)}#{timeset.ljust(27)}#{pin_vals}#{comment};"
       end

data/lib/origen_testers/smartest_based_tester/base/test_method.rb

@@ -29,14 +29,12 @@ module OrigenTesters
           # Add any methods
           if options[:methods][:methods]
             methods = options[:methods][:methods]
-            @finalize = methods[:finalize]
+            @finalize = methods.delete(:finalize)
             methods.each do |method_name, function|
-              unless method_name == :finalize
-                var_name = "@#{method_name}".gsub(/=|\?/, '_')
-                instance_variable_set(var_name, function)
-                define_singleton_method method_name do |*args|
-                  instance_variable_get(var_name).call(self, *args)
-                end
+              var_name = "@#{method_name}".gsub(/=|\?/, '_')
+              instance_variable_set(var_name, function)
+              define_singleton_method method_name do |*args|
+                instance_variable_get(var_name).call(self, *args)
               end
             end
           end
@@ -53,7 +51,6 @@ module OrigenTesters
               aliases << clean_attr.underscore if clean_attr.underscore != clean_attr
               aliases.each do |alias_|
                 define_singleton_method("#{alias_}=") do |v|
-                  v = v.to_s if v.is_a?(Symbol)
                   if allowed
                     unless allowed.include?(v)
                       fail "Cannot set #{alias_} to #{v}, valid values are: #{allowed.join(', ')}"

data/lib/origen_testers/vector_pipeline.rb

@@ -109,7 +109,14 @@ module OrigenTesters
       r = vector.repeat || 1
       if $tester.min_repeat_loop && r < $tester.min_repeat_loop
         vector.repeat = 1
-        r.times do
+        if r > 1
+          vector.comments << '#R' + r.to_s
+        end
+        yield vector
+        (r - 1).times do |index|
+          vector.comments = ['#R' + (r - 1 - index).to_s]
+          vector.number += 1
+          vector.cycle += 1
           yield vector
         end
         @vector_count += r

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen