origen_testers 0.13.1 → 0.13.2

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

@@ -1,54 +1,58 @@
-module OrigenTesters
-  module SmartestBasedTester
-    class Base
-      class TestSuites
-        # Origen::Tester::Generator not included since test suites do not have their
-        # own top-level sheet, they will be incorporated within the flow sheet
-
-        attr_accessor :flow, :collection
-
-        def initialize(flow)
-          @flow = flow
-          @collection = []
-        end
-
-        def filename
-          flow.filename
-        end
-
-        def add(name, options = {})
-          name = make_unique(name)
-          suite = platform::TestSuite.new(name, options)
-          @collection << suite
-          # c = Origen.interface.consume_comments
-          # Origen.interface.descriptions.add_for_test_definition(name, c)
-          suite
-        end
-        alias_method :run, :add
-        alias_method :run_and_branch, :add
-
-        def platform
-          Origen.interface.platform
-        end
-
-        def finalize
-          # collection.each do |suite|
-          # end
-        end
-
-        private
-
-        def make_unique(name)
-          @existing_names ||= {}
-          if @existing_names[name]
-            @existing_names[name] += 1
-            "#{name}_#{@existing_names[name]}"
-          else
-            @existing_names[name] = 0
-            name
-          end
-        end
-      end
-    end
-  end
-end
+module OrigenTesters
+  module SmartestBasedTester
+    class Base
+      class TestSuites
+        # Origen::Tester::Generator not included since test suites do not have their
+        # own top-level sheet, they will be incorporated within the flow sheet
+
+        attr_accessor :flow, :collection
+
+        def initialize(flow)
+          @flow = flow
+          @collection = []
+        end
+
+        def filename
+          flow.filename
+        end
+
+        def add(name, options = {})
+          name = make_unique(name)
+          suite = platform::TestSuite.new(name, options)
+          @collection << suite
+          # c = Origen.interface.consume_comments
+          # Origen.interface.descriptions.add_for_test_definition(name, c)
+          suite
+        end
+        alias_method :run, :add
+        alias_method :run_and_branch, :add
+
+        def platform
+          Origen.interface.platform
+        end
+
+        def finalize
+          # collection.each do |suite|
+          # end
+        end
+
+        def sorted_collection
+          @collection.sort_by { |ts| ts.name.to_s }
+        end
+
+        private
+
+        def make_unique(name)
+          @existing_names ||= {}
+          if @existing_names[name.to_sym]
+            @existing_names[name.to_sym] += 1
+            "#{name}_#{@existing_names[name.to_sym]}"
+          else
+            @existing_names[name.to_sym] = 0
+            name
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,38 +1,38 @@
-require 'pathname'
-module OrigenTesters
-  module SmartestBasedTester
-    class Base
-      class VariablesFile
-        include OrigenTesters::Generator
-
-        attr_reader :flow_control_variables, :runtime_control_variables
-        attr_accessor :filename, :id
-
-        def initialize(options = {})
-          @flow_control_variables = []
-          @runtime_control_variables = []
-        end
-
-        def subdirectory
-          'testflow/mfh.testflow.setup'
-        end
-
-        def clean_flow_control_variables
-          flow_control_variables.uniq.sort do |x, y|
-            x = x[0] if x.is_a?(Array)
-            y = y[0] if y.is_a?(Array)
-            x <=> y
-          end
-        end
-
-        def clean_runtime_control_variables
-          runtime_control_variables.uniq.sort do |x, y|
-            x = x[0] if x.is_a?(Array)
-            y = y[0] if y.is_a?(Array)
-            x <=> y
-          end
-        end
-      end
-    end
-  end
-end
+require 'pathname'
+module OrigenTesters
+  module SmartestBasedTester
+    class Base
+      class VariablesFile
+        include OrigenTesters::Generator
+
+        attr_reader :flow_control_variables, :runtime_control_variables
+        attr_accessor :filename, :id
+
+        def initialize(options = {})
+          @flow_control_variables = []
+          @runtime_control_variables = []
+        end
+
+        def subdirectory
+          'testflow/mfh.testflow.setup'
+        end
+
+        def clean_flow_control_variables
+          flow_control_variables.uniq.sort do |x, y|
+            x = x[0] if x.is_a?(Array)
+            y = y[0] if y.is_a?(Array)
+            x <=> y
+          end
+        end
+
+        def clean_runtime_control_variables
+          runtime_control_variables.uniq.sort do |x, y|
+            x = x[0] if x.is_a?(Array)
+            y = y[0] if y.is_a?(Array)
+            x <=> y
+          end
+        end
+      end
+    end
+  end
+end

data/lib/origen_testers/smartest_based_tester/v93k.rb

@@ -1,8 +1,8 @@
-module OrigenTesters
-  module SmartestBasedTester
-    class V93K < Base
-      require 'origen_testers/smartest_based_tester/v93k/generator.rb'
-    end
-  end
-  V93K = SmartestBasedTester::V93K
-end
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K < Base
+      require 'origen_testers/smartest_based_tester/v93k/generator.rb'
+    end
+  end
+  V93K = SmartestBasedTester::V93K
+end

data/lib/origen_testers/smartest_based_tester/v93k/builder.rb

@@ -1,89 +1,89 @@
-module OrigenTesters
-  module SmartestBasedTester
-    class V93K
-      # Responsible for building V93K test programs from a collection of sub-programs
-      class Builder
-        require 'yaml'
-
-        autoload :Flow, 'origen_testers/smartest_based_tester/v93k/builder/flow'
-        autoload :PatternMaster, 'origen_testers/smartest_based_tester/v93k/builder/pattern_master'
-
-        attr_reader :manifest
-
-        def build(manifest, options = {})
-          @manifest_dir = Pathname.new(manifest).dirname.to_s
-          @manifest = YAML.load_file(manifest).with_indifferent_access
-          parse_sub_programs
-          render(options)
-        end
-
-        private
-
-        def render(options)
-          manifest[:flows].each do |name, flow|
-            flow_file = nil
-            pm_file = nil
-
-            flow.each do |sub_program|
-              unless flows[sub_program]
-                puts "Flow #{name} includes sub-program #{sub_program}, but it has not been defined!"
-                exit 1
-              end
-              flow_file ||= Flow.new
-              flow_file.add_sub_flow(flows[sub_program])
-              if pattern_masters[sub_program]
-                pm_file ||= PatternMaster.new
-                pm_file.add_sub_file(pattern_masters[sub_program])
-              end
-            end
-
-            compile_options = {
-              action:           :compile,
-              files:            "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/template.flow.erb",
-              output_file_name: "#{name}.flow",
-              output_sub_dir:   'testflow',
-              options:          { program: flow_file }
-            }.merge(options)
-
-            Origen.app.runner.launch(compile_options)
-
-            if pm_file
-              compile_options = {
-                action:           :compile,
-                files:            "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/template.pmfl.erb",
-                output_file_name: "#{name}.pmfl",
-                output_sub_dir:   'vectors',
-                options:          { program: pm_file }
-              }.merge(options)
-            end
-            Origen.app.runner.launch(compile_options)
-          end
-        end
-
-        def parse_sub_programs
-          manifest[:sub_programs].each do |sub_program|
-            name = sub_program[:name]
-            if sub_program[:flow]
-              flows[name] = Flow.new(find_file(sub_program[:flow]))
-            end
-            if sub_program[:pattern_master]
-              pattern_masters[name] = PatternMaster.new(find_file(sub_program[:pattern_master]))
-            end
-          end
-        end
-
-        def find_file(file)
-          Origen.file_handler.clean_path_to(file, default_dir: @manifest_dir)
-        end
-
-        def flows
-          @flows ||= {}
-        end
-
-        def pattern_masters
-          @pattern_masters ||= {}
-        end
-      end
-    end
-  end
-end
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K
+      # Responsible for building V93K test programs from a collection of sub-programs
+      class Builder
+        require 'yaml'
+
+        autoload :Flow, 'origen_testers/smartest_based_tester/v93k/builder/flow'
+        autoload :PatternMaster, 'origen_testers/smartest_based_tester/v93k/builder/pattern_master'
+
+        attr_reader :manifest
+
+        def build(manifest, options = {})
+          @manifest_dir = Pathname.new(manifest).dirname.to_s
+          @manifest = YAML.load_file(manifest).with_indifferent_access
+          parse_sub_programs
+          render(options)
+        end
+
+        private
+
+        def render(options)
+          manifest[:flows].each do |name, flow|
+            flow_file = nil
+            pm_file = nil
+
+            flow.each do |sub_program|
+              unless flows[sub_program]
+                puts "Flow #{name} includes sub-program #{sub_program}, but it has not been defined!"
+                exit 1
+              end
+              flow_file ||= Flow.new
+              flow_file.add_sub_flow(flows[sub_program])
+              if pattern_masters[sub_program]
+                pm_file ||= PatternMaster.new
+                pm_file.add_sub_file(pattern_masters[sub_program])
+              end
+            end
+
+            compile_options = {
+              action:           :compile,
+              files:            "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/template.flow.erb",
+              output_file_name: "#{name}.flow",
+              output_sub_dir:   'testflow',
+              options:          { program: flow_file }
+            }.merge(options)
+
+            Origen.app.runner.launch(compile_options)
+
+            if pm_file
+              compile_options = {
+                action:           :compile,
+                files:            "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/template.pmfl.erb",
+                output_file_name: "#{name}.pmfl",
+                output_sub_dir:   'vectors',
+                options:          { program: pm_file }
+              }.merge(options)
+            end
+            Origen.app.runner.launch(compile_options)
+          end
+        end
+
+        def parse_sub_programs
+          manifest[:sub_programs].each do |sub_program|
+            name = sub_program[:name]
+            if sub_program[:flow]
+              flows[name] = Flow.new(find_file(sub_program[:flow]))
+            end
+            if sub_program[:pattern_master]
+              pattern_masters[name] = PatternMaster.new(find_file(sub_program[:pattern_master]))
+            end
+          end
+        end
+
+        def find_file(file)
+          Origen.file_handler.clean_path_to(file, default_dir: @manifest_dir)
+        end
+
+        def flows
+          @flows ||= {}
+        end
+
+        def pattern_masters
+          @pattern_masters ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/origen_testers/smartest_based_tester/v93k/builder/flow.rb

@@ -1,181 +1,181 @@
-module OrigenTesters
-  module SmartestBasedTester
-    class V93K
-      class Builder
-        # Responsible for modelling/building the contents of a V93K flow file
-        class Flow
-          attr_reader :information, :declarations, :flags, :testmethodparameters,
-                      :testmethodlimits, :testmethods, :test_suites, :test_flow, :binning,
-                      :hardware_bin_descriptions, :file
-
-          def initialize(file = nil)
-            @information = {}
-            @declarations = {}
-            @flags = {}
-            @testmethodparameters = {}
-            @testmethodlimits = {}
-            @testmethods = {}
-            @test_suites = {}
-            @test_flow = []
-            @binning = []
-            @hardware_bin_descriptions = {}
-            @groups = {}
-            @file = file
-            parse_file if file
-          end
-
-          def add_sub_flow(flow)
-            combine(flow, :information, exclude: 'test_revision')
-            combine(flow, :declarations)
-            combine(flow, :flags)
-            add_test_methods(flow)
-            add_test_suites(flow)
-            add_flow(flow)
-            (binning << flow.binning).flatten!.uniq!
-            combine(flow, :hardware_bin_descriptions)
-          end
-
-          private
-
-          def parse_file
-            current_section = nil
-            current = nil
-            File.open(file) do |f|
-              f.each_line do |line|
-                if current_section
-                  if line =~ /^\s*end\s*$/
-                    current_section = nil
-                    current = nil
-                  else
-                    case current_section
-                    when :information, :declarations, :flags, :hardware_bin_descriptions
-                      if line =~ /^\s*(.*)\s*=\s*(.*)\s*$/
-                        send(current_section)[Regexp.last_match(1).strip] = Regexp.last_match(2).strip
-                      end
-                    when :testmethodparameters, :testmethodlimits, :testmethods, :test_suites
-                      if line =~ /^\s*(.*):\s*$/
-                        current = Regexp.last_match(1)
-                        send(current_section)[current] = {}
-                      elsif current
-                        if line =~ /^\s*(.*)\s*=\s*(.*)\s*$/
-                          send(current_section)[current][Regexp.last_match(1).strip] = Regexp.last_match(2).strip
-                        end
-                      end
-                    when :binning
-                      binning << line.strip
-                    when :test_flow
-                      add_flow_line(line)
-                    end
-                  end
-                else
-                  if line =~ /^\s*(information|declarations|flags|testmethodparameters|testmethodlimits|testmethods|test_suites|test_flow|binning|hardware_bin_descriptions)\s*$/
-                    current_section = Regexp.last_match(1).to_sym
-                    current = nil
-                  end
-                end
-              end
-            end
-          end
-
-          def groups
-            @groups
-          end
-
-          def add_flow(flow)
-            flow.test_flow.each { |l| add_flow_line(l) }
-          end
-
-          def add_flow_line(line)
-            line.strip!
-            # Make group names unique as required
-            if line =~ /\s*},\s*open\s*,\s*("|')(.*)("|'),.*/
-              group = Regexp.last_match(2).strip
-              if groups[group]
-                line = line.sub(group, "#{group} #{groups[group]}")
-                groups[group] += 1
-              else
-                groups[group] = 1
-              end
-            end
-            test_flow << line
-          end
-
-          def combine(flow, attribute, options = {})
-            exclude = [options[:exclude]].flatten.compact
-            flow.send(attribute).each do |key, val|
-              unless exclude.include?(key)
-                if send(attribute)[key]
-                  if send(attribute)[key] != val
-                    puts "#{flow} assigns #{attribute} attribute #{key} to #{val}, however it is already assigned to #{send(attribute)[key]}"
-                    exit 1
-                  end
-                else
-                  send(attribute)[key] = val
-                end
-              end
-            end
-          end
-
-          # Add the test methods from the given flow to this flow
-          def add_test_methods(flow)
-            flow.testmethods.each do |id, tm|
-              # If this flow already contains a test method with the current ID
-              if testmethods[id]
-                nid = "tm_#{tm_ix}"
-                testmethods[nid] = tm
-                testmethodparameters[nid] = flow.testmethodparameters[id]
-                testmethodlimits[nid] = flow.testmethodlimits[id]
-                flow.test_suites.each do |tsid, ts|
-                  if ts['override_testf'] == "#{id};" && !ts[:new_id]
-                    ts['override_testf'] = "#{nid};"
-                    ts[:new_id] = true
-                  end
-                end
-              else
-                testmethods[id] = tm
-                testmethodparameters[id] = flow.testmethodparameters[id]
-                testmethodlimits[id] = flow.testmethodlimits[id]
-              end
-            end
-            # Remove this temporary flag to prevent it rendering to the output file
-            flow.test_suites.each do |tsid, ts|
-              ts.delete(:new_id)
-            end
-          end
-
-          def add_test_suites(flow)
-            flow.test_suites.each do |id, ts|
-              # If this flow already contains a test suite with the current ID
-              if test_suites[id]
-                i = 1
-                nid = id
-                while test_suites[nid]
-                  nid = "#{id}_#{i}"
-                  i += 1
-                end
-                test_suites[nid] = ts
-                flow.test_flow.map! do |line|
-                  if line =~ /(run|run_and_branch)\(#{id}\)/ && line !~ /--NEW_ID--/
-                    line = line.sub(id, nid)
-                    line += '--NEW_ID--'
-                  else
-                    line
-                  end
-                end
-              else
-                test_suites[id] = ts
-              end
-            end
-            flow.test_flow.map! do |line|
-              line.sub('--NEW_ID--', '')
-            end
-          end
-
-          def tm_ix
-            testmethods.size + 1
-          end
-        end
-      end
-    end
-  end
-end
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K
+      class Builder
+        # Responsible for modelling/building the contents of a V93K flow file
+        class Flow
+          attr_reader :information, :declarations, :flags, :testmethodparameters,
+                      :testmethodlimits, :testmethods, :test_suites, :test_flow, :binning,
+                      :hardware_bin_descriptions, :file
+
+          def initialize(file = nil)
+            @information = {}
+            @declarations = {}
+            @flags = {}
+            @testmethodparameters = {}
+            @testmethodlimits = {}
+            @testmethods = {}
+            @test_suites = {}
+            @test_flow = []
+            @binning = []
+            @hardware_bin_descriptions = {}
+            @groups = {}
+            @file = file
+            parse_file if file
+          end
+
+          def add_sub_flow(flow)
+            combine(flow, :information, exclude: 'test_revision')
+            combine(flow, :declarations)
+            combine(flow, :flags)
+            add_test_methods(flow)
+            add_test_suites(flow)
+            add_flow(flow)
+            (binning << flow.binning).flatten!.uniq!
+            combine(flow, :hardware_bin_descriptions)
+          end
+
+          private
+
+          def parse_file
+            current_section = nil
+            current = nil
+            File.open(file) do |f|
+              f.each_line do |line|
+                if current_section
+                  if line =~ /^\s*end\s*$/
+                    current_section = nil
+                    current = nil
+                  else
+                    case current_section
+                    when :information, :declarations, :flags, :hardware_bin_descriptions
+                      if line =~ /^\s*(.*)\s*=\s*(.*)\s*$/
+                        send(current_section)[Regexp.last_match(1).strip] = Regexp.last_match(2).strip
+                      end
+                    when :testmethodparameters, :testmethodlimits, :testmethods, :test_suites
+                      if line =~ /^\s*(.*):\s*$/
+                        current = Regexp.last_match(1)
+                        send(current_section)[current] = {}
+                      elsif current
+                        if line =~ /^\s*(.*)\s*=\s*(.*)\s*$/
+                          send(current_section)[current][Regexp.last_match(1).strip] = Regexp.last_match(2).strip
+                        end
+                      end
+                    when :binning
+                      binning << line.strip
+                    when :test_flow
+                      add_flow_line(line)
+                    end
+                  end
+                else
+                  if line =~ /^\s*(information|declarations|flags|testmethodparameters|testmethodlimits|testmethods|test_suites|test_flow|binning|hardware_bin_descriptions)\s*$/
+                    current_section = Regexp.last_match(1).to_sym
+                    current = nil
+                  end
+                end
+              end
+            end
+          end
+
+          def groups
+            @groups
+          end
+
+          def add_flow(flow)
+            flow.test_flow.each { |l| add_flow_line(l) }
+          end
+
+          def add_flow_line(line)
+            line.strip!
+            # Make group names unique as required
+            if line =~ /\s*},\s*open\s*,\s*("|')(.*)("|'),.*/
+              group = Regexp.last_match(2).strip
+              if groups[group]
+                line = line.sub(group, "#{group} #{groups[group]}")
+                groups[group] += 1
+              else
+                groups[group] = 1
+              end
+            end
+            test_flow << line
+          end
+
+          def combine(flow, attribute, options = {})
+            exclude = [options[:exclude]].flatten.compact
+            flow.send(attribute).each do |key, val|
+              unless exclude.include?(key)
+                if send(attribute)[key]
+                  if send(attribute)[key] != val
+                    puts "#{flow} assigns #{attribute} attribute #{key} to #{val}, however it is already assigned to #{send(attribute)[key]}"
+                    exit 1
+                  end
+                else
+                  send(attribute)[key] = val
+                end
+              end
+            end
+          end
+
+          # Add the test methods from the given flow to this flow
+          def add_test_methods(flow)
+            flow.testmethods.each do |id, tm|
+              # If this flow already contains a test method with the current ID
+              if testmethods[id]
+                nid = "tm_#{tm_ix}"
+                testmethods[nid] = tm
+                testmethodparameters[nid] = flow.testmethodparameters[id]
+                testmethodlimits[nid] = flow.testmethodlimits[id]
+                flow.test_suites.each do |tsid, ts|
+                  if ts['override_testf'] == "#{id};" && !ts[:new_id]
+                    ts['override_testf'] = "#{nid};"
+                    ts[:new_id] = true
+                  end
+                end
+              else
+                testmethods[id] = tm
+                testmethodparameters[id] = flow.testmethodparameters[id]
+                testmethodlimits[id] = flow.testmethodlimits[id]
+              end
+            end
+            # Remove this temporary flag to prevent it rendering to the output file
+            flow.test_suites.each do |tsid, ts|
+              ts.delete(:new_id)
+            end
+          end
+
+          def add_test_suites(flow)
+            flow.test_suites.each do |id, ts|
+              # If this flow already contains a test suite with the current ID
+              if test_suites[id]
+                i = 1
+                nid = id
+                while test_suites[nid]
+                  nid = "#{id}_#{i}"
+                  i += 1
+                end
+                test_suites[nid] = ts
+                flow.test_flow.map! do |line|
+                  if line =~ /(run|run_and_branch)\(#{id}\)/ && line !~ /--NEW_ID--/
+                    line = line.sub(id, nid)
+                    line += '--NEW_ID--'
+                  else
+                    line
+                  end
+                end
+              else
+                test_suites[id] = ts
+              end
+            end
+            flow.test_flow.map! do |line|
+              line.sub('--NEW_ID--', '')
+            end
+          end
+
+          def tm_ix
+            testmethods.size + 1
+          end
+        end
+      end
+    end
+  end
+end