trepanning 1.93.35 → 2.15.33

data/test/functional/test-stepbug.rb

@@ -1,21 +1,18 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 
 class TestStep < Test::Unit::TestCase
 
   include FnTestHelper
-  include Trace
 
   def test_step_through_leave
 
     # See that we can step with parameter which is the same as 'step 1'
     cmds = ['step', 'step', 'step', 'step', 'step', 'step', 'continue']
     d = strarray_setup(cmds)
-    d.core.step_events = TEST_STEP_EVENT_MASK 
 
-    d.start
+    d.start(true)
     ########### t1 ###############
     x = 'class Foo
            def bar
@@ -27,11 +24,11 @@ class TestStep < Test::Unit::TestCase
     # f.bar
     ##############################
     d.stop
-    out = ["-- x = 'class Foo", 
-           ".. eval(x)", 
-           ".. eval(x)", 
-           ":: eval(x)", 
-           "-- eval(x)"]
+    out = ["line x = 'class Foo",
+           ".. eval(x)",
+           ".. eval(x)",
+           ":: eval(x)",
+           "line eval(x)"]
     # compare_output(out, d, cmds)
     assert true
 

data/test/functional/test-watchg.rb

@@ -1,51 +1,52 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 
 # See that we hande "set trace var" properly
 class TestWatchG < Test::Unit::TestCase
 
-  include FnTestHelper
-  include Trace
+    include FnTestHelper
 
-  def test_basic
+    def test_basic
 
-    cmds = ['watchg $my_var', 
-            'watchg $my_var',
-            'continue', 'continue', 
-            'watchg $my_var off',
-            'watchg $my_var off',
-            'continue']
-    d = strarray_setup(cmds)
-    d.core.step_events = TEST_STEP_EVENT_MASK
+        cmds = ['watchg $my_var',
+                'continue', 'continue']
+        d = strarray_setup(cmds)
 
-    d.start
-    ########### t1 ###############
-    x = 1
-    $my_var = 5
-    y = 2
-    $my_var = 6
-    z = 3
-    ##############################
-    d.stop
-    out = ['-- ',
-           'x = 1',
-           'Tracing for variable $my_var set to: stop.',
-           '** global variable $my_var is already traced with stop.',
-           'trace: $my_var = 5',
-           'Note: we are stopped *after* the above location.',
-           '$V ',
-           '$my_var = 5',
-           'trace: $my_var = 6',
-           'Note: we are stopped *after* the above location.',
-           '$V ',
-           '$my_var = 6',
-           'Removed trace for variable $my_var.',
-           'Warning: variable $my_var is not currently marked as traced.',
-           'Removed trace for variable $my_var.'
-          ]
-    compare_output(out, d, cmds)
-    end
+        d.start(true)
+        ########### t1 ###############
+        x = 1
+        $my_var = 5
+        y = 2
+        $my_var = 6
+        z = 3
+        ##############################
+        d.stop
 
+        out = ["line ",
+               "x = 1",
+               "Tracing for variable $my_var set to: stop.",
+               "trace: $my_var = 5",
+               "trace-var ",
+               "y = 2",
+               "trace: $my_var = 6",
+               "trace-var ",
+               "z = 3",
+               "c_return ",
+               "R=> nil",
+               "z = 3",
+               "line ",
+               "z = 3",
+               "line ",
+               "d.stop",
+               "call ",
+               # FIXME: can we get rid of the below?
+               "RubyVM::Frame::get.trace_off = true",
+               "c_call ",
+               "RubyVM::Frame::get.trace_off = true",
+               "c_call ",
+               "RubyVM::Frame::get.trace_off = true"
+              ]
+        compare_output(out, d, cmds)
+    end
 end

data/test/integration/test-debug.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative 'helper'
+require 'rbconfig'
+
+class TestDebug < Test::Unit::TestCase
+  @@NAME = File.basename(__FILE__, '.rb')[5..-1]
+    def test_trepan_debug
+        opts = {:args => '3 5', :verbose=>true}
+        assert_equal(true, run_debugger(@@NAME, 'gcd.rb', opts))
+    end
+end

data/test/integration/test-debugger-stop.rb

@@ -5,23 +5,23 @@ require_relative 'helper'
 
 class TestDebuggerStop < Test::Unit::TestCase
   @@name = File.basename(__FILE__, '.rb')[5..-1]
-  @@name = @@name[2..-1] if 
+  @@name = @@name[2..-1] if
     (RbConfig::CONFIG['target_os'].start_with?('mingw') and
      @@name =~ /^[A-Za-z]:/)
 
   def test_it
-    skip "FIXME for mingw" if 
-      RbConfig::CONFIG['target_os'].start_with?('mingw') 
+    skip "FIXME for mingw" if
+      RbConfig::CONFIG['target_os'].start_with?('mingw')
     opts = {}
     opts[:feed_input] = "echo 'info program ;; continue ;; quit!' "
     opts[:filter] = Proc.new{|got_lines, correct_lines|
-      got_lines[0].gsub!(/\(.*debugger-stop.rb[:]\d+ @\d+/, 
+      got_lines[0].gsub!(/\(.*debugger-stop.rb[:]\d+ @\d+/,
                          'debugger-stop.rb:14 @1955')
       # require_relative '../../lib/trepanning'; debugger
-      got_lines[2].gsub!(/PC offset \d+ .*<top .+debugger-stop.rb/, 
-                         "PC offset 100 <top debugger-stop.rb")
-      got_lines[3].gsub!(/\(.*debugger-stop.rb[:]\d+ @\d+/, 
+      got_lines[2].gsub!(/\(.*debugger-stop.rb[:]\d+ @\d+\)/,
                          'debugger-stop.rb:10 @1954')
+      got_lines[4].gsub!(/PC offset \d+ .*<top .+debugger-stop.rb/,
+                         "PC offset 100 <top debugger-stop.rb")
     }
     assert_equal(true, run_debugger(@@name, @@name + '.rb', opts))
   end

data/test/integration/test-pc.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require_relative 'helper'
+
+class TestQuit < Test::Unit::TestCase
+  @@NAME = File.basename(__FILE__, '.rb')[5..-1]
+
+  # def test_trepanx_set_confirm_off
+  #   opts = {}
+  #   opts[:filter] = Proc.new{|got_lines, correct_lines|
+  #     got_lines[0] = "-> (null.rb:1 @0)\n"
+  #   }
+  #   assert_equal(true, run_debugger('quit2', 'null.rb', opts))
+  # end
+
+  def test_trepan_pc
+      skip "Can't run from rake :-(" if __FILE__ != $0
+      opts = {}
+      opts[:filter] = Proc.new{|got_lines, correct_lines|
+          got_lines[0] = "-> (null.rb:1 @0)\n"
+      }
+      assert_equal(true, run_debugger(@@NAME, 'assign.rb', opts))
+  end
+end

data/test/integration/test-trace.rb

@@ -13,7 +13,7 @@ class TestTrace < Test::Unit::TestCase
     end
 
     def test_trepan_trace
-        opts = {:dbgr => '-x --basename', :args => '3 5', :nocommand => true}
+        opts = {:dbgr => '-x', :args => '3 5', :nocommand => true}
         if RbConfig::CONFIG['target_os'].start_with?('mingw')
             opts[:short_right] = 'trace-mingw'
         end

data/test/unit/cmd-helper.rb

@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'thread_frame'
 require_relative '../../app/core'
 require_relative '../../app/mock'
 require_relative '../../processor/frame'

data/test/unit/test-app-brkpt.rb

@@ -1,29 +1,29 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require_relative '../../app/breakpoint'
-require 'thread_frame'
 
 class TestAppBrkpt < Test::Unit::TestCase
 
-  def test_basic
-    tf = RubyVM::Frame.current
-    iseq = tf.iseq
-    b1 = Trepan::Breakpoint.new(iseq, 0)
-    assert_equal(false, b1.temp?)
-    assert_equal(0, b1.hits)
-    assert_equal('B', b1.icon_char)
-    assert_equal(true, b1.condition?(tf.binding))
-    assert_equal(1, b1.hits)
-    assert_equal(b1.source_container, tf.source_container)
-    b1.enabled = false
-    assert_equal('b', b1.icon_char)
-    assert_raises TypeError do 
-      Trepan::Breakpoint.new(iseq, iseq.iseq_size, :temp => true)
-    end
-    assert_raises TypeError do 
-      Trepan::Breakpoint.new(0, 5)
+    def test_basic
+        tf = RubyVM::Frame.get
+        iseq = tf.iseq
+        b1 = Trepan::Breakpoint.new(iseq, 0)
+        assert_equal(false, b1.temp?)
+        assert_equal(0, b1.hits)
+        assert_equal('B', b1.icon_char)
+        assert_equal(true, b1.condition?(tf.binding))
+        assert_equal(1, b1.hits)
+
+        assert_equal(b1.source_container, tf.source_container)
+        b1.enabled = false
+        assert_equal('b', b1.icon_char)
+        assert_raises TypeError do
+            Trepan::Breakpoint.new(iseq, iseq.iseq_size, :temp => true)
+        end
+        assert_raises TypeError do
+            Trepan::Breakpoint.new(0, 5)
+        end
+        b2 = Trepan::Breakpoint.new(iseq, 0, :temp => true)
+        assert_equal('t', b2.icon_char)
     end
-    b2 = Trepan::Breakpoint.new(iseq, 0, :temp => true)
-    assert_equal('t', b2.icon_char)
-  end
 end

data/test/unit/test-app-brkptmgr.rb

@@ -2,7 +2,6 @@
 require 'test/unit'
 require_relative '../../app/brkptmgr'
 require_relative '../../app/breakpoint'
-require 'thread_frame'
 
 class TestLibAppBrkptMgr < Test::Unit::TestCase
 
@@ -11,7 +10,7 @@ class TestLibAppBrkptMgr < Test::Unit::TestCase
   end
 
   def test_basic
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     iseq = tf.iseq
     offsets = iseq.offsetlines.keys
     offset  = offsets[0]
@@ -32,24 +31,24 @@ class TestLibAppBrkptMgr < Test::Unit::TestCase
   end
 
   def test_multiple_brkpt_per_offset
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     iseq = tf.iseq
     offsets = iseq.offsetlines.keys
     offset  = offsets[0]
     b1 = @brkpts.add(iseq, offset)
     b2 = @brkpts.add(iseq, offset)
     assert_equal(2, @brkpts.size)
-    assert_equal(1, @brkpts.set.size, 
+    assert_equal(1, @brkpts.set.size,
                  'Two breakpoints but only one iseq/offset')
     @brkpts.delete_by_brkpt(b1)
-    assert_equal(1, @brkpts.size, 
+    assert_equal(1, @brkpts.size,
                  'One breakpoint after 2nd breakpoint deleted')
-    assert_equal(1, @brkpts.set.size, 
+    assert_equal(1, @brkpts.set.size,
                  'Two breakpoints, but only one iseq/offset')
     @brkpts.delete_by_brkpt(b2)
-    assert_equal(0, @brkpts.size, 
+    assert_equal(0, @brkpts.size,
                  'Both breakpoints deleted')
-    assert_equal(0, @brkpts.set.size, 
+    assert_equal(0, @brkpts.set.size,
                  'Second breakpoint delete should delete iseq/offset')
   end
 

data/test/unit/test-app-display.rb

@@ -1,19 +1,18 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require_relative '../../app/display'
-require 'thread_frame'
 
-class TestLibAppBrkptMgr < Test::Unit::TestCase
+class TestLibAppDisplay < Test::Unit::TestCase
 
   def test_basic
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     mgr = DisplayMgr.new
     x = 1
     assert_equal(0, mgr.size)
     disp = mgr.add(tf, 'x > 1')
     assert_equal(1, mgr.max)
     assert_equal(true, disp.enabled?)
-    
+
     mgr.enable_disable(disp.number, false)
     assert_equal(false, disp.enabled?)
     mgr.enable_disable(disp.number, true)

data/test/unit/test-app-frame.rb

@@ -1,26 +1,25 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require_relative '../../app/frame'
-require 'thread_frame'
 
 class TestAppFrame < Test::Unit::TestCase
 
   include Trepan::Frame
 
   def test_app_frame
-    frame = RubyVM::Frame.current
+    frame = RubyVM::Frame.get
     base_count = frame.stack_size
     s = format_stack_entry(frame)
     pat = /^METHOD .*#test_app_frame\(\) in file .*test-app-frame.rb at line \d+/
     assert(s =~ pat, "got #{s}, expected pat #{pat}")
-    1.times do 
-      assert_equal(base_count+2, RubyVM::Frame.current.stack_size)
+    1.times do
+      assert_equal(base_count+2, RubyVM::Frame.get.stack_size)
       s = format_stack_entry(frame)
       assert(s =~ pat, "got #{s}, expected pat #{pat}")
     end
 
     def inner_test(count)
-      frame = RubyVM::Frame.current
+      frame = RubyVM::Frame.get
       assert_equal(count, frame.stack_size)
 
       s = format_stack_entry(frame)

data/test/unit/test-base-subsubcmd.rb

@@ -3,10 +3,10 @@ require 'test/unit'
 require_relative '../../processor/command/base/subsubcmd'
 
 $errors = []
-class TestBaseSubCommand < Test::Unit::TestCase
+class TestBaseSubSubCommand < Test::Unit::TestCase
 
   def test_prefix_set
-    Trepanning::SubSubcommand.set_name_prefix('/tmp/show_subcmd/auto_subcmd/food.rb', 
+    Trepanning::SubSubcommand.set_name_prefix('/tmp/show_subcmd/auto_subcmd/food.rb',
                                            self.class)
     assert_equal('food', NAME, "should have set NAME")
     assert_equal('show auto food', CMD)

data/test/unit/test-cmd-break.rb

@@ -8,17 +8,17 @@ class TestCommandBreak < Test::Unit::TestCase
     common_setup
     @name   = File.basename(__FILE__, '.rb').split(/-/)[2]
     @my_cmd = @cmds[@name]
-    @brkpt_set_pat = /^Breakpoint \d+ set at VM offset \d+ of instruction sequence .*,\n\tline \d+ in file .*$/ 
+    @brkpt_set_pat = /^Breakpoint \d+ set at VM offset \d+ of instruction sequence .*,\n\tline \d+ in file .*$/
   end
 
-  def run_cmd(cmd, args) 
+  def run_cmd(cmd, args)
     cmd.proc.instance_variable_set('@cmd_argstr', args[1..-1].join(' '))
     cmd.run(args)
   end
 
   # require_relative '../../lib/trepanning'
   def test_basic
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     @cmdproc.frame_setup(tf)
     [
      [@name,  __LINE__.to_s],
@@ -40,7 +40,7 @@ class TestCommandBreak < Test::Unit::TestCase
     end
 
     def foo
-      5 
+      5
     end
     [[@name, 'foo', (__LINE__-3).to_s]].each_with_index do |args, i|
       run_cmd(@my_cmd, args)
@@ -62,11 +62,11 @@ class TestCommandBreak < Test::Unit::TestCase
   # the parent instruction sequence, i.e. the line is not in the
   # current instruction sequence.
   def test_parent_breakpoint
-    # skip "Need to add ISEQ parent link to 1.9.2 and further check of old code" 
+    # skip "Need to add ISEQ parent link to 1.9.2 and further check of old code"
     # require_relative '../../lib/trepanning'
     line = __LINE__  # This is the line we set the breakpoint for.
     1.times do
-      tf = RubyVM::Frame.current  
+      tf = RubyVM::Frame.get
       @cmdproc.frame_setup(tf)
       run_cmd(@my_cmd, [@name, line.to_s])
       assert_equal(true, @cmdproc.errmsgs.empty?, @cmdproc.errmsgs)

data/test/unit/test-cmd-endisable.rb

@@ -17,13 +17,13 @@ class TestCommandEnableDisable < Test::Unit::TestCase
 
     # Some simple errors in running enable/disable commands
     [[@enable_cmd, ['enable', '1'], 0, 1],
-     [@disable_cmd, ['disable', '1'], 0, 1]].each do 
+     [@disable_cmd, ['disable', '1'], 0, 1]].each do
       |cmd, args, nmsgs, nerrs|
       # No breakpoint number given
       cmd.run(args[0..0])
-      assert_equal(nmsgs, @cmdproc.msgs.size, 
+      assert_equal(nmsgs, @cmdproc.msgs.size,
                    "#{args} - msgs: #{@cmdproc.msgs.inspect}")
-      assert_equal(nerrs, @cmdproc.errmsgs.size, 
+      assert_equal(nerrs, @cmdproc.errmsgs.size,
                    "#{args} - errmsgs: #{@cmdproc.errmsgs.inspect}")
       reset_cmdproc_vars
 
@@ -34,22 +34,23 @@ class TestCommandEnableDisable < Test::Unit::TestCase
       reset_cmdproc_vars
     end
 
-    tf = RubyVM::Frame.current
+    tf = RubyVM::Frame.get
     @cmdproc.frame_setup(tf)
     pc_offset = tf.pc_offset
     @break_cmd.run(['break'])
+    p @cmdproc.errmsgs
     assert_equal(true, @cmdproc.errmsgs.empty?)
     assert_equal(1, @cmdproc.msgs.size)
     reset_cmdproc_vars
 
     @disable_cmd.run(['disable', '1'])
-    assert_equal(0, 
+    assert_equal(0,
                  @cmdproc.msgs[0] =~ /^Breakpoint 1 disabled./,
                  @cmdproc.msgs)
     reset_cmdproc_vars
 
     @enable_cmd.run(['enable', '1'])
-    assert_equal(0, 
+    assert_equal(0,
                  @cmdproc.msgs[0] =~ /^Breakpoint 1 enabled./,
                  @cmdproc.msgs)
   end