trepanning 1.93.35 → 2.15.33

data/test/functional/test-remap.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 
 class TestRemap < Test::Unit::TestCase
@@ -8,19 +7,19 @@ class TestRemap < Test::Unit::TestCase
   include FnTestHelper
 
   def test_remap
-    skip "Not sure what this one was supposed to test - Investigate."
+      skip 'needs to be reworked'
     cmds = [
             'step',
             'list',
             ]
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ##############################
     require 'date'
     ##############################
     d.stop
     out = [
-           '-- ',
+           'line ',
            "require 'date'",
            'METHOD TestRemap#require(path)',
            '-> ',
@@ -35,16 +34,16 @@ class TestRemap < Test::Unit::TestCase
            ' 27    	',
            ' 28  ->	  def require(path) # :doc:',
            ' 29    	    gem_original_require path',
-           '-- ',
+           'line ',
            'gem_original_require path',
            '<- ',
            'R=> false',
            'end',
-           '-- ',
+           'line ',
            'd.stop'
           ]
     compare_output(out, d, cmds)
 
   end
-  
+
 end

data/test/functional/test-return.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'trace'
 require_relative 'fn_helper'
 
 class TestRaise < Test::Unit::TestCase
@@ -10,10 +9,12 @@ class TestRaise < Test::Unit::TestCase
   def test_return
 
     cmds = [
+            'set max width 80',
+            'set different off',
             'set events call, return',
-            'step',
+            'step-',
             'info args',
-            'step',
+            'step-',
             'info return',
             'set return 10',
             'set events line',
@@ -21,80 +22,85 @@ class TestRaise < Test::Unit::TestCase
             'pr foo_retval',
             ]
     d = strarray_setup(cmds)
-    d.start
     ##############################
-    x = 1
     def foo(arg)
       5
     end
+    d.start(true)
+    x = 1
     foo_retval = foo('ho')
     z = 3
     ##############################
     d.stop
-    out = ['-- ',
+    out = ['line ',
            'x = 1',
-           'Trace events we may stop on:',
-           "\tbrkpt, call, return",
-           'METHOD TestRaise#foo(arg)',
-           '-> ',
-           'def foo(arg)',
+           'max width is 80.',
+           'different is off.',
+           "Trace events we may stop on:\n----------------------------",
+           '  call    return',
+           'call ',
+           '5',
            "arg = \"ho\"",
-           '<- ',
+           "Values may have change from the initial call values.",
+           'return ',
            'R=> 5',
            'end',
+           'Return class: Fixnum',
            'Return value: 5',
-           'Return value was: 5',
+           'Old value was: 5',
            'New value is: 10',
-           'Trace events we may stop on:',
-           "\tbrkpt, line",
-           '-- ',
+           "Trace events we may stop on:\n----------------------------",
+           '  line',
+           'line ',
            'z = 3',
            '10',
-           '-- ',
-           'd.stop']
+           'line ',
+           'd.stop',
+           "line ",
+           'RubyVM::Frame::get.trace_off = true'
+          ]
     compare_output(out, d, cmds)
 
-    # Try C function
+    # Try a C function
     cmds = [
+            'set max width 80',
             'set different off',
             'set events c_call, c_return',
             'step',
             'info args',
             'step',
-            'info return',
-            'set return "abc"',
             'set events line',
             'step',
             'pr result',
             ]
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ##############################
     a = 1
     result = File.basename('/a/b.c')
     ##############################
-    d.stop # ({:remove => true})
-    out = ["-- ",
+    d.stop
+    out = ["line ",
            "a = 1",
+           'max width is 80.',
            'different is off.',
-           "Trace events we may stop on:",
-           "\tbrkpt, c_call, c_return",
-           "CFUNC File#basename(\"/a/b.c\")", 
-           "C> ",
+           "Trace events we may stop on:\n----------------------------",
+           "  c_call    c_return",
+           "c_call ",
            "result = File.basename('/a/b.c')",
            "1: \"/a/b.c\"",
-           "<C ",
+           "c_return ",
            "R=> \"b.c\"",
            "result = File.basename('/a/b.c')",
-           "Return value: \"b.c\"",
-           "Return value was: \"b.c\"",
-           "New value is: \"abc\"",
-           "Trace events we may stop on:",
-           "\tbrkpt, line",
-           "-- ",
-           "d.stop # ({:remove => true})",
-           '"abc"']
+           "Trace events we may stop on:\n----------------------------",
+           "  line",
+           "line ",
+           'd.stop',
+           "\"b.c\"",
+           "line ",
+           "RubyVM::Frame::get.trace_off = true",
+          ]
     compare_output(out, d, cmds)
   end
-  
+
 end

data/test/functional/test-step.rb

@@ -1,46 +1,44 @@
 #!/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
+  def no_test_step_same_level
+      skip "FIXME"
 
     # See that we can step with parameter which is the same as 'step 1'
     cmds = ['step', 'continue']
     d = strarray_setup(cmds)
-    d.core.step_events = TEST_STEP_EVENT_MASK
 
-    d.start
+    d.start(true)
     ########### t1 ###############
     x = 5
     y = 6
     ##############################
     d.stop
-    out = ['-- ', 'x = 5', '-- ', 'y = 6']
+    out = ['line ', 'x = 5', 'line ', 'y = 6']
     compare_output(out, d, cmds)
 
     # See that we can step with a computed count value
     cmds = ['step 5-3', 'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### t2 ###############
     x = 5
     y = 6
     z = 7
     ##############################
     d.stop # ({:remove => true})
-    out = ['-- ', 'x = 5', '-- ', 'z = 7']
+    out = ['line ', 'x = 5', 'line ', 'z = 7']
     compare_output(out, d, cmds)
-    
+
     # Test step>
     cmds = ['step>', 'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### t3 ###############
     x = 5
     def foo()
@@ -49,13 +47,13 @@ class TestStep < Test::Unit::TestCase
     foo
     ##############################
     d.stop  # {:remove => true})
-    out = ['-- ', 'x = 5', 'METHOD TestStep#foo()', '-> ', 'def foo()']
+    out = ['line ', 'x = 5', 'METHOD TestStep#foo()', 'call ', 'def foo()']
     compare_output(out, d, cmds)
-    
+
     # Test step!
     cmds = ['step!', 'continue']
     d = strarray_setup(cmds)
-    d.start()
+    d.start(true)
     ########### t4 ###############
     x = 5
     begin
@@ -65,16 +63,16 @@ class TestStep < Test::Unit::TestCase
     end
     ##############################
     d.stop # ({:remove => true})
-    out = ['-- ', 'x = 5', 
-           '#<ZeroDivisionError: divided by 0>', 
+    out = ['line ', 'x = 5',
+           '#<ZeroDivisionError: divided by 0>',
            '!! ', 'z = 1/0']
     compare_output(out, d, cmds)
-    
+
     # Test "step" with sets of events. Part 1
     cmds = ['set events call raise',
             'step', 's!']
     d = strarray_setup(cmds)
-    d.start()
+    d.start(true)
     ########### t5 ###############
     x = 5
     def foo1
@@ -86,12 +84,12 @@ class TestStep < Test::Unit::TestCase
     z = 1
     ##############################
     d.stop # ({:remove => true})
-    out = ['-- ',
+    out = ['line ',
            'x = 5',
            'Trace events we may stop on:',
            "\tbrkpt, call, raise",
            'METHOD TestStep#foo1()',
-           '-> ',
+           'call ',
            'def foo1',
            '#<Exception: Exception>',
            '!! ',
@@ -100,12 +98,12 @@ class TestStep < Test::Unit::TestCase
     got = filter_line_cmd(d.intf[-1].output.output)
     out.pop if got.size+1 == out.size
     compare_output(out, d, cmds)
-    
+
     # Test "step" will sets of events. Part 2
     cmds = ['step> 1+0',
             'step! 1', 'continue']
     d = strarray_setup(cmds)
-    d.start()
+    d.start(true)
     ########### t6 ###############
     x = 5
     begin
@@ -119,38 +117,39 @@ class TestStep < Test::Unit::TestCase
     z = 1
     ##############################
     d.stop({:remove => true})
-    out = ['-- ',
+    out = ['line ',
            'x = 5',
            'METHOD TestStep#foo2()',
-           '-> ',
+           'call ',
            'def foo2()',
            'TestStep',
            '!! ',
            'raise Exception']
-    
+
   end
 
   def test_step_between_fn
+      skip("FIXME")
 
     # Step into and out of a function
     def sqr(x)
       y = x * x
     end
     cmds = %w(step) * 4 + %w(continue)
-    out =  ['-- ',
+    out =  ['line ',
             'x = sqr(4)',
             'METHOD TestStep#sqr(x)',
-            '-> ',
+            'call ',
             'def sqr(x)',
-            '-- ',
+            'line ',
             'y = x * x',
-            '<- ',
+            'return ',
             'R=> 16',
             'end',
-            '-- ',
+            'line ',
             'y = 5']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### t7 ###############
     x = sqr(4)
     y = 5
@@ -160,18 +159,18 @@ class TestStep < Test::Unit::TestCase
 
     cmds = ['set events call return',
             'step', 'step', 'continue']
-    out =  ['-- ',
+    out =  ['line ',
             'x = sqr(4)',
             'Trace events we may stop on:',
             "\tbrkpt, call, return",
             'METHOD TestStep#sqr(x)',
-            '-> ',
+            'call ',
             'def sqr(x)',
-            '<- ',
+            'return ',
             'R=> 16',
             'end']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### t8 ###############
     x = sqr(4)
     y = 5
@@ -181,6 +180,7 @@ class TestStep < Test::Unit::TestCase
   end
 
   def test_step_in_exception
+      skip "FIXME"
     def boom(x)
       y = 0/x
     end
@@ -190,17 +190,17 @@ class TestStep < Test::Unit::TestCase
     end
     cmds = %w(step! continue)
     d = strarray_setup(cmds)
-    begin 
-      d.start()
+    begin
+      d.start(true)
       x = bad(0)
       assert_equal(false, true, 'should have raised an exception')
     rescue ZeroDivisionError
       assert true, 'Got the exception'
     ensure
-      d.stop({:remove => true})
+      d.stop
     end
-    
-    out = ['-- ', 
+
+    out = ['line ',
            'x = bad(0)', # line event
            '#<ZeroDivisionError: divided by 0>',
            '!! ',        # exception event
@@ -210,39 +210,41 @@ class TestStep < Test::Unit::TestCase
   end
 
   def test_step_event
+      skip "FIXME"
 
     def fact(x)
       return 1 if x <= 1
       x = x * fact(x-1)
       return x
     end
-    cmds = ['step<', '1 == x', 'continue'] 
+    cmds = ['step<', '1 == x', 'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### t9 ###############
     x = fact(4)
     y = 5
     ##############################
     d.stop # ({:remove => true})
-    out = ['-- ', 
-           'x = fact(4)', 
-           '<- ', 
-           'R=> 1', 
-           'return 1 if x <= 1', 
+    out = ['line ',
+           'x = fact(4)',
+           'return ',
+           'R=> 1',
+           'return 1 if x <= 1',
            'D=> true']
     compare_output(out, d, cmds)
   end
 
   def test_step_into_fun
+      skip "FIXME"
 
     # Bug was that we were stopping at a VM instruction before the fn
     # call proper ('bar' below), and not getting a line number for it.
     # So a subsequent 'step' when 'set different' in effect was to stay
     # at the same place at the function call.
     cmds = ['set different', 'set events call, class, line, return',
-            'step', 'step', 'step', 'step', 'continue'] 
+            'step', 'step', 'step', 'step', 'continue']
     d = strarray_setup(cmds)
-    d.start
+    d.start(true)
     ########### t10 ###############
     def bar
       return 1
@@ -255,19 +257,19 @@ class TestStep < Test::Unit::TestCase
     foo
     ##############################
     d.stop # ({:remove => true})
-    out = ['-- ',
+    out = ['line ',
            'def bar',
            'different is on.',
            'Trace events we may stop on:',
            "\tbrkpt, call, class, line, return",
-           '-- ',
+           'line ',
            'def foo',
-           '-- ',
+           'line ',
            'foo',
            'METHOD TestStep#foo()',
-           '-> ',
+           'call ',
            'def foo',
-           '-- ',
+           'line ',
            'bar']
     compare_output(out, d, cmds)
   end