ruby-debug 0.10.4 → 0.10.5.rc1

data/test/test-breakpoints.rb

@@ -1,25 +1,24 @@
 #!/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 breakpoint commands
 class TestBreakpoints < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='breakpoints'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
+  end
+
+  def test_breakpoint_in_files_with_same_basename
+    filter = proc do |got_lines, correct_lines|
+      got_lines.each {|s| s.gsub!(/[^\s]*\/example\/(a|b)\/example.rb/, 'example/\1/example.rb') }
     end
+
+    testname='breakpoints-basename'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/#{testname}.rb",
+                        :filter => filter))
   end
 end

data/test/test-brkpt-class-bug.rb

@@ -1,26 +1,13 @@
 #!/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 TestBrkptClassBug < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='brkpt-class-bug'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- brkpt-class-bug.rb"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/brkpt-class-bug.rb"))
   end
-  
 end

data/test/test-catch.rb

@@ -1,25 +1,13 @@
 #!/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 condition command
 class TestCatch < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='catch'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- pm.rb"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/pm.rb"))
   end
 end

data/test/test-condition.rb

@@ -1,25 +1,13 @@
 #!/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 condition command
 class TestCondition < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='condition'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-display.rb

@@ -1,26 +1,14 @@
 #!/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 Display commands
 class TestDisplay < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   # Test commands in display.rb
   def test_basic
     testname='display'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname, 
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-dollar-0.rb

@@ -1,45 +1,33 @@
 #!/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 --no-stop and $0 setting.
 class TestDollar0 < Test::Unit::TestCase
-  
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
-    testname='breakpoints'
-    Dir.chdir(@@SRC_DIR) do 
-      home_save = ENV['HOME']
-      ENV['HOME'] = '.'
-      filter = Proc.new{|got_lines, correct_lines|
-        [got_lines, correct_lines].flatten.each do |s|
-          s.gsub!(/.*dollar-0.rb$/, 'dollar-0.rb')
-        end
-      }
+    home_save = ENV['HOME']
+    ENV['HOME'] = '.'
+    filter = Proc.new{|got_lines, correct_lines|
+      [got_lines, correct_lines].flatten.each do |s|
+        s.gsub!(/.*dollar-0.rb$/, 'dollar-0.rb')
+      end
+    }
+
+    assert(run_debugger('dollar-0', '-nx --no-stop ./example/dollar-0.rb',
+                        :filter => filter,
+                        :runner => '../bin/rdebug'))
 
-      assert_equal(true, 
-                   run_debugger('dollar-0', 
-                                '-nx --no-stop ./dollar-0.rb',
-                                nil, filter, false, '../bin/rdebug'))
-      # Ruby's __FILE__ seems to prepend ./ when no directory was added.
-      assert_equal(true, 
-                   run_debugger('dollar-0a', 
-                                '-nx --no-stop dollar-0.rb',
-                                nil, filter, false, '../bin/rdebug'))
-      # Ruby's __FILE__ seems to prepend ./ when no directory was added.
-      assert_equal(true, 
-                   run_debugger('dollar-0b', 
-                                '-nx --no-stop ' + 
-                                File.join('..', 'test', 'dollar-0.rb'),
-                                nil, filter, false, '../bin/rdebug'))
-      ENV['HOME'] = home_save
-    end
+    # Ruby's __FILE__ seems to prepend ./ when no directory was added.
+    assert(run_debugger('dollar-0a', '-nx --no-stop ./example/dollar-0.rb',
+                        :filter => filter,
+                        :runner => '../bin/rdebug'))
+    
+    # Ruby's __FILE__ seems to prepend ./ when no directory was added.
+    assert(run_debugger('dollar-0b', '-nx --no-stop ' + File.join(%w(example dollar-0.rb)),
+                        :filter => filter,
+                        :runner => '../bin/rdebug'))
+  ensure
+    ENV['HOME'] = home_save
   end
 end

data/test/test-edit.rb

@@ -1,26 +1,14 @@
 #!/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 'edit' command handling.
 class TestEdit < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='edit'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      ENV['EDITOR']='echo FAKE-EDITOR '
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    script = File.join('data', testname + '.cmd')
+    ENV['EDITOR']='echo FAKE-EDITOR '
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-emacs-basic.rb

@@ -1,26 +1,13 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.start(:post_mortem => true)
+require File.expand_path("../helper", __FILE__)
 
 # Test the --emacs-basic option.
 class TestEmacsBasic < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-  defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper.rb')
-  
   include TestHelper
-  
+
   def test_basic
     testname='emacs_basic'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--emacs-basic --script #{script} -- gcd.rb 3 5"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--emacs-basic --script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-enable.rb

@@ -1,25 +1,13 @@
 #!/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 enable and disable commands
 class TestEnable < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='enable'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-except-bug1.rb

@@ -1,31 +1,16 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'rbconfig'
-
-# begin require 'rubygems' rescue LoadError end
-# require 'ruby-debug'; Debugger.start
+require File.expand_path("../helper", __FILE__)
 
 # Bug in Post-mortem command was not being able to show
 # variables on stack when stack stopped in a FIXNUM from 1/0.
 class TestExceptBug1 < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   # Test post-mortem handling
   def test_pm_except_bug
-    Dir.chdir(@@SRC_DIR) do 
-      ENV['COLUMNS'] = '80'
-      testname='except-bug1'
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} --post-mortem " + 
-                                "#{testname}.rb"))
-    end
+    ENV['COLUMNS'] = '80'
+    testname='except-bug1'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} --post-mortem ./example/#{testname}.rb"))
   end
-
-end
+end unless defined?(JRUBY_VERSION) # post-mortem not yet supported on JRuby

data/test/test-file-with-space.rb

@@ -1,30 +1,18 @@
 #!/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 Running a program wiht an embedded space
 class TestFileWithSpace < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='file-with-space'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
+    script = File.join('data', testname + '.cmd')
 #       filter = Proc.new{|got_lines, correct_lines|
 #         [got_lines[0], correct_lines[0]].each do |s|
 #           s.sub!(/tdebug.rb:\d+/, 'rdebug:999')
 #         end
 #       }
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- 'file with space.rb'"))
-    end
+    assert(run_debugger(testname, "--script #{script} -- './example/file with space.rb'"))
   end
 end

data/test/test-finish.rb

@@ -1,34 +1,22 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.start
+require File.expand_path("../helper", __FILE__)
 
 # Test finish command
 class TestFinish < Test::Unit::TestCase
-
-  @@src_dir = File.dirname(__FILE__) unless 
-    defined?(@@src_dir)
-
-  require File.join(@@src_dir, 'helper')
   include TestHelper
 
   def test_basic
-    testname='finish'
     # Ruby 1.8.6 and earlier have a trace-line number bug for return
     # statements.
-#     filter = Proc.new{|got_lines, correct_lines|
-#       [got_lines[31], got_lines[34]].flatten.each do |s|
-#         s.sub!(/gcd.rb:\d+/, 'gcd.rb:13')
-#       end
-#       got_lines[32] = 'return a'
-#     }
-    Dir.chdir(@@src_dir) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5", 
-                                nil, nil))
-    end
+    #     filter = Proc.new{|got_lines, correct_lines|
+    #       [got_lines[31], got_lines[34]].flatten.each do |s|
+    #         s.sub!(/gcd.rb:\d+/, 'gcd.rb:13')
+    #       end
+    #       got_lines[32] = 'return a'
+    #     }
+
+    testname = 'finish'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
   end
 end

data/test/test-frame.rb

@@ -1,34 +1,28 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.start(:post_mortem => true)
+require File.expand_path("../helper", __FILE__)
 
 # Test frame commands
 class TestFrame < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   # Test commands in frame.rb
   def test_basic
     testname='frame'
-    # Ruby 1.8.6 and earlier have a trace-line number bug for return
-    # statements.
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5"))
+  end
+
+  def test_bad_continue
+    # Remove absolute paths in output.
     filter = Proc.new{|got_lines, correct_lines|
-      [got_lines[11], correct_lines[11]].flatten.each do |s|
+      [got_lines, correct_lines].flatten.each do |s|
         s.sub!(/in file ".*gcd.rb/, 'in file "gcd.rb')
       end
     }
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5",
-                                nil, filter))
-    end
-  end
+
+    testname='continue_bad'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5",
+                        :filter => filter))
+  end unless defined?(JRUBY_VERSION) # JRuby doesn't yet support tracelines
 end