ruby-debug 0.10.0 → 0.10.1

data/test/test-edit.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
+
+# 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
+  end
+end

data/test/test-emacs-basic.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
+
+# 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
+  end
+end

data/test/test-enable.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
+
+# 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
+  end
+end

data/test/test-finish.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# require 'rubygems'
+# require 'ruby-debug'; Debugger.start
+
+# 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, filter))
+    end
+  end
+end

data/test/test-frame.rb

@@ -1,27 +1,26 @@
 #!/usr/bin/env ruby
-require "test/unit"
-require "fileutils"
+require 'test/unit'
 
-# require "rubygems"
-# require "ruby-debug"; Debugger.start
-
-SRC_DIR = File.expand_path(File.dirname(__FILE__)) + "/" unless 
-  defined?(SRC_DIR)
-
-require File.join(SRC_DIR, "helper.rb")
-
-include TestHelper
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
 
 # Test frame commands
 class TestFrame < Test::Unit::TestCase
-  require 'stringio'
 
-  # Test commands in stepping.rb
+  @@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
-    Dir.chdir(SRC_DIR) do 
+    testname='frame'
+    Dir.chdir(@@SRC_DIR) do 
+      script = File.join('data', testname + '.cmd')
       assert_equal(true, 
-                   run_debugger("frame", 
-                                "--script frame.cmd -- gcd.rb 3 5"))
+                   run_debugger(testname,
+                                "--script #{script} -- gcd.rb 3 5"))
     end
   end
 end

data/test/test-help.rb

@@ -1,18 +1,21 @@
 #!/usr/bin/env ruby
 
-# require "rubygems"
-# require "ruby-debug" ; Debugger.start
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug' ; Debugger.start
 
-require "test/unit"
-SRC_DIR = File.expand_path(File.dirname(__FILE__)) + "/" unless 
+require 'test/unit'
+SRC_DIR = File.dirname(__FILE__) unless 
   defined?(SRC_DIR)
 %w(ext lib cli).each do |dir|
-  $: <<  File.join(SRC_DIR, "..", dir)
+  $:.unshift  File.join(SRC_DIR, '..', dir)
 end
-require "ruby_debug"
-require SRC_DIR + "/../cli/ruby-debug.rb"
+require 'ruby_debug'
+
+require File.join(SRC_DIR, '..', 'cli', 'ruby-debug')
+$:.shift; $:.shift; $:.shift
 
 def cheap_diff(got_lines, correct_lines)
+  puts got_lines if $DEBUG
   correct_lines.each_with_index do |line, i|
     correct_lines[i].chomp!
     if got_lines[i] != correct_lines[i]
@@ -21,24 +24,37 @@ def cheap_diff(got_lines, correct_lines)
       puts "need: #{correct_lines[i]}"
       return false
     end
-    return correct_lines.size == got_lines.size
+    if correct_lines.size != got_lines.size
+      puts("difference in number of lines: " + 
+           "#{correct_lines.size} vs. #{got_lines.size}")
+      return false
+    end
+    return true
   end
 end
 
-# Test of C extension ruby_debug.so
-class TestCmd < Test::Unit::TestCase
+# Test Help commands
+class TestHelp < Test::Unit::TestCase
   require 'stringio'
 
   # Test initial variables and setting/getting state.
   def test_basic
     testbase = 'help'
-    op = StringIO.new("", "w")
-    script = File.join(SRC_DIR, "#{testbase}.cmd")
-    Debugger.const_set('Version', "unit testing")
-    Debugger.run_script(script, op)
-    got_lines = op.string.split("\n")
-    right_file = File.join(SRC_DIR, "#{testbase}.right")
-    correct_lines = File.readlines(right_file)
-    assert cheap_diff(got_lines, correct_lines)
+    op = StringIO.new('', 'w')
+    Dir.chdir(SRC_DIR) do 
+      script = File.join('data', "#{testbase}.cmd")
+      Debugger.const_set('Version', 'unit testing')
+      Debugger.run_script(script, op)
+      got_lines = op.string.split("\n")
+      right_file = File.join('data', "#{testbase}.right")
+      correct_lines = File.readlines(right_file)
+      result = cheap_diff(got_lines, correct_lines)
+      unless result
+        puts '-' * 80
+        puts got_lines 
+        puts '-' * 80
+      end
+      assert result 
+    end
   end
 end

data/test/test-hist.rb

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
+
+# Test history commands
+
+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)
+    @@FILE_HISTORY = '.rdebug_hist'
+  end
+
+  def test_basic
+
+    # Set up history file to read from.
+    ENV['HOME']=@@SRC_DIR
+    ENV['RDEBUG'] = nil
+
+    debugger_commands = ['show commands', 
+                         'set history save on', 
+                         'show history',
+                         'quit unconditionally']
+    debugger_output = 'test-history.out'
+
+    Dir.chdir(@@SRC_DIR) do
+      correct_lines = File.read(File.join('data', 'history.right')).split(/\n/)
+      f = File.open(@@FILE_HISTORY, 'w')
+      correct_lines[0.. -(debugger_commands.length+1)].each do |line|
+        f.puts line
+      end
+      f.close
+
+      # 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')
+      IO.popen("#{debug_pgm} #{debugged} 3 5 >#{debugger_output}", 'w') do 
+        |pipe|
+        debugger_commands.each do |cmd|
+          pipe.puts cmd
+        end
+      end
+      
+      # 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)
+        FileUtils.rm(@@FILE_HISTORY)
+      else
+        assert nil, 'Output differs'
+      end
+    end
+  end
+end
+    
+    

data/test/test-info-thread.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
+
+# 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
+        end
+       }
+      script = File.join('data', testname + '.cmd')
+      assert_equal(true, 
+                   run_debugger(testname,
+                                "--script #{script} -- gcd.rb 3 5", nil, filter))
+    end
+  end
+end

data/test/test-info-var.rb

@@ -1,33 +1,47 @@
 #!/usr/bin/env ruby
-require "test/unit"
-require "fileutils"
+require 'test/unit'
 
-# require "rubygems"
-# require "ruby-debug" ; Debugger.start
-
-SRC_DIR = File.expand_path(File.dirname(__FILE__)) + "/" unless 
-  defined?(SRC_DIR)
-
-require File.join(SRC_DIR, "helper.rb")
-include TestHelper
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
 
 # 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 
+    Dir.chdir(@@SRC_DIR) do 
 
       filter = Proc.new{|got_lines, correct_lines|
-        [got_lines[12], correct_lines[12]].each do |s|
+        [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
+        end
       }
 
+      testname='info-var'
+      script = File.join('data', testname + '.cmd')
       assert_equal(true, 
-                   run_debugger("info-var", 
-                                "--script info-var.cmd -- info-var-bug.rb",
+                   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
 end

data/test/test-info.rb

@@ -1,28 +1,26 @@
 #!/usr/bin/env ruby
-require "test/unit"
-require "fileutils"
+require 'test/unit'
 
-# require "rubygems"
-# require "ruby-debug"
-# Debugger.start
-
-SRC_DIR = File.expand_path(File.dirname(__FILE__)) + "/" unless 
-  defined?(SRC_DIR)
-
-require File.join(SRC_DIR, "helper.rb")
-
-include TestHelper
+# begin require 'rubygems' rescue LoadError end
+# require 'ruby-debug'; Debugger.start
 
 # Test info commands
 class TestInfo < Test::Unit::TestCase
-  require 'stringio'
 
-  # Test commands in stepping.rb
+  @@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
-    Dir.chdir(SRC_DIR) do 
+    testname='info'
+    Dir.chdir(@@SRC_DIR) do 
+      script = File.join('data', testname + '.cmd')
       assert_equal(true, 
-                   run_debugger("info", 
-                                "--script info.cmd -- gcd.rb 3 5"))
+                   run_debugger(testname,
+                                "--script #{script} -- gcd.rb 3 5"))
     end
   end
 end