Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ccb8a90ecd69
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10a9144297bf
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 23, 2016

  1. [Truffle] Add debugging code to the tracing integration test.

    @chrisseaton
    chrisseaton committed Feb 23, 2016
    Copy the full SHA
    ff23060 View commit details

  2. [Truffle] Remove lines that were duplicated in tracing but now we've … 

    …fixed.
    @chrisseaton
    chrisseaton committed Feb 23, 2016
    Copy the full SHA
    10a9144 View commit details
7 changes: 0 additions & 7 deletions test/truffle/integration/tracing/binding.trace
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
["line", "/binding.rb", 23, nil, {:captured_in_scope=>2, :inside_trace=>nil, :modified=>3, :outside_trace=>1, :result=>nil}, nil]
["line", "/binding.rb", 23, nil, {:captured_in_scope=>2, :inside_trace=>nil, :modified=>3, :outside_trace=>1, :result=>nil}, nil]
["line", "/binding.rb", 24, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>3, :outside_trace=>1, :result=>nil}, nil]
["line", "/binding.rb", 24, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>3, :outside_trace=>1, :result=>nil}, nil]
["line", "/binding.rb", 26, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>nil}, nil]
["line", "/binding.rb", 26, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>nil}, nil]
["call", "/binding.rb", 26, :add, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>nil}, Object]
["line", "/binding.rb", 14, nil, {:a=>14}, nil]
["line", "/binding.rb", 14, nil, {:a=>14}, nil]
["call", "/binding.rb", 14, :"<main>", {:a=>14}, Object]
["line", "/binding.rb", 27, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, nil]
["line", "/binding.rb", 27, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, nil]
["call", "/binding.rb", 14, :+, {:a=>14}, Fixnum]
["line", "/binding.rb", 30, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, nil]
["line", "/binding.rb", 30, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, nil]
["line", "/binding.rb", 32, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, nil]
["line", "/binding.rb", 32, nil, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, nil]
["call", "/binding.rb", 32, :set_trace_func, {:captured_in_scope=>2, :inside_trace=>4, :modified=>5, :outside_trace=>1, :result=>16}, Object]
3 changes: 0 additions & 3 deletions test/truffle/integration/tracing/modules.trace
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
["line", "/modules.rb", 19, nil, {}, nil]
["line", "/modules.rb", 19, nil, {}, nil]
["class", "/modules.rb", 19, nil, {}, nil]
["call", "/modules.rb", 19, :Foo, {}, Module]
["line", "/modules.rb", 22, nil, {}, nil]
["line", "/modules.rb", 22, nil, {}, nil]
["call", "/modules.rb", 22, :inherited, {}, Class]
["class", "/modules.rb", 22, nil, {}, nil]
["call", "/modules.rb", 22, :Bar, {}, Class]
["line", "/modules.rb", 25, nil, {}, nil]
["line", "/modules.rb", 25, nil, {}, nil]
["call", "/modules.rb", 25, :set_trace_func, {}, Object]
3 changes: 0 additions & 3 deletions test/truffle/integration/tracing/simple.trace
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
["line", "/simple.rb", 19, nil, {}, nil]
["line", "/simple.rb", 19, nil, {}, nil]
["call", "/simple.rb", 19, :add, {}, Object]
["line", "/simple.rb", 14, nil, {:a=>14, :b=>2}, nil]
["line", "/simple.rb", 14, nil, {:a=>14, :b=>2}, nil]
["call", "/simple.rb", 14, :+, {:a=>14, :b=>2}, Fixnum]
["line", "/simple.rb", 21, nil, {}, nil]
["line", "/simple.rb", 21, nil, {}, nil]
["call", "/simple.rb", 21, :set_trace_func, {}, Object]
13 changes: 12 additions & 1 deletion test/truffle/integration/tracing/tracing.rb
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,12 @@ def local_variables

end

def expand_binding(binding)
Hash[binding.local_variables.sort.map { |v|
[v, binding.local_variable_get(v)]
}]
end

def check(file)
expected = nil

@@ -30,6 +36,11 @@ def check(file)

actual = $trace

#actual.each do |a|
# a[4] = expand_binding(a[4])
# p a
#end

empty_binding = MockBinding.new

while actual.size < expected.size
@@ -63,7 +74,7 @@ def check(file)
success = false
end

ab = Hash[a[4].local_variables.sort.map { |v| [v, a[4].local_variable_get(v)] }]
ab = expand_binding(a[4])

unless ab == e[4]
puts "Expected Binding, actually #{ab.inspect}"