jruby/jruby — pull request #1162 by dmarcotte (2013-10-24 15:04:03+00:00)
Title: Fix tests on master

Two fixes here to get Travis green:

* Fix test_load.rb. This was recently enabled in 4b6dfbc, probably accidentally. Happy accident though: it's working in 1.9 now once we re-add the requireTest-1.0.jar, so that's one less FIXME.

* Remove failing ffi-dependent test. With ffi being removed in 1ca75b2, this test is no longer valid.

Not addressed here: ConditionVariable specs are hanging fairly frequently. Can this be addressed? Or should they be tagged unstable?