rbx-trepanning 0.0.2-universal-rubinius-1.2 → 0.0.3-universal-rubinius-1.2

data/processor/command/up.rb

@@ -1,17 +1,16 @@
 # Copyright (C) 2010 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rubygems'; require 'require_relative'
-require '/home/rocky-rvm/.rvm/src/rbx-trepanning/processor/command/base/cmd'
 require_relative 'base/cmd'
 
 # up command. Like 'down' butthe direction (set by DIRECTION) is different.
 #
-# NOTE: The down command  subclasses this, so beware when changing! 
+# NOTE: The down command  subclasses this, so beware when changing!
 class Trepan::Command::UpCommand < Trepan::Command
 
   # Silence already initialized constant .. warnings
-  old_verbose = $VERBOSE  
+  old_verbose = $VERBOSE
   $VERBOSE    = nil
-  HELP        = 
+  HELP        =
 "u(p) [count]
 
 Move the current frame up in the stack trace (to an older frame). 0 is
@@ -26,14 +25,14 @@ See also 'down' and 'frame'.
   NAME          = File.basename(__FILE__, '.rb')
   NEED_STACK    = true
   SHORT_HELP    = 'Move frame in the direction of the caller of the last-selected frame'
-  $VERBOSE      = old_verbose 
+  $VERBOSE      = old_verbose
 
   def initialize(proc)
     super
     @direction = +1 # -1 for down.
   end
 
-  # Run 'up' command. 
+  # Run 'up' command.
   def run(args)
 
     # FIXME: move into @proc and test based on NEED_STACK.
@@ -49,7 +48,7 @@ See also 'down' and 'frame'.
       count_str = args[1]
       name_or_id = args[1]
       opts = {
-        :msg_on_error => 
+        :msg_on_error =>
         "The '#{NAME}' command argument must eval to an integer. Got: %s" % count_str,
         :min_value => -@proc.stack_size,
         :max_value => @proc.stack_size-1
@@ -68,19 +67,19 @@ if __FILE__ == $0
 
   # def sep ; puts '=' * 40 end
   # cmd.run [cmd.name]
-  # %w(-1 0 1 -2).each do |count| 
+  # %w(-1 0 1 -2).each do |count|
   #   puts "#{cmd.name} #{count}"
   #   cmd.run([cmd.name, count])
-  #   sep 
+  #   sep
   # end
   # def foo(cmd, cmd.name)
   #   puts "#{cmd.name}"
   #   cmd.run([cmd.name])
   #   sep
-  #   %w(-2 -1).each do |count| 
+  #   %w(-2 -1).each do |count|
   #     puts "#{cmd.name} #{count}"
   #     cmd.run([cmd.name, count])
-  #     sep 
+  #     sep
   #   end
   # end
   # foo(cmd, cmd.name)

data/processor/main.rb

@@ -257,7 +257,7 @@ class Trepan
           end
           if @return_to_program
             after_cmdloop
-            if @step_count >= 0 
+            if @step_count >= 0 && 'finish' != @return_to_program
               @step_bp = step_over_by(1)
               run_command('disassemble') if settings[:debugstep]
               dbgr.listen('step' == @return_to_program)

data/processor/running.rb

@@ -34,14 +34,14 @@ class Trepan
     # # execution.
     # # FIXME: turn line_number into a condition.
 
-    def continue(how_to_continue)
+    def continue(return_to_program)
       @next_thread     = nil
       @step_count      = -1    # No more event stepping
-      if 'step-finish' == how_to_continue
+      if 'step-finish' == return_to_program
         step_to_return_or_yield
-        how_to_continue = 'step'
+        return_to_program = 'step'
       end
-      @return_to_program = how_to_continue
+      @return_to_program = return_to_program
     end
 
     # Does whatever setup needs to be done to set to ignore stepping
@@ -52,6 +52,8 @@ class Trepan
       continue('finish')
       @next_thread       = @current_thread
 
+      @step_count = 2 if 'nostack' == opts[:different_pos]
+
       # # Try high-speed (run-time-assisted) method
       # @frame.trace_off   = true  # No more tracing in this frame
       # @frame.return_stop = true  # don't need to 
@@ -72,8 +74,8 @@ class Trepan
 
     # Does whatever needs to be done to set to step program
     # execution.
-    def step(how_to_continue, step_count=1, opts={}, condition=nil)
-      continue(how_to_continue)
+    def step(return_to_program, step_count=1, opts={}, condition=nil)
+      continue(return_to_program)
       @step_count = step_count
       @different_pos   = opts[:different_pos] if 
         opts.keys.member?(:different_pos)
@@ -167,7 +169,7 @@ class Trepan
       end
 
       # Only skip on these kinds of events
-      unless %w(step-call line).include?(@event)
+      unless %w(step-call line return).include?(@event)
         msg "skip non-line: #{@event} #{debug_loc}" if @settings[:debugskip]
         return false
       end
@@ -187,6 +189,7 @@ class Trepan
         msg("last: #{@last_pos.inspect}, ")
         msg("new:  #{new_pos.inspect}")
         msg("skip: #{should_skip.inspect}, event: #{@event}")
+        msg("@step_count: #{@step_count}")
       end
 
       @last_pos[2] = new_pos[2] if 'nostack' == @different_pos
@@ -222,7 +225,8 @@ class Trepan
         # @stop_events   = nil
       end
 
-      @return_to_program = 'step' if should_skip && !@return_to_program
+      @return_to_program = 'step' if should_skip && 
+        (!@return_to_program || 'finish' == @return_to_program)
       return should_skip
     end
 

data/processor/stepping.rb

@@ -13,7 +13,11 @@ class Trepan
       
       meth = f.method
       possible_line = f.line + step
+      next_ip = f.next_ip == f.ip ? f.next_ip + 1 : f.next_ip
+      # BUGGY: remove after writing a decent test case for this.
+      # See beginning of rbx-require/require_relative.
       fin_ip = meth.first_ip_on_line_after(possible_line, f.next_ip)
+      # fin_ip = meth.first_ip_on_line_after(possible_line, next_ip)
       
       if fin_ip <= -1
         return step_to_parent('line')

data/test/integration/helper.rb

@@ -35,10 +35,10 @@ def run_debugger(testname, ruby_file, opts={})
 
   cmd = 
     if opts[:xdebug]
-    "%s -Xdebug '%s' %s >%s <%s" %
+    "%s -Xdebug '%s' %s >%s 2>&1 <%s" %
         [Trepanning::ruby_path, programfile, opts[:args], outfile, cmdfile]
     else
-      "%s %s --nx --command %s %s '%s' %s >%s" %
+      "%s %s --nx --command %s %s '%s' %s >%s 2>&1" %
         [Trepanning::ruby_path, dbgr_path, cmdfile, opts[:dbgr], 
          programfile, opts[:args], outfile]
     end

data/test/integration/test-quit.rb

@@ -11,15 +11,22 @@ class TestQuit < Test::Unit::TestCase
   end
 
   def test_xcode_call
-    no_error = run_debugger('quit-Xdebug', 'null.rb',
-                            {:xdebug => true,
-                              :short_cmd => @@NAME,
-                              :do_diff => false
-                            })
-    assert_equal(true, no_error)
-    if no_error
-      outfile = File.join(File.dirname(__FILE__), 'quit-Xdebug.out')
-      FileUtils.rm(outfile)
+    startup_file = File.join(ENV['HOME'], '.rbxrc')
+    lines = File.open(startup_file).readlines.grep(/Trepan\.start/)
+    if lines && lines.any?{|line| line.grep(/:Xdebug/)}
+      no_error = run_debugger('quit-Xdebug', 'null.rb',
+                              {:xdebug => true,
+                                :short_cmd => @@NAME,
+                                :do_diff => false
+                              })
+      assert_equal(true, no_error)
+      if no_error
+        outfile = File.join(File.dirname(__FILE__), 'quit-Xdebug.out')
+        FileUtils.rm(outfile)
+      end
+    else
+      puts "Trepan.start(:skip_loader=>:Xdebug) is not in ~.rbxrc. Skipping."
+      assert true
     end
   end
 end

data/test/unit/cmd-helper.rb

@@ -1,3 +1,4 @@
+require 'test/unit'
 require 'rubygems'; require 'require_relative'
 # require_relative '../../app/core'
 require_relative '../../processor/mock'

data/test/unit/mock-helper.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+require_relative '../../processor/mock'
+
+module MockUnitHelper
+  def common_setup(name)
+    @dbg, @cmd = MockDebugger::setup(name, false)
+  end
+end
+

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require 'rubygems'; require 'require_relative'
 require_relative 'cmd-helper'
 require_relative '../../processor/command/alias'

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require 'rubygems'; require 'require_relative'
 require_relative 'cmd-helper'
 

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

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 require 'rubygems'; require 'require_relative'
-require_relative '../../processor/mock'
+require_relative './mock-helper'
 require_relative '../../processor/command/exit'
 
 class TestCommandExit < Test::Unit::TestCase
-
+  include MockUnitHelper
   def setup
     @name      = File.basename(__FILE__, '.rb').split(/-/)[2]
-    @dbg, @cmd = MockDebugger::setup(@name, false)
+    common_setup(@name)
   end
 
   def test_basic

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+require 'rubygems'; require 'require_relative'
+require_relative 'cmd-helper'
+
+class TestCommandFinish < Test::Unit::TestCase
+
+  include UnitHelper
+  def setup
+    common_setup
+    @cmdproc.frame_setup
+    @name   = File.basename(__FILE__, '.rb').split(/-/)[2]
+    @my_cmd = @cmds[@name]
+  end
+  
+  def test_basic
+    [
+     [%W(#{@name}), 'finish', -1],
+     [%W(#{@name} 2-1), 'finish', -1],
+    ].each do |c, rtp, count|
+      @cmdproc.instance_variable_set('@return_to_program', false)
+      @my_cmd.run(c)
+      assert_equal(rtp, @cmdproc.instance_variable_get('@return_to_program'))
+      assert_equal(count, @cmdproc.instance_variable_get('@step_count'))
+    end
+  end
+
+end

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require 'rubygems'; require 'require_relative'
 require_relative 'cmd-helper'
 require_relative '../../processor/command/help'

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

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require 'rubygems'; require 'require_relative'
-require_relative '../../processor/mock'
+require_relative './mock-helper'
 require_relative '../../processor/command/kill'
 
 class TestCommandKill < Test::Unit::TestCase
-
+  include MockUnitHelper
   def setup
-    @name      = File.basename(__FILE__, '.rb').split(/-/)[2]
-    @dbg, @cmd = MockDebugger::setup(@name, false)
+    @name = File.basename(__FILE__, '.rb').split(/-/)[2]
+    common_setup(@name)
     def @cmd.msg(message)
       @msgs << message
     end

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

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'rubygems'; require 'require_relative'
+require_relative 'cmd-helper'
+
+class TestCommandStep < Test::Unit::TestCase
+
+  include UnitHelper
+  def setup
+    common_setup
+    @cmdproc.frame_setup
+    @name   = File.basename(__FILE__, '.rb').split(/-/)[2]
+    @my_cmd = @cmds[@name]
+  end
+  
+  def test_basic
+    [
+     [%W(#{@name}), 'step', 1],
+     [%W(#{@name} 2), 'step', 2],
+     [%W(#{@name} into 1+2),  'step', 3],
+     [%W(#{@name} over), 'next', 1]
+    ].each do |c, rtp, count|
+      @cmdproc.instance_variable_set('@return_to_program', false)
+      @my_cmd.run(c)
+      assert_equal(rtp, @cmdproc.instance_variable_get('@return_to_program'))
+      assert_equal(count, @cmdproc.instance_variable_get('@step_count'))
+    end
+  end
+
+end

data/test/unit/test-proc-eval.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require 'rubygems'; require 'require_relative'
 require_relative 'cmd-helper'
 require_relative '../../processor/main' # Have to include before frame!

data/test/unit/test-proc-location.rb

@@ -25,7 +25,12 @@ class TestCmdProcessorLocation < Test::Unit::TestCase
   def test_line_at
     @proc.settings[:directory] = ''
     assert_equal(nil, @proc.resolve_file_with_dir(@file))
-    assert_equal(nil, @proc.line_at(@file, __LINE__))
+    if File.expand_path(Dir.pwd) == File.expand_path(File.dirname(__FILE__))
+      line = @proc.line_at(@file, __LINE__)
+      assert_match(/line = @proc.line_at/, line)
+    else
+      assert_equal(nil, @proc.line_at(@file, __LINE__))
+    end
     dir = @proc.settings[:directory] = File.dirname(__FILE__)
     assert_equal(File.join(dir, @file), 
                  @proc.resolve_file_with_dir('test-proc-location.rb'))

data/test/unit/test-proc-main.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'test/unit'
 require 'rubygems'; require 'require_relative'
 require_relative 'cmd-helper'
 require_relative '../../processor/main'