trepanning 1.93.35 → 2.15.33

data/test/functional/test-delete.rb

@@ -1,74 +1,72 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 require_relative '../../app/breakpoint'
 
 class TestDelete < Test::Unit::TestCase
 
-  include FnTestHelper
+    include FnTestHelper
 
-  def test_delete
+    def test_delete
 
-    # See that when we can delete a breakpoint.
-    cmds = ['set basename on',
-            'break ' + (__LINE__ + 9).to_s, 
-            'delete 1', 
-            'continue',
-           ]
-    d = strarray_setup(cmds)
-    d.start
-    ########### b1 ###############
-    va = 1
-    vb = 2
-    vc = 3
-    vd = 4
-    ve = 5
-    ##############################
-    d.stop
-    out = ['-- ',
-           'va = 1',
-           'basename is on.',
-           "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_delete\",
+        # See that when we can delete a breakpoint.
+        cmds = ['set basename on',
+                'break ' + (__LINE__ + 9).to_s,
+                'delete 1',
+                'continue',
+               ]
+        d = strarray_setup(cmds)
+        d.start(true)
+        ########### b1 ###############
+        va = 1
+        vb = 2
+        vc = 3
+        vd = 4
+        ve = 5
+        ##############################
+        d.stop
+        out = ['line ',
+               'va = 1',
+               'basename is on.',
+               "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_delete\",
 \tline 55 in file foo.rb",
-           "Deleted breakpoint 1."]
-    compare_output(out, d, cmds)
+               "Deleted breakpoint 1."]
+        compare_output(out, d, cmds)
 
-    # See that when we can delete a breakpoint but get to the next one.
-    cmds = ['set basename on',
-            'set autoeval on',
-            'break ' + (__LINE__ + 11).to_s, 
-            'break ' + (__LINE__ + 12).to_s, 
-            'delete 1', 
-            'continue',
-            'va',
-            'continue',
-           ]
-    d = strarray_setup(cmds)
-    d.start
-    ########### b1 ###############
-    va = 1
-    vb = 2
-    va = 3
-    vd = 4
-    ve = 5
-    ##############################
-    d.stop
-    out = ["-- ",
-           "va = 1",
-           "basename is on.",
-           "Evaluation of unrecognized debugger commands is on.",
-           "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_delete\",
+        # See that when we can delete a breakpoint but get to the next one.
+        cmds = ['set basename on',
+                'set autoeval on',
+                'break ' + (__LINE__ + 12).to_s,
+                'break ' + (__LINE__ + 13).to_s,
+                'delete 1',
+                'continue',
+                'va',
+                'continue',
+               ]
+        d = strarray_setup(cmds)
+        d.start(true)
+        ########### b1 ###############
+        va = 1
+        vb = 2
+        va = 3
+        vd = 4
+        ve = 5
+        ##############################
+        d.stop
+        out = ["line ",
+               "va = 1",
+               "basename is on.",
+               "Evaluation of unrecognized debugger commands is on.",
+               "Breakpoint 1 set at VM offset 55 of instruction sequence \"test_delete\",
 \tline 55 in file foo.rb",
-           "Breakpoint 2 set at VM offset 55 of instruction sequence \"test_delete\",
+               "Breakpoint 2 set at VM offset 55 of instruction sequence \"test_delete\",
 \tline 55 in file foo.rb",
-           "Deleted breakpoint 1.",
-           "xx ",
-           "vd = 4",
-           "D=> 3"]
-    compare_output(out, d, cmds)
+               "Deleted breakpoint 1.",
+           "brkpt ",
+               "ve = 5",
+               "D=> 3"]
+        compare_output(out, d, cmds)
 
-  end
-    
-end
+    end
 
+end

data/test/functional/test-eval.rb

@@ -4,112 +4,110 @@ require_relative 'fn_helper'
 
 class TestEval < Test::Unit::TestCase
 
-  include FnTestHelper
+    include FnTestHelper
 
-  def test_eval_questionmark
+    def test_eval_questionmark
 
-    # See that eval? strips 'if'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    if 3 > 5
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'if 3 > 5', 'eval: 3 > 5', 'false']
-    compare_output(out, d, cmds)
-    
-    # See that eval? strips 'if' and 'then'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    if 3 > 5 then
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'if 3 > 5 then', 'eval: 3 > 5', 'false']
-    compare_output(out, d, cmds)
-    
-    # See that eval? strips 'unless'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    unless 3 < 5
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'unless 3 < 5', 'eval: 3 < 5', 'true']
-    compare_output(out, d, cmds)
-    
-    # See that eval? strips 'unless' and 'then
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    unless 3 < 5 then
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'unless 3 < 5 then', 'eval: 3 < 5', 'true']
-    compare_output(out, d, cmds)
-    
-    # See that eval? strips 'while'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    while nil
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'while nil', 'eval: nil', 'nil']
-    compare_output(out, d, cmds)
-    
-    # See that eval? strips 'while' and 'do'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    while nil do
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'while nil do', 'eval: nil', 'nil']
-    compare_output(out, d, cmds)
-    
-    # See that eval? strips 'until' and 'do'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    until true do
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'until true do', 'eval: true', 'true']
-    compare_output(out, d, cmds)
+        # See that eval? strips 'if'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        if 3 > 5
+            assert false
+        end
+        d.stop
+        out = ['line ', 'if 3 > 5', 'eval: 3 > 5', 'false']
+        compare_output(out, d, cmds)
 
-    # See that eval? strips 'until'
-    cmds = %w(eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    until true
-      assert false
-    end
-    d.stop
-    out = ['-- ', 'until true', 'eval: true', 'true']
-    compare_output(out, d, cmds)
+        # See that eval? strips 'if' and 'then'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        if 3 > 5 then
+            assert false
+        end
+        d.stop
+        out = ['line ', 'if 3 > 5 then', 'eval: 3 > 5', 'false']
+        compare_output(out, d, cmds)
 
-    # See that eval? strips 'return'
-    def five
-      return 5
-    end
-    cmds = %w(step step eval? continue)
-    d = strarray_setup(cmds)
-    d.start
-    five
-    d.stop
-    out = ['-- ', 'five',  "METHOD TestEval#five()", 
-           '-> ', 'def five', '-- ', 'return 5', 'eval: 5', '5']
-    compare_output(out, d, cmds)
-  end
-    
-end
+        # See that eval? strips 'unless'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        unless 3 < 5
+            assert false
+        end
+        d.stop
+        out = ['line ', 'unless 3 < 5', 'eval: 3 < 5', 'true']
+        compare_output(out, d, cmds)
+
+        # See that eval? strips 'unless' and 'then
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        unless 3 < 5 then
+            assert false
+        end
+        d.stop
+        out = ['line ', 'unless 3 < 5 then', 'eval: 3 < 5', 'true']
+        compare_output(out, d, cmds)
+
+        # See that eval? strips 'while'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        while nil
+            assert false
+        end
+        d.stop
+        out = ['line ', 'while nil', 'eval: nil', 'nil']
+        compare_output(out, d, cmds)
 
+        # See that eval? strips 'while' and 'do'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        while nil do
+            assert false
+        end
+        d.stop
+        out = ['line ', 'while nil do', 'eval: nil', 'nil']
+        compare_output(out, d, cmds)
 
+        # See that eval? strips 'until' and 'do'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        until true do
+            assert false
+        end
+        d.stop
+        out = ['line ', 'until true do', 'eval: true', 'true']
+        compare_output(out, d, cmds)
+
+        # See that eval? strips 'until'
+        cmds = %w(eval? continue)
+        d = strarray_setup(cmds)
+        d.start(true)
+        until true
+            assert false
+        end
+        d.stop
+        out = ['line ', 'until true', 'eval: true', 'true']
+        compare_output(out, d, cmds)
+
+        # FIXME
+        # # See that eval? strips 'return'
+        # def five
+        #   return 5
+        # end
+        # cmds = %w(step step eval? continue)
+        # d = strarray_setup(cmds)
+        # d.start(true)
+        # five
+        # d.stop
+        # out = ['line ', 'five',  'call', 'return 5', 'return',
+        #        '-> ', 'def five', 'line ', 'return 5', 'eval: 5', '5']
+        # compare_output(out, d, cmds)
+    end
+end

data/test/functional/test-finish.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 
 class TestFinish < Test::Unit::TestCase
@@ -8,37 +7,29 @@ class TestFinish < Test::Unit::TestCase
   include FnTestHelper
 
   def test_finish_between_fn
-    
-    # Finish over functions
-    def fact(x)
-      return 1 if x <= 1
-      x = x * fact(x-1)
-      return x
-    end
-    cmds = %w(step finish) + ['24 == x', 'continue'] 
-    d = strarray_setup(cmds)
-    d.start
-    ##############################
-    x = fact(4)
-    y = 5
-    ##############################
-    d.stop # ({:remove => true})
-    out = ['-- ',
-           'x = fact(4)',
-           'METHOD TestFinish#fact(x)',
-           '-> ',
-           'def fact(x)',
-           '<- ',
-           'R=> 24',
-           'end',
-           'D=> true']
-    compare_output(out, d, cmds)
+      # Finish over functions
+      def fact(x)
+          return 1 if x <= 1
+          x = x * fact(x-1)
+          return x
+      end
+      cmds = %w(step finish) + ['24 == x', 'continue']
+      d = strarray_setup(cmds)
+      d.start(true)
+      ##############################
+      x = fact(4)
+      y = 5
+      ##############################
+      d.stop # ({:remove => true})
+      out = ['line ',
+             'x = fact(4)',
+             'call ',
+             'return 1 if x <= 1',
+             'return ',
+             'R=> 24',
+             'end',
+             'D=> true']
+      compare_output(out, d, cmds)
   end
-  
-end
-
-
-
-
-
 
+end

data/test/functional/test-immediate-step-bug.rb

@@ -1,34 +1,30 @@
 #!/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_same_level
 
-    puts "FIXME test_step_same_level"
-    assert true
-    return
+    skip "FIXME test_step_same_level"
+
     # See that we can step with parameter which is the same as 'step 1'
     cmds = ['next', 'next', 'continue', 'continue']
     d = strarray_setup(cmds)
     d.core.step_events = TEST_STEP_EVENT_MASK
 
     ########### immediate bug1 ###############
-    2.times do 
+    2.times do
       x = 1
       d.debugger(:immediate => true)
       y = 2
     end
     ##############################
     d.stop
-    out = [':o ', 'd.debugger(:immediate => true)', 
-           '-- ', 'y = 2',
-           '-- ', 'x = 1',
+    out = [':o ', 'd.debugger(:immediate => true)',
+           'line ', 'y = 2',
+           'line ', 'x = 1',
            ':o ', 'd.debugger(:immediate => true)']
     compare_output(out, d, cmds)
   end