origen_testers 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304c4bb6a3741adaf96f451a6e26172596105d5ac20b9d609ede29dab880095b
-  data.tar.gz: 419c7c5276d6107ffdbab5339c442a71b91be6a7b0ad62facd168a2d29eefc74
+  metadata.gz: e05743e4c62f21fdda22dcf6eae8056c1e2db75dfd97d6cf311e7d5577a4e0b6
+  data.tar.gz: a1c877c1b3e3da3566958e11a711ec4aea246b5be91b6420ae6f9c3bda7dc131
 SHA512:
-  metadata.gz: 89fe1fa09bf028c8bd4d4df9d23bd97c7b670ce208319a4f365380eb9fae34dc084ff4bb8d78c596e711d3a0c5056a147f04c4a5b4cdea3b854922ca6c477d71
-  data.tar.gz: ed28f34456af11d5e4a844911a63849aff3bb03684edbe132ebbc3dbd11d7a9248f37166e5eb6966e544653bfded4335115e4cd910d54973dac12854faf74b26
+  metadata.gz: 995f309c1e5894066c36623f8243ff8f88fa6329e8304d276333536f668ec0d89655bd3a49ada8cf29e184a2e4b12952c8bce9aab31f736cdb9939cb89f0b28a
+  data.tar.gz: 01e0fdbb2784d33693d145b013f523013017ad0b4a83a6f363defe47ea0ff0be428522ae15f1010abc554245f2d7bf1f23ad36a24aa28a01d129a30c9d958759

data/config/version.rb

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

data/lib/origen_testers/api.rb

@@ -93,6 +93,10 @@ module OrigenTesters
     end
     alias_method :uflex?, :ultraflex?
 
+    def igxl?
+      j750? || j750_hpt? || ultraflex?
+    end
+
     def stil?
       is_a?(OrigenTesters::StilBasedTester::Base)
     end

data/lib/origen_testers/atp/flow.rb

@@ -5,61 +5,77 @@ module OrigenTesters::ATP
     attr_reader :program, :name
 
     CONDITION_KEYS = {
-      if_enabled:        :if_enabled,
-      if_enable:         :if_enabled,
-      enabled:           :if_enabled,
-      enable_flag:       :if_enabled,
-      enable:            :if_enabled,
+      if_enabled:              :if_enabled,
+      if_enable:               :if_enabled,
+      enabled:                 :if_enabled,
+      enable_flag:             :if_enabled,
+      enable:                  :if_enabled,
 
-      unless_enabled:    :unless_enabled,
-      not_enabled:       :unless_enabled,
-      disabled:          :unless_enabled,
-      disable:           :unless_enabled,
-      unless_enable:     :unless_enabled,
+      unless_enabled:          :unless_enabled,
+      not_enabled:             :unless_enabled,
+      disabled:                :unless_enabled,
+      disable:                 :unless_enabled,
+      unless_enable:           :unless_enabled,
 
-      if_failed:         :if_failed,
-      unless_passed:     :if_failed,
-      failed:            :if_failed,
+      if_failed:               :if_failed,
+      unless_passed:           :if_failed,
+      failed:                  :if_failed,
 
-      if_passed:         :if_passed,
-      unless_failed:     :if_passed,
-      passed:            :if_passed,
+      if_passed:               :if_passed,
+      unless_failed:           :if_passed,
+      passed:                  :if_passed,
 
-      if_any_failed:     :if_any_failed,
-      unless_all_passed: :if_any_failed,
+      if_any_failed:           :if_any_failed,
+      unless_all_passed:       :if_any_failed,
 
-      if_all_failed:     :if_all_failed,
-      unless_any_passed: :if_all_failed,
+      if_all_failed:           :if_all_failed,
+      unless_any_passed:       :if_all_failed,
 
-      if_any_passed:     :if_any_passed,
-      unless_all_failed: :if_any_passed,
+      if_any_passed:           :if_any_passed,
+      unless_all_failed:       :if_any_passed,
 
-      if_all_passed:     :if_all_passed,
-      unless_any_failed: :if_all_passed,
+      if_all_passed:           :if_all_passed,
+      unless_any_failed:       :if_all_passed,
 
-      if_ran:            :if_ran,
-      if_executed:       :if_ran,
+      if_ran:                  :if_ran,
+      if_executed:             :if_ran,
 
-      unless_ran:        :unless_ran,
-      unless_executed:   :unless_ran,
+      unless_ran:              :unless_ran,
+      unless_executed:         :unless_ran,
 
-      job:               :if_job,
-      jobs:              :if_job,
-      if_job:            :if_job,
-      if_jobs:           :if_job,
+      job:                     :if_job,
+      jobs:                    :if_job,
+      if_job:                  :if_job,
+      if_jobs:                 :if_job,
 
-      unless_job:        :unless_job,
-      unless_jobs:       :unless_job,
+      unless_job:              :unless_job,
+      unless_jobs:             :unless_job,
 
-      if_flag:           :if_flag,
+      if_flag:                 :if_flag,
 
-      unless_flag:       :unless_flag,
+      unless_flag:             :unless_flag,
 
-      whenever:          :whenever,
-      whenever_all:      :whenever_all,
-      whenever_any:      :whenever_any,
+      whenever:                :whenever,
+      whenever_all:            :whenever_all,
+      whenever_any:            :whenever_any,
 
-      group:             :group
+      group:                   :group,
+
+      if_any_site_failed:      :if_any_sites_failed,
+      if_any_sites_failed:     :if_any_sites_failed,
+      unless_all_sites_passed: :if_any_sites_failed,
+
+      if_all_sites_failed:     :if_all_sites_failed,
+      unless_any_sites_passed: :if_all_sites_failed,
+      unless_any_site_passed:  :if_all_sites_failed,
+
+      if_any_site_passed:      :if_any_sites_passed,
+      if_any_sites_passed:     :if_any_sites_passed,
+      unless_all_sites_failed: :if_any_sites_passed,
+
+      if_all_sites_passed:     :if_all_sites_passed,
+      unless_any_sites_failed: :if_all_sites_passed,
+      unless_any_site_failed:  :if_all_sites_passed
     }
 
     CONDITION_NODE_TYPES = CONDITION_KEYS.values.uniq
@@ -634,6 +650,9 @@ module OrigenTesters::ATP
           if name == :if_failed
             fail 'if_failed only accepts one ID, use if_any_failed or if_all_failed for multiple IDs'
           end
+          if name == :if_any_sites_failed || name == :if_all_sites_failed || name == :if_any_sites_passed || name == :if_all_sites_passed
+            fail "#{name} currently only accepts one ID, please create a ticket here if you need this functionality: https://github.com/Origen-SDK/origen_testers/issues"
+          end
         end
         apply_conditions(options) do
           if block

data/lib/origen_testers/atp/processors/flow_id.rb

@@ -41,6 +41,10 @@ module OrigenTesters::ATP
       alias_method :on_if_all_passed, :on_if_failed
       alias_method :on_if_ran, :on_if_failed
       alias_method :on_unless_ran, :on_if_failed
+      alias_method :on_if_any_sites_failed, :on_if_failed
+      alias_method :on_if_all_sites_failed, :on_if_failed
+      alias_method :on_if_any_sites_passed, :on_if_failed
+      alias_method :on_if_all_sites_passed, :on_if_failed
     end
   end
 end

data/lib/origen_testers/atp/processors/pre_cleaner.rb

@@ -26,6 +26,10 @@ module OrigenTesters::ATP
       alias_method :on_if_all_passed, :on_if_failed
       alias_method :on_if_ran, :on_if_failed
       alias_method :on_unless_ran, :on_if_failed
+      alias_method :on_if_any_sites_failed, :on_if_failed
+      alias_method :on_if_all_sites_failed, :on_if_failed
+      alias_method :on_if_any_sites_passed, :on_if_failed
+      alias_method :on_if_all_sites_passed, :on_if_failed
 
       def on_group(node)
         if id = node.children.find { |n| n.type == :id }

data/lib/origen_testers/atp/processors/relationship.rb

@@ -24,6 +24,8 @@ module OrigenTesters::ATP
         end
         alias_method :on_if_any_failed, :on_if_failed
         alias_method :on_if_all_failed, :on_if_failed
+        alias_method :on_if_any_sites_failed, :on_if_failed
+        alias_method :on_if_all_sites_failed, :on_if_failed
 
         def on_if_passed(node)
           ids, *children = *node
@@ -38,6 +40,8 @@ module OrigenTesters::ATP
         end
         alias_method :on_if_any_passed, :on_if_passed
         alias_method :on_if_all_passed, :on_if_passed
+        alias_method :on_if_any_sites_passed, :on_if_passed
+        alias_method :on_if_all_sites_passed, :on_if_passed
 
         def on_if_ran(node)
           id, *children = *node
@@ -139,6 +143,16 @@ module OrigenTesters::ATP
       end
       alias_method :on_if_any_failed, :on_if_failed
 
+      def on_if_any_sites_failed(node)
+        id, *children = *node
+        node.updated(:if_any_sites_flag, [id_to_flag(id, 'FAILED')] + process_all(children))
+      end
+
+      def on_if_all_sites_failed(node)
+        id, *children = *node
+        node.updated(:if_all_sites_flag, [id_to_flag(id, 'FAILED')] + process_all(children))
+      end
+
       def on_if_all_failed(node)
         ids, *children = *node
         ids.reverse_each.with_index do |id, i|
@@ -157,6 +171,16 @@ module OrigenTesters::ATP
       end
       alias_method :on_if_any_passed, :on_if_passed
 
+      def on_if_any_sites_passed(node)
+        id, *children = *node
+        node.updated(:if_any_sites_flag, [id_to_flag(id, 'PASSED')] + process_all(children))
+      end
+
+      def on_if_all_sites_passed(node)
+        id, *children = *node
+        node.updated(:if_all_sites_flag, [id_to_flag(id, 'PASSED')] + process_all(children))
+      end
+
       def on_if_all_passed(node)
         ids, *children = *node
         ids.reverse_each.with_index do |id, i|

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

@@ -256,6 +256,30 @@ module OrigenTesters
         end
         alias_method :on_unless_flag, :on_if_flag
 
+        def on_if_any_sites_flag(node)
+          flag, *nodes = *node
+          state = [:if_any_sites_flag, :if_all_sites_flag].include?(node.type)
+          flag = clean_flag(flag)
+
+          # If a flag condition is currently active
+          if current_flag
+            fail 'Nesting of if_any_sites/if_all_sites conditions with other flag conditions is not supported yet, please create a ticket here if you need this functionality: https://github.com/Origen-SDK/origen_testers/issues'
+          end
+
+          # Update the currently active flag condition, this will be added as a condition to all
+          # lines created from children of this node
+          if node.type.to_s =~ /any/
+            self.current_flag = [flag, state, :any]
+          else
+            self.current_flag = [flag, state, :all]
+          end
+          context << current_flag
+          process_all(node)
+          context.pop
+          self.current_flag = nil
+        end
+        alias_method :on_if_all_sites_flag, :on_if_any_sites_flag
+
         def on_if_enabled(node)
           flag, *nodes = *node
           orig = current_enable
@@ -350,9 +374,17 @@ module OrigenTesters
           }.merge(attrs)
           line = platform::FlowLine.new(type, attrs)
           if current_flag
-            line.device_sense = 'not' unless current_flag[1]
-            line.device_name = clean_flag(current_flag[0])
-            line.device_condition = 'flag-true'
+            # If any/all sites condition
+            if current_flag[2]
+              line.group_sense = 'not' unless current_flag[1]
+              line.group_specifier = "#{current_flag[2]}-active"
+              line.group_name = clean_flag(current_flag[0])
+              line.group_condition = 'flag-true'
+            else
+              line.device_sense = 'not' unless current_flag[1]
+              line.device_name = clean_flag(current_flag[0])
+              line.device_condition = 'flag-true'
+            end
           end
           open_lines << line
           yield line if block_given?