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: 2fbbf6066d55
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce4af9c20aae
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 22, 2014

  1. Revert "[Truffle] PE tests broken." 

    This reverts commit 3f72e2c.
    @chrisseaton
    chrisseaton committed Oct 22, 2014
    Copy the full SHA
    ad74ecb View commit details

  2. Merge branch 'master' of jruby.org:jruby

    @chrisseaton
    chrisseaton committed Oct 22, 2014
    Copy the full SHA
    ce4af9c View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 test/truffle/pe/language/metaprogramming_pe.rb
  2. +1 −1 test/truffle/pe/macro/pushing_pixels_pe.rb
6 changes: 3 additions & 3 deletions test/truffle/pe/language/metaprogramming_pe.rb
View file
Original file line number Diff line number Diff line change
@@ -20,17 +20,17 @@ def existing_method(a)

PETests.tests do

broken_example "A call that results in #method_missing" do
example "A call that results in #method_missing" do
method_missing = MetaprogrammingFixtures::MethodMissing.new
truffle_assert_constant method_missing.does_not_exist
end

broken_example "#respond_to? on a method that does exist" do
example "#respond_to? on a method that does exist" do
object_with_existing_method = MetaprogrammingFixtures::ClassWithExistingMethod.new
truffle_assert_constant object_with_existing_method.respond_to? :existing_method
end

broken_example "#send on a method that exists using a symbol" do
example "#send on a method that exists using a symbol" do
object_with_existing_method = MetaprogrammingFixtures::ClassWithExistingMethod.new
truffle_assert_constant object_with_existing_method.send(:existing_method, 14)
end
2 changes: 1 addition & 1 deletion test/truffle/pe/macro/pushing_pixels_pe.rb
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ def method_missing(method, *args)

PETests.tests do

broken_example "A set of constants used in a literal hash, mapped to an array, indexed, used in an array literal, sorted, indexed, and added, all via method_missing, respond_to? and send" do
example "A set of constants used in a literal hash, mapped to an array, indexed, used in an array literal, sorted, indexed, and added, all via method_missing, respond_to? and send" do
bar = PushingPixelsFixtures::Bar.new
truffle_assert_constant bar.foo(14, 8, 6)
end