origen_testers 0.19.3 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6eea40e7cbf8f983adb36452ae060cca548731f2
-  data.tar.gz: 9c27b74043fc622cdf3e59bab06c32cf9c25c649
+SHA256:
+  metadata.gz: 2bb719c179345dee09336e7c9ef743de9383d0bc32602c58226a682607c93016
+  data.tar.gz: 7f98c2c6a7d9639bf70c42d4264ba3294b72b814b3c455e9983d4342c3ade773
 SHA512:
-  metadata.gz: f79550936613abfe33c20b82c33c2ac3d41ae30cf489405c72b57a65f4ebd2a5fe3e1450c2ad28d8297d209638427438124eca0ec50937de94c95dcbf53e21d9
-  data.tar.gz: 2d003fd7fa9196c2acdf7975500eec2e71488bfeea6c6814088c8dc674dd6a33324929e769fa5535cca8a7ab83eaf41fe3600fb5d625f763c9b8a0be649ed9f9
+  metadata.gz: 5530008ddd55eb90eb4d6502dc8a61633eb28a88d1eed1baa8e9b51ed52bbd3b274c8fb7bd680318716b6c70d910a40c27c2515134b1ce067e69d6e2fde2fce6
+  data.tar.gz: d599275895db3b446e5f8c3ebe9da2101aa759e8ba622ca5c9a94c14fb12159409f35a1b423df2f6383c70c19136a638c2383a3ce6ac62a2ddb2f48c4f37ca7f

data/config/version.rb

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

data/lib/origen_testers/flow.rb

@@ -164,6 +164,27 @@ module OrigenTesters
     end
     alias_method :signature, :sig
 
+    def active_description
+      flow_file = OrigenTesters::Flow.callstack.last
+      called_from = caller.find { |l| l =~ /^#{flow_file}:.*/ }
+      desc = nil
+      if called_from
+        called_from = called_from.split(':')
+        line_no = called_from[1].to_i
+        ht_coms = OrigenTesters::Flow.ht_comments
+        cc_coms = OrigenTesters::Flow.cc_comments
+        if line_no
+          if ht_coms[line_no]
+            desc = ht_coms[line_no].join(' ')
+          end
+          if cc_coms[line_no] && cc_coms[line_no].first
+            desc = [cc_coms[line_no].shift].join(' ')
+          end
+        end
+      end
+      desc
+    end
+
     private
 
     # Make a unique signature for the flow based on the flow name and the name of

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

@@ -8,7 +8,7 @@ module OrigenTesters
         # Returns an array containing all runtime variables which get set by the flow
         attr_reader :set_runtime_variables
 
-        attr_accessor :add_flow_enable, :flow_name
+        attr_accessor :add_flow_enable, :flow_name, :flow_description
 
         def var_filename
           @var_filename || 'global'
@@ -26,6 +26,10 @@ module OrigenTesters
           @flow_name || filename.sub(/\..*/, '').upcase
         end
 
+        def flow_description
+          @flow_description || ''
+        end
+
         def hardware_bin_descriptions
           @hardware_bin_descriptions ||= {}
         end
@@ -57,18 +61,18 @@ module OrigenTesters
             else
               flow_control_variables << [var, 0]
             end
-            h << "  if @#{var} == 1 then"
-            h << '  {'
-            i = '  '
+            h << "    if @#{var} == 1 then"
+            h << '    {'
+            i = '   '
           else
             i = ''
           end
           if set_runtime_variables.size > 0
-            h << i + '  {'
+            h << i + '    {'
             set_runtime_variables.each do |var|
-              h << i + "    @#{generate_flag_name(var.to_s)} = -1;"
+              h << i + "       @#{generate_flag_name(var.to_s)} = -1;"
             end
-            h << i + '  }, open,"Init Flow Control Vars", ""'
+            h << i + '    }, open,"Init Flow Control Vars", ""'
           end
           h
         end
@@ -76,13 +80,13 @@ module OrigenTesters
         def flow_footer
           f = []
           if add_flow_enable
-            f << '  }'
-            f << '  else'
-            f << '  {'
-            f << '  }'
+            f << '    }'
+            f << '    else'
+            f << '    {'
+            f << '    }'
           end
           f << ''
-          f << "  }, open,\"#{flow_name}\",\"\""
+          f << "  }, open,\"#{flow_name}\",\"#{flow_description}\""
           f
         end
 
@@ -109,7 +113,7 @@ module OrigenTesters
         end
 
         def line(str)
-          @lines << ('  ' * @indent) + str
+          @lines << '    ' + ('   ' * (@indent - 1)) + str
         end
 
         # def on_flow(node)
@@ -327,17 +331,18 @@ module OrigenTesters
           desc = node.find(:bin).to_a[1]
           sbin = node.find(:softbin).try(:value)
           sdesc = node.find(:softbin).to_a[1] || 'fail'
+          overon = (node.find(:not_over_on).try(:value) == true) ? 'not_over_on' : 'over_on'
           if bin && desc
             hardware_bin_descriptions[bin] ||= desc
           end
 
           if node.to_a[0] == 'pass'
-            line "stop_bin \"#{sbin}\", \"\", , good, noreprobe, green, #{bin}, over_on;"
+            line "stop_bin \"#{sbin}\", \"\", , good, noreprobe, green, #{bin}, #{overon};"
           else
             if tester.create_limits_file
               line 'multi_bin;'
             else
-              line "stop_bin \"#{sbin}\", \"#{sdesc}\", , bad, noreprobe, red, #{bin}, over_on;"
+              line "stop_bin \"#{sbin}\", \"#{sdesc}\", , bad, noreprobe, red, #{bin}, #{overon};"
             end
           end
         end

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

@@ -27,6 +27,7 @@ module OrigenTesters
               self.unique_test_names = options[:unique_test_names]
             end
             flow.flow_name = options[:flow_name]
+            flow.flow_description = options[:flow_description] || OrigenTesters::Flow.flow_comments.join(' ')
           end
         end
 

data/lib/origen_testers/smartest_based_tester/v93k/templates/template.tf.erb

@@ -123,10 +123,14 @@ testmethodparameters
 end
 -----------------------------------------------------------------
 testmethodlimits
-
+% at_least_one = false
 % unless tester.create_limits_file
 % if program
 %   program.testmethodlimits.each do |id, parameters|
+%     unless at_least_one
+
+%       at_least_one = true
+%     end
 <%= id %>:
 %     parameters.each do |key, val|
   <%= key %> = <%= val %>
@@ -135,19 +139,29 @@ testmethodlimits
 % else
 %   test_methods.sorted_collection.each do |method|
 %     if method.respond_to?(:limits) && method.limits
+%     unless at_least_one
+
+%       at_least_one = true
+%     end
 <%= method.id %>:
   <%= method.limits %>;
 %     end
 %   end
 % end
 % end
+% if at_least_one
 
+% end
 end
 -----------------------------------------------------------------
-testmethods
-
+% at_least_one = false
 % if program
 %   program.testmethods.each do |id, parameters|
+%     unless at_least_one
+testmethods
+
+%       at_least_one = true
+%     end
 <%= id %>:
 %     parameters.each do |key, val|
   <%= key %> = <%= val %>
@@ -155,17 +169,28 @@ testmethods
 %   end
 % else
 %   test_methods.sorted_collection.each do |method|
+%     unless at_least_one
+testmethods
+
+%       at_least_one = true
+%     end
 <%= method.id %>:
   testmethod_class = "<%= method.klass %>";
 %   end
 % end
+% if at_least_one
 
 end
 -----------------------------------------------------------------
-test_suites
-
+% end
+% at_least_one = false
 % if program
 %   program.test_suites.each do |id, parameters|
+%     unless at_least_one
+test_suites
+
+%       at_least_one = true
+%     end
 <%= id %>:
 %     parameters.each do |key, val|
   <%= key %> = <%= val %>
@@ -173,15 +198,22 @@ test_suites
 %   end
 % else
 %   test_suites.sorted_collection.each do |suite|
+%     unless at_least_one
+test_suites
+
+%       at_least_one = true
+%     end
 <%= suite.name %>:
 %     suite.lines.each do |line|
 <%= line %>
 %     end
 %   end
 % end
+% if at_least_one
 
 end
 -----------------------------------------------------------------
+% end
 test_flow
 
 % if program

data/lib/origen_testers/test/interface.rb

@@ -77,6 +77,36 @@ module OrigenTesters
         end
       end
 
+      def func_with_comment(name, options = {})
+        if tester.v93k?
+          options = {
+            duration: :static
+          }.merge(options)
+          number = options[:number]
+
+          block_loop(name, options) do |block, i|
+            options[:number] = number + i if number && i
+            tm = test_methods.ac_tml.ac_test.functional_test
+            ts = test_suites.run(name, options)
+            ts.test_method = tm
+            ts.levels = options.delete(:pin_levels) if options[:pin_levels]
+            ts.comment = options.delete(:comment) || flow.active_description
+            if block
+              ts.pattern = "#{name}_b#{i}"
+            else
+              ts.pattern = name.to_s
+              #    if options[:cz_setup]
+              #      flow.cz(ins, options[:cz_setup], options)
+              #    else
+              #    end
+            end
+            flow.test ts, options
+          end
+        else
+          func(name, options)
+        end
+      end
+
       def block_loop(name, options)
         if options[:by_block]
           if tester.j750? || tester.uflex?

data/program/custom_tests.rb

@@ -1,5 +1,5 @@
 # This flow is used to test custom test method API
-Flow.create interface: 'OrigenTesters::Test::CustomTestInterface' do
+Flow.create interface: 'OrigenTesters::Test::CustomTestInterface', flow_description: '' do
 
   custom :test1, number: 30000
 

data/program/flow_control.rb

@@ -4,6 +4,7 @@
 # to guarantee that the test ID references work when sub-flows are involved.
 # This flow provides a full checkout of all flow control methods.
 Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Control Testing" do
+  flow.flow_description = 'Flow to exercise the Flow Control API' if tester.v93k?
 
   self.resources_filename = 'flow_control'
 
@@ -431,6 +432,16 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
     log 'Volatile if combiner test case'
     func :test1, if_flag: :$Alarm, number: 51940
     func :test2, unless_flag: :$Alarm, number: 51950
+
+    # The is auto-generated comment from hashtag
+    func_with_comment :test1
+
+    cc 'The is auto-generated comment from cc'
+    func_with_comment :test1
+
+    log 'Use bin_attrs to set not_over_on'
+    func :test1n, number: 51960, bin: 12, bin_attrs: { not_over_on: true }
+
   end
 
   log 'Test the block form of expressing if passed/failed dependents'
@@ -462,4 +473,5 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
       import 'components/small', number: 54000
     end
   end
+
 end

data/program/prb1.rb

@@ -2,7 +2,7 @@
 # passed in here, iterators and other
 # argument passing will be supported
 # similar to Pattern.create.
-Flow.create interface: 'OrigenTesters::Test::Interface' do
+Flow.create interface: 'OrigenTesters::Test::Interface', flow_description: 'Probe1 Main' do
 
   self.resources_filename = 'prb1'
 

data/program/test.rb

@@ -3,6 +3,7 @@
 # argument passing will be supported
 # similar to Pattern.create.
 Flow.create interface: 'OrigenTesters::Test::Interface' do
+  flow.flow_description = '' if tester.v93k?
 
   # Instantiate tests via the
   # interface

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.20.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -47,7 +47,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -392,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like