Merge branch 'master' into truffle-head

jruby · Mar 8, 2016 · 2efd8a9 · 2efd8a9
2 parents 3a7fb32 + 39cee83
commit 2efd8a9
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/test/truffle/integration/backtraces/javascript.backtrace b/test/truffle/integration/backtraces/javascript.backtrace
@@ -1,8 +1,4 @@
-/javascript.rb:19:in `foo'
-(eval):1
-/javascript.rb:31:in `bar'
-/javascript.rb:31:in `baz'
-(eval):1
+/javascript.rb:55:in `execute'
 /javascript.rb:55:in `bob'
 /javascript.rb:55:in `block in <main>'
 /backtraces.rb:17:in `check'