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

Commits on Nov 11, 2014

  1. List of preinstalled gems increased to 12 for 2.2 compat.

    @headius
    headius committed Nov 11, 2014
    Copy the full SHA
    c846e3d View commit details

  2. Disable color in CI for remaining test/unit suites.

    @headius
    headius committed Nov 11, 2014
    Copy the full SHA
    ad66f55 View commit details

  3. Object#remove_instance_variable is no longer private.

    @headius
    headius committed Nov 11, 2014
    Copy the full SHA
    78ea469 View commit details
2 changes: 1 addition & 1 deletion maven/jruby-complete/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 9";
expected = "gems count 12";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
2 changes: 1 addition & 1 deletion maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 9";
expected = "gems count 12";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
2 changes: 1 addition & 1 deletion maven/jruby-jars/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 9";
expected = "gems count 12";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
2 changes: 1 addition & 1 deletion maven/jruby-noasm/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 9";
expected = "gems count 12";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
2 changes: 1 addition & 1 deletion maven/jruby/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 9";
expected = "gems count 12";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
8 changes: 7 additions & 1 deletion rakelib/test.rake
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ task :spec => "spec:ci"
desc "Alias for test:short"
task :test => "test:short"

ADDITIONAL_TEST_OPTIONS = ENV['CI'] ? "-v --color=never --tty=no" : ""
if ENV['CI']
# MRI tests have a different flag for color
ADDITIONAL_OPTIONS = "-v --color=never --tty=no"

# for normal test/unit tests
ENV['TESTOPT'] = "-v --no-use-color"
end

namespace :test do
desc "Compile test code"
3 changes: 0 additions & 3 deletions test/jruby/test_kernel.rb
View file
Original file line number Diff line number Diff line change
@@ -45,9 +45,6 @@ def log(msg)
def test_stuff_seemingly_out_of_context
assert !Kernel.eval("defined? some_unknown_variable")
assert_equal nil, true && defined?(unknownConstant)

# JRUBY-117 - remove_instance_variable should be private
assert_equal [:remove_instance_variable], Object.private_instance_methods.grep(:remove_instance_variable)
end