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

Commits on Oct 30, 2014

  1. Copy the full SHA
    03592f1 View commit details
  2. Copy the full SHA
    ad8f110 View commit details
  3. Copy the full SHA
    5690c3f View commit details
  4. Copy the full SHA
    38ed325 View commit details
  5. Copy the full SHA
    e091108 View commit details
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@ env:
- TARGET='-Prake -Dtask=spec:ffi'
- TARGET='-Prake -Dtask=spec:regression'
- TARGET='-Prake -Dtask=spec:ci_interpreted_travis'
- TARGET='-Prake -Dtask=spec:jruby'
- TARGET='-Prake -Dtask=spec:jrubyc'
- TARGET='-Ptruffle-specs-language'
- TARGET='-Ptruffle-specs-core'

@@ -49,7 +51,7 @@ matrix:
fast_finish: true
allow_failures:
- env: TARGET='-Pcomplete'
- env: TARGET='-Prake -Dtask=spec:compiler'
- env: TARGET='-Prake -Dtask=spec:jrubyc'

branches:
only:
4 changes: 4 additions & 0 deletions rakelib/rspec.rake
Original file line number Diff line number Diff line change
@@ -55,4 +55,8 @@ namespace :spec do
permute_specs "regression", compile_flags do |t|
t.pattern = 'spec/regression/**/*_spec.rb'
end

permute_specs "jruby", compile_flags do |t|
t.pattern = 'spec/jruby/**/*_spec.rb'
end
end
8 changes: 4 additions & 4 deletions spec/compiler/general_spec.rb
Original file line number Diff line number Diff line change
@@ -670,12 +670,12 @@ def self.remove; remove_method :gh1239; end
run("def foo; yield; end; x = false; foo { break 5 if x; begin; ensure; x = true; redo; end; break 6}") {|result| expect(result).to eq 5 }
end

it "compiles END BLocks" do
it "compiles END BLocks", pending: "JIT support" do
# END block
expect { run("END {}"){} }.to_not raise_error
end

it "compiles BEGIN blocks" do
it "compiles BEGIN blocks", pending: "JIT support" do
# BEGIN block
run("BEGIN { $begin = 5 }; $begin") {|result| expect(result).to eq 5 }
end
@@ -691,7 +691,7 @@ def self.remove; remove_method :gh1239; end
run("def foo; x = {1 => 2}; x.inject({}) do |hash, (key, value)|; hash[key.to_s] = value; hash; end; end; foo") {|result| expect(result).to eq({"1" => 2}) }
end

it "compiles very long code bodies" do
it "compiles very long code bodies", pending: "JIT support" do
# JRUBY-2246
long_src = "a = 1\n"
5000.times { long_src << "a += 1\n" }
@@ -748,7 +748,7 @@ class AFromLocal < a
EOS
end

it "can compile large literal arrays and hashes" do
it "can compile large literal arrays and hashes", pending: "JIT support" do
# JRUBY-4757 and JRUBY-2621: can't compile large array/hash
large_array = (1..10000).to_a.inspect
large_hash = large_array.clone
128 changes: 0 additions & 128 deletions spec/jruby/date_time_spec.rb

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.