ruby-debug 0.10.4 → 0.10.5.rc1

data/test/data/output.right

@@ -4,12 +4,12 @@
 No breakpoints.
 
 stack
---> #0 at line output.rb:1
+--> #0 at line example/output.rb:1
 
 variables
 self = main
 
-source output.rb:1
+source example/output.rb:1
 puts "one"
 # # ********************************************************
 # # This tests the "starting" annotation
@@ -19,12 +19,12 @@ puts "one"
 one
 stopped
 stack
---> #0 at line output.rb:2
+--> #0 at line example/output.rb:2
 
 variables
 self = main
 
-source output.rb:2
+source example/output.rb:2
 puts "two"
 # step
 starting

data/test/data/post-mortem-osx.right

@@ -23,9 +23,10 @@ Exception: #<ZeroDivisionError: divided by 0>
 Type 'help <command-name>' for help on a specific command
 
 Available commands:
-backtrace  delete   edit    frame  list    ps      restart  source  undisplay
-break      disable  enable  help   method  putl    save     thread  up       
-catch      display  eval    info   p       quit    set      tmate   var      
-condition  down     exit    irb    pp      reload  show     trace   where    
+backtrace  delete   enable  info    p     reload   source     up   
+break      disable  eval    irb     pp    restart  thread     var  
+catch      display  exit    kill    ps    save     tmate      where
+condition  down     frame   list    putl  set      trace    
+continue   edit     help    method  quit  show     undisplay
 
 # quit

data/test/data/quit.right

@@ -0,0 +1,9 @@
+gcd.rb:4
+def gcd(a, b)
+# # ***************************************************
+# # This tests the quit.
+# # ***************************************************
+# set debuggertesting on
+Currently testing the debugger is on.
+# # FIXME need to test --no-quit.
+# quit

data/test/data/raise-jruby.right

@@ -0,0 +1,26 @@
+raise.rb:3
+raise "abc"
+# # ********************************************************
+# # This tests that the debugger doesn't step into itself
+# # when the application doesn't terminate the right way.
+# # ********************************************************
+# set debuggertesting on
+Currently testing the debugger is on.
+# catch x
+NameError Exception: undefined local variable or method `x' for main:Object
+# catch ZeroDivisionError
+Catch exception ZeroDivisionError.
+# info catch
+ZeroDivisionError
+# catch 5
+Warning 5 is not known to be a Class
+Catch exception 5.
+# step
+	./example/raise.rb:3:in `(root)'
+	org/jruby/debug/RubyDebugger.java:204:in `debug_load'
+	./example/raise.rb:61:in `debug_program'
+	./tdebug.rb:251:in `(root)'
+	org/jruby/RubyKernel.java:1063:in `load'
+	./tdebug.rb:23:in `runner'
+	../rdbg.rb:32:in `(root)'
+Uncaught exception: abc

data/test/data/raise.right

@@ -16,7 +16,7 @@ ZeroDivisionError
 Warning 5 is not known to be a Class
 Catch exception 5.
 # step
-	./raise.rb:3
+	./example/raise.rb:3
 	./tdebug.rb:61:in `debug_load'
 	./tdebug.rb:61:in `debug_program'
 	./tdebug.rb:251

data/test/data/save.cmd

@@ -16,6 +16,7 @@ save temp
 eval File.open("temp").readlines
 # Should read in nothing
 source temp
+set basename off
 info break
 # Now try saving something interesting
 break 10

data/test/data/save.right

@@ -30,6 +30,8 @@ basename is off.
 Currently testing the debugger is on.
 autolist is off.
 autoirb is off.
+# set basename off
+basename is off.
 # info break
 No breakpoints.
 # # Now try saving something interesting
@@ -40,7 +42,7 @@ Catch exception RuntimeError.
 # save temp
 Saved to 'temp'
 # eval File.open("temp").readlines
-["break gcd.rb:10\n", "catch RuntimeError\n", "set autoeval off\n", "set basename on\n", "set debuggertesting on\n", "set autolist off\n", "set autoirb off\n"]
+["break gcd.rb:10\n", "catch RuntimeError\n", "set autoeval off\n", "set basename off\n", "set debuggertesting on\n", "set autolist off\n", "set autoirb off\n"]
 # # FIXME: The below is broken
 # ## Change parameters above
 # ## catch RuntimeError off
@@ -50,7 +52,7 @@ Saved to 'temp'
 Breakpoint 2 file gcd.rb, line 10
 Catch exception RuntimeError.
 autoeval is off.
-basename is on.
+basename is off.
 Currently testing the debugger is on.
 autolist is off.
 autoirb is off.

data/test/data/stepping.cmd

@@ -6,9 +6,9 @@ set callstyle last
 next
 where
 step a
-set forcestep on
+set different on
 step- ; step-
-set forcestep off
+set diff off
 where
 n 2
 step+

data/test/data/stepping.right

@@ -14,13 +14,13 @@ gcd(3,5)
 --> #0 at line gcd.rb:18
 # step a
 Step argument 'a' needs to be a number.
-# set forcestep on
-force-stepping is on.
+# set different on
+different-line stepping is on.
 # step- ; step-
 gcd.rb:6
 if a > b
-# set forcestep off
-force-stepping is off.
+# set diff off
+different-line stepping is off.
 # where
 --> #0 Object.gcd(a#Fixnum, b#Fixnum) at line gcd.rb:6
     #1 at line gcd.rb:18

data/test/data/test-init.right

@@ -1,5 +1,5 @@
 gcd-dbg.rb:18
 if a > b
-(rdb:1) "./gcd-dbg.rb"
+(rdb:1) "./example/gcd-dbg.rb"
 (rdb:1) Argument list to give program being debugged when it is started is "5".
-(rdb:1) 
+(rdb:1) 

data/test/data/trace-jruby.right

@@ -0,0 +1,14 @@
+Tracing(1):gcd.rb:4 def gcd(a, b)
+Tracing(1):gcd.rb:18 gcd(3,5)
+Tracing(1):gcd.rb:6 if a > b
+Tracing(1):gcd.rb:10 return nil if a <= 0
+Tracing(1):gcd.rb:12 if a == 1 or b-a == 0
+Tracing(1):gcd.rb:15 return gcd(b-a, a)
+Tracing(1):gcd.rb:6 if a > b
+Tracing(1):gcd.rb:10 return nil if a <= 0
+Tracing(1):gcd.rb:12 if a == 1 or b-a == 0
+Tracing(1):gcd.rb:15 return gcd(b-a, a)
+Tracing(1):gcd.rb:6 if a > b
+Tracing(1):gcd.rb:10 return nil if a <= 0
+Tracing(1):gcd.rb:12 if a == 1 or b-a == 0
+Tracing(1):gcd.rb:13 return a

data/test/example/a/example.rb

@@ -0,0 +1 @@
+puts "a"

data/test/example/at-exit.rb

@@ -0,0 +1,3 @@
+at_exit do
+  puts "Hello world!"
+end

data/test/example/b/example.rb

@@ -0,0 +1 @@
+puts "b"

data/test/example/breakpoints-basename.rb

@@ -0,0 +1,2 @@
+require File.expand_path("../a/example.rb", __FILE__)
+require File.expand_path("../b/example.rb", __FILE__)

data/test/{dollar-0.rb → example/dollar-0.rb}

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # A test to see that rdebug set's $0 properly.
 puts $0
+puts $PROGRAM_NAME
 puts __FILE__
 

data/test/helper.rb

@@ -1,50 +1,62 @@
 # Some common routines used in testing.
 
+require 'rubygems'
+require 'test/unit'
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../cli", __FILE__)
+require 'ruby-debug'
+
 require 'fileutils'
 require 'yaml'
-# require 'diff/lcs'
-# require 'diff/lcs/hunk'
 
 # begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 module TestHelper
+  def run_debugger(testname, args = '', opts = {})
+    Dir.chdir(File.dirname(__FILE__)) do
+      rightfile = opts[:rightfile] || rightfile(testname)
+      outfile   = opts[:outfile]   || "#{testname}.out"
+      debug_pgm = opts[:runner]    || 'tdebug.rb'
+      filter    = opts[:filter]
 
-  # FIXME: turn args into a hash.
-  def run_debugger(testname, args='', outfile=nil, filter=nil, old_code=false,
-                   debug_pgm='tdebug.rb')
-    rightfile = File.join('data', "#{testname}.right")
-    
-    outfile = "#{testname}.out" unless outfile
+      if File.exists?(outfile)
+        FileUtils.rm(outfile)
+      end
 
-    if File.exists?(outfile)
-      FileUtils.rm(outfile)
-    end
-    
-    ENV['RDEBUG'] = debug_pgm
-    ENV['TERM']   = ''
+      ENV['RDEBUG'] = debug_pgm
+      ENV['TERM']   = ''
 
-    # The EMACS environment variable(s) cause output to 
-    # get prefaced with null which will mess up file compares.
-    # So turn off EMACS output processing.
-    ENV['EMACS'] = ENV['INSIDE_EMACS'] = nil
+      # The EMACS environment variable(s) cause output to 
+      # get prefaced with null which will mess up file compares.
+      # So turn off EMACS output processing.
+      ENV['EMACS'] = ENV['INSIDE_EMACS'] = nil
 
-    if old_code
-      cmd = "/bin/sh #{File.join('..', 'runner.sh')} #{args} >#{outfile}"
-    else
-      cmd = "#{"#{load_ruby} #{load_params} "}../rdbg.rb #{args} > #{outfile}"
+      cmd = "#{load_ruby} #{load_params} ../rdbg.rb #{args} > #{outfile}"
+      puts "'#{cmd}'" if $DEBUG
+      `#{cmd}`
+
+      got_lines     = File.read(outfile).split(/\n/)
+      correct_lines = File.read(rightfile).split(/\n/)
+      filter.call(got_lines, correct_lines) if filter
+
+      if cheap_diff(got_lines, correct_lines)
+        FileUtils.rm(outfile)
+        return true
+      end
+
+      false
     end
-    puts "'#{cmd}'" if $DEBUG
-    output = `#{cmd}`
-    
-    got_lines     = File.read(outfile).split(/\n/)
-    correct_lines = File.read(rightfile).split(/\n/)
-    filter.call(got_lines, correct_lines) if filter
-    if cheap_diff(got_lines, correct_lines)
-      FileUtils.rm(outfile)
-      return true
+  end
+
+  def rightfile(testname)
+    jruby_file = File.join('data', "#{testname}-jruby.right")
+    if defined?(JRUBY_VERSION) && File.exists?(jruby_file)
+      jruby_file
+    else
+      File.join('data', "#{testname}.right")
     end
-    return false
   end
 
   def cheap_diff(got_lines, correct_lines)
@@ -77,7 +89,7 @@ module TestHelper
   # this kind of test.
   def add_test(base_name, src_dir, script_name=nil, cmd=nil, test_name=nil)
     puts "+++ Adding #{base_name} ++++" if $DEBUG
-    test_name   = base_name unless test_name
+    test_name   = File.join('.', 'example', base_name) unless test_name
     script_name = File.join('data', test_name + '.cmd') unless script_name
     cmd         = 'gcd.rb 3 5' unless cmd
     eval <<-EOF
@@ -128,7 +140,13 @@ module TestHelper
   # Loads key from the _config_._yaml_ file.
   def config_load(key, may_be_nil=false, default_value='')
     conf = File.join('config.private.yaml') # try private first
-    conf = File.join('config.yaml') unless File.exists?(conf)
+    unless File.exists?(conf)
+      if defined?(JRUBY_VERSION)
+        conf = File.join('config.jruby.yaml')
+      else
+        conf = File.join('config.yaml')
+      end
+    end
     value = YAML.load_file(conf)[key]
     assert_not_nil(value, "#{key} is set in config.yaml") unless may_be_nil
     value || default_value

data/test/rdebug-save.1

@@ -1,5 +1,5 @@
-break gcd.rb:10
-break gcd.rb:12 if a > b
+break example/gcd.rb:10
+break example/gcd.rb:12 if a > b
 set autoeval on
 set basename off
 set debuggertesting off

data/test/test-annotate.rb

@@ -1,25 +1,13 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'fileutils'
-
-# begin require 'rubygems' rescue LoadError end
-# require 'ruby-debug'; Debugger.start
+require File.expand_path("../helper", __FILE__)
 
 # Test annotate handling.
 class TestAnnotate < Test::Unit::TestCase
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
-    testname='annotate'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    testname = 'annotate'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-at-exit.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require File.expand_path("../helper", __FILE__)
+
+# Test that it's possible to stop at breakpoints in an at_exit block.
+class TestAtExit < Test::Unit::TestCase
+  include TestHelper
+
+  def test_basic
+    testname = 'at-exit'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/at-exit.rb"))
+  end
+end

data/test/test-break-bad.rb

@@ -1,36 +1,25 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-
-# begin require 'rubygems' rescue LoadError end
-# require 'ruby-debug'; Debugger.start
+require File.expand_path("../helper", __FILE__)
 
 # Test (mostly) invalid breakpoint commands
 class TestBadBreak < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
-    testname='break_bad'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    testname = 'break_bad'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
-  
+
+  def test_tracelines
+    testname = 'break_tracelines'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
+  end unless defined?(JRUBY_VERSION) # JRuby doesn't yet support tracelines
+
   def test_break_loop
-    testname='break_loop_bug'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-        run_debugger(testname,
-          "--script #{script} -- bp_loop_issue.rb"))
-    end
+    testname = 'break_loop_bug'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/bp_loop_issue.rb"))
   end
-
 end