origen_testers 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82bf50b5eb01f12a4f731840c1516990d6b58f1
-  data.tar.gz: d1fa8916ebc0381611be2a5aa94bda1e58cf9c2b
+  metadata.gz: ed6eed4f43211577112670d75be50cd8c5af22d1
+  data.tar.gz: 44239f70ea1b03d86784cfbaf0dffd91694b0535
 SHA512:
-  metadata.gz: 7be4cbb82d2c2e1479cb954f494f7ce0a6365c5b442aef63180a3faf8df69c2af9d70bb7d894264c02694ebc90b4021985a2ddc90e771dd932ce54e002974cc0
-  data.tar.gz: 2b2bdfe54e832a20962858bbb46576d9233f380600078e2a886e2aad29f8cacf2e00163a4d4aa838c2b5f4bbadc2de6542b715a796ef0d898d1f94010acff7bd
+  metadata.gz: b1dbc83b631cc269e949a36a9473cfc0935601478adacf5216293db841fc7fce6fdafe88125db77c3ba0d897237858e3aee651d9167b987f0f35f35d0c8535b3
+  data.tar.gz: 2c2f1b09187a88366d9169d531a41465a997e09c321858babf28c5f2f20dc4eead6665fb946f6de91d630ad79693b753a189c01b89fc115b4dc57490c3ca54b8

data/config/version.rb

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

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

@@ -176,7 +176,7 @@ module OrigenTesters
         end
 
         def on_set_run_flag(node)
-          flag = node.to_a[0]
+          flag = remove_symbols_from_flag(node.to_a[0])
           set_run_flags[flag] = context.dup
           if current_group
             if branch == :on_fail
@@ -323,6 +323,7 @@ module OrigenTesters
           flag, value = *node.to_a.take(2)
           orig = flow_flag
           if flag.is_a?(Array)
+            flag.map! { |a_flag| remove_symbols_from_flag(a_flag) }
             if flag.size > 1
               or_flag = flag.join('_OR_')
               flag.each do |f|
@@ -332,6 +333,8 @@ module OrigenTesters
             else
               flag = flag.first
             end
+          else
+            flag = remove_symbols_from_flag(flag)
           end
           if value
             # IG-XL docs say that enable words are not optimized for test time, so branch around
@@ -409,7 +412,7 @@ module OrigenTesters
           line = platform::FlowLine.new(type, attrs)
           if run_flag
             line.device_sense = 'not' unless run_flag[1]
-            line.device_name = run_flag[0]
+            line.device_name = remove_symbols_from_flag(run_flag[0])
             line.device_condition = 'flag-true'
           end
           open_lines << line
@@ -442,6 +445,15 @@ module OrigenTesters
             "NOT_#{flag}"
           end
         end
+
+        private
+
+        def remove_symbols_from_flag(flag)
+          if flag[0] == '$'
+            flag[0] = ''
+          end
+          flag
+        end
       end
     end
   end

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

@@ -57,10 +57,9 @@ module OrigenTesters
           else
             i = ''
           end
-
           h << i + '  {'
           set_runtime_variables.each do |var|
-            h << i + "    @#{var.to_s.upcase} = -1;"
+            h << i + "    @#{generate_flag_name(var.to_s)} = -1;"
           end
           h << i + '  }, open,"Init Flow Control Vars", ""'
           h
@@ -162,9 +161,9 @@ module OrigenTesters
         def on_condition_flag(node)
           flag, state, *nodes = *node
           if flag.is_a?(Array)
-            condition = flag.map { |f| "@#{f.upcase} == 1" }.join(' or ')
+            condition = flag.map { |f| "@#{generate_flag_name(f)} == 1" }.join(' or ')
           else
-            condition = "@#{flag.upcase} == 1"
+            condition = "@#{generate_flag_name(flag)} == 1"
           end
           line "if #{condition} then"
           line '{'
@@ -183,7 +182,7 @@ module OrigenTesters
         def on_flow_flag(node)
           flag, state, *nodes = *node
           [flag].flatten.each do |f|
-            flow_control_variables << f.upcase
+            flow_control_variables << f
           end
           on_condition_flag(node)
         end
@@ -191,7 +190,7 @@ module OrigenTesters
         def on_run_flag(node)
           flag, state, *nodes = *node
           [flag].flatten.each do |f|
-            runtime_control_variables << f.upcase
+            runtime_control_variables << f
           end
           on_condition_flag(node)
         end
@@ -209,9 +208,9 @@ module OrigenTesters
         end
 
         def on_set_run_flag(node)
-          flag = node.value.upcase
+          flag = node.value
           runtime_control_variables << flag
-          line "@#{flag} = 1;"
+          line "@#{generate_flag_name(flag)} = 1;"
         end
 
         def on_group(node)
@@ -273,6 +272,17 @@ module OrigenTesters
           yield
           @continue = orig
         end
+
+        private
+
+        def generate_flag_name(flag)
+          case flag[0]
+          when '$'
+            flag[1..-1]
+          else
+            flag.upcase
+          end
+        end
       end
     end
   end

data/lib/origen_testers/smartest_based_tester/base/processors/extract_set_variables.rb

@@ -12,7 +12,7 @@ module OrigenTesters
           end
 
           def on_set_run_flag(node)
-            flag = node.value.upcase
+            flag = node.value
             @results << flag
           end
         end

data/program/flow_control.rb

@@ -295,6 +295,20 @@ Flow.create interface: 'OrigenTesters::Test::Interface' do
     test :test3
   end
   
+  log "Mixed-case manual flags"
+  test :test1, on_fail: { set_flag: :$My_Mixed_Flag }, continue: true
+  test :test2, if_flag: "$My_Mixed_Flag"
+  unless_flag "$My_Mixed_Flag" do
+    test :test3
+  end
+  
+  log "Mixed-case enables"
+  test :extra_test, if_enable: :$MCEn_extras
+  unless_enable "$MCEn_test" do
+    test :test1
+    test :test2
+  end
+
   if tester.v93k?
     log "This should retain the set-run-flag in the else conditional"
     func :test22, id: :at22

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like