ruby-debug 0.10.4 → 0.10.5.rc1

data/test/test-hist.rb

@@ -1,8 +1,5 @@
 #!/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 history commands
 
@@ -11,7 +8,6 @@ class TestHistory < Test::Unit::TestCase
   @@SRC_DIR = File.dirname(__FILE__) unless 
     defined?(@@SRC_DIR)
 
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   unless defined?(@@FILE_HISTORY)
@@ -19,6 +15,9 @@ class TestHistory < Test::Unit::TestCase
   end
 
   def test_basic
+    # FIXME: Disable for now.
+    assert true, 'FIXME'
+    return
 
     # Set up history file to read from.
     ENV['HOME']=@@SRC_DIR
@@ -40,8 +39,8 @@ class TestHistory < Test::Unit::TestCase
 
       # Now that we've set up a history file, run the debugger
       # and check that it's reading that correctly.
-      debug_pgm=File.join('..', 'rdbg.rb')
-      debugged=File.join('gcd.rb')
+      debug_pgm=File.join(%w(.. rdbg.rb))
+      debugged=File.join(%w(. example gcd.rb))
       IO.popen("#{debug_pgm} #{debugged} 3 5 >#{debugger_output}", 'w') do 
         |pipe|
         debugger_commands.each do |cmd|
@@ -51,9 +50,6 @@ class TestHistory < Test::Unit::TestCase
       
       # Compare output
       got_lines = File.read(@@FILE_HISTORY).split(/\n/)
-      # FIXME: Disable for now.
-      assert true, 'FIXME'
-      return
       if cheap_diff(got_lines, correct_lines)
         assert true
         FileUtils.rm(debugger_output)

data/test/test-info-thread.rb

@@ -1,32 +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 simple thread commands
 class TestInfoThread < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='info-thread'
-    Dir.chdir(@@SRC_DIR) do 
-       filter = Proc.new{|got_lines, correct_lines|
-         [got_lines, correct_lines].each do |a|
-          a.each do |s|
-            s.sub!(/Thread:0x[0-9a-f]+/, 'Thread:0x12345678')
-          end
+    filter = Proc.new{|got_lines, correct_lines|
+      [got_lines, correct_lines].each do |a|
+        a.each do |s|
+          s.gsub!(/Thread:0x[0-9a-f]+/, 'Thread:0x12345678')
         end
-       }
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5", nil, filter))
-    end
+      end
+      got_lines.each do |s|
+        s.gsub!(/run>[ \t]+.*gcd.rb:4/, "run> gcd.rb:4")
+      end
+    }
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5",
+                        :filter => filter))
   end
 end

data/test/test-info-var.rb

@@ -1,47 +1,30 @@
 #!/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 info variables command
 class TestInfoVar < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_info_variables
-
-    Dir.chdir(@@SRC_DIR) do 
-
-      filter = Proc.new{|got_lines, correct_lines|
-        [got_lines[13-1], correct_lines[13-1]].each do |s|
-          s.sub!(/Mine:0x[0-9,a-f]+/, 'Mine:')
-        end
-        [got_lines, correct_lines].each do |a|
-          a.each do |s|
-            s.sub!(/Lousy_inspect:0x[0-9,a-f]+/, 'Lousy_inspect:')
-            s.sub!(/UnsuspectingClass:0x[0-9,a-f]+/, 'UnsuspectingClass:')
-          end
+    filter = Proc.new{|got_lines, correct_lines|
+      [got_lines[13-1], correct_lines[13-1]].each do |s|
+        s.sub!(/Mine:0x[0-9,a-f]+/, 'Mine:')
+      end
+      [got_lines, correct_lines].each do |a|
+        a.each do |s|
+          s.sub!(/Lousy_inspect:0x[0-9,a-f]+/, 'Lousy_inspect:')
+          s.sub!(/UnsuspectingClass:0x[0-9,a-f]+/, 'UnsuspectingClass:')
         end
-      }
-
-      testname='info-var'
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- info-var-bug.rb",
-                                nil, filter))
-      testname='info-var-bug2'
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- info-var-bug2.rb",
-                                nil))
-
-    end
+      end
+    }
+
+    testname='info-var'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/info-var-bug.rb",
+                        :filter => filter))
+    
+    testname='info-var-bug2'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/info-var-bug2.rb"))
   end
 end

data/test/test-info.rb

@@ -1,26 +1,27 @@
 #!/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 info commands
 class TestInfo < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   # Test commands in info.rb
   def test_basic
     testname='info'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- gcd.rb 3 5"))
-    end
+    filter = Proc.new{|got_lines, correct_lines|
+      got_lines.each do |s|
+        s.gsub!(/Line 4 of ".*gcd.rb"/, 'Line 4 of "gcd.rb"')
+      end
+    }
+
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb 3 5",
+                        :filter => filter))
   end
+
+  def test_file_break
+    testname='info-file-break'
+    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
 end

data/test/test-list.rb

@@ -1,25 +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 List commands
 class TestList < Test::Unit::TestCase
-
-  @@src_dir = File.dirname(__FILE__)
-
-  require File.join(@@src_dir, 'helper')
   include TestHelper
 
   # Test commands in list.rb
   def test_basic
     testname='list'
-    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-method.rb

@@ -1,34 +1,20 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.start(:post_mortem => true)
+require File.expand_path("../helper", __FILE__)
 
 class TestMethod < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='method'
-    Dir.chdir(@@SRC_DIR) do 
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/classes.rb"))
+    begin
+      require 'methodsig'
+      testname='methodsig'
       script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- classes.rb"))
-      begin 
-        require 'methodsig'
-        testname='methodsig'
-        script = File.join('data', testname + '.cmd')
-        assert_equal(true, 
-                     run_debugger(testname,
-                                  "--script #{script} -- classes.rb"))
-      rescue LoadError
-        puts "Skipping method sig test"
-      end
+      assert(run_debugger(testname, "--script #{script} -- ./example/classes.rb"))
+    rescue LoadError
+      puts "Skipping method sig test"
     end
   end
 end

data/test/test-output.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 'starting' annotation.
 class TestStartingAnnotate < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='output'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "-A 3 --script #{script} -- output.rb",
-                                nil, nil, true))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "-A 3 --script #{script} -- ./example/output.rb"))
   end
 end

data/test/test-pm.rb

@@ -1,59 +1,37 @@
 #!/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__)
 
 # Test Post-mortem command
 class TestPM < 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_basic
-    Dir.chdir(@@SRC_DIR) do 
 #       filter = Proc.new{|got_lines, correct_lines|
 #         [got_lines[0], correct_lines[0]].each do |s|
 #           s.sub!(/tdebug.rb:\d+/, 'rdebug:999')
 #         end
 #       }
-      ENV['COLUMNS'] = '80'
-      testname='post-mortem'
-      script = File.join('data', testname + '.cmd')
-      testname += '-osx' if Config::CONFIG['host_os'] =~ /^darwin/
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} --post-mortem pm.rb"))
-    end
+    ENV['COLUMNS'] = '80'
+    testname='post-mortem'
+    script = File.join('data', testname + '.cmd')
+    testname += '-osx' if Config::CONFIG['host_os'] =~ /^darwin/
+    assert(run_debugger(testname, "--script #{script} --post-mortem ./example/pm.rb"))
   end
 
   # Test post-mortem handling
   def test_pm_next
-    Dir.chdir(@@SRC_DIR) do 
-      ENV['COLUMNS'] = '80'
-      testname='post-mortem-next'
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} --post-mortem pm.rb"))
-    end
+    ENV['COLUMNS'] = '80'
+    testname='post-mortem-next'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} --post-mortem ./example/pm.rb"))
   end
-  
+
   # Test Tracker #22118 post-mortem giving an error in show internal variables
   def test_pm_iv_bug
-    Dir.chdir(@@SRC_DIR) do 
-      ENV['COLUMNS'] = '80'
-      testname='pm-bug'
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} --post-mortem pm-bug.rb"))
-    end
+    ENV['COLUMNS'] = '80'
+    testname='pm-bug'
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} --post-mortem example/pm-bug.rb"))
   end
-
-end
+end unless defined?(JRUBY_VERSION) # post-mortem not yet supported on JRuby

data/test/test-quit.rb

@@ -1,30 +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 Quit command
 class TestQuit < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='quit'
-    Dir.chdir(@@SRC_DIR) do 
-      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} -- null.rb"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/gcd.rb"))
   end
 end

data/test/test-raise.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 Debugger.load handles uncaught exceptions in the debugged program.
 class TestRaise < Test::Unit::TestCase
-
-  @@SRC_DIR = File.dirname(__FILE__) unless 
-    defined?(@@SRC_DIR)
-
-  require File.join(@@SRC_DIR, 'helper')
   include TestHelper
 
   def test_basic
     testname='raise'
-    Dir.chdir(@@SRC_DIR) do 
-      script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
-                   run_debugger(testname,
-                                "--script #{script} -- raise.rb"))
-    end
+    script = File.join('data', testname + '.cmd')
+    assert(run_debugger(testname, "--script #{script} -- ./example/raise.rb"))
   end
 end