Permalink
Browse files

Merge branch 'master' of github.com:rocky/rb-trepanning

  • Loading branch information...
rocky committed Sep 18, 2011
2 parents f9f3f4c + d19f7a7 commit e71cf664e1bdcc7e477c02e35056916ae5c68879
Showing with 5 additions and 4 deletions.
  1. +3 −2 app/run.rb
  2. +1 −1 processor/running.rb
  3. +1 −1 test/functional/test-next.rb
View
@@ -51,8 +51,9 @@ def debug_program(dbgr, program_to_debug)
# Do a shell-like path lookup for prog_script and return the results.
# If we can't find anything return prog_script.
def whence_file(prog_script)
if prog_script.index(File::SEPARATOR)
# Don't search since this name has path separator components
if prog_script.start_with?(File::SEPARATOR) || prog_script.start_with?('.')
# Don't search since this name has path is explicitly absolute or
# relative.
return prog_script
end
for dirname in ENV['PATH'].split(File::PATH_SEPARATOR) do
View
@@ -118,7 +118,7 @@ def stepping_skip?
return true if
!frame || (@next_level < @frame.stack_size &&
Thread.current == @next_thread)
Thread.current == @next_thread && @event != 'raise')
new_pos = [@frame.source_container, frame_line,
@stack_size, @current_thread, @event, @frame.pc_offset]
@@ -65,7 +65,7 @@ def test_next_in_exception
end
##############################
d.stop # ({:remove => true})
out = ['-- ', 'begin']
out = ['-- ', 'begin', "#<ZeroDivisionError: divided by 0>", "!! ", "x = 4/0"]
compare_output(out, d, cmds)
end
end

0 comments on commit e71cf66

Please sign in to comment.