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

Commits on Mar 11, 2016

  1. Mask out failing test on windows (issue JRUBY #3726 created to track)

    @enebo
    enebo committed Mar 11, 2016
    Copy the full SHA
    12fd533 View commit details

  2. Remove 64 bit windows from CI for now since some tests fail from bad … 

    …quoting in jruby-launcher (JRUBY #3725)
    @enebo
    enebo committed Mar 11, 2016
    Copy the full SHA
    fed46bd View commit details
Showing with 8 additions and 8 deletions.
  1. +0 −1 appveyor.yml
  2. +8 −7 test/externals/ruby1.8/ruby/test_marshal.rb
1 change: 0 additions & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ build: off

environment:
matrix:
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0

install:
15 changes: 8 additions & 7 deletions test/externals/ruby1.8/ruby/test_marshal.rb
View file
Original file line number Diff line number Diff line change
@@ -65,13 +65,14 @@ def self._load(s)
end
end

def test_too_long_string
(data = Marshal.dump(C.new("a")))[-2, 1] = "\003\377\377\377"
e = assert_raise(ArgumentError, "[ruby-dev:32054]") {
Marshal.load(data)
}
assert_equal("marshal data too short", e.message)
end
# JRUBY-3726
# def test_too_long_string
# (data = Marshal.dump(C.new("a")))[-2, 1] = "\003\377\377\377"
# e = assert_raise(ArgumentError, "[ruby-dev:32054]") {
# Marshal.load(data)
# }
# assert_equal("marshal data too short", e.message)
# end

class DumpTest
def marshal_dump