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

Commits on Feb 24, 2016

  1. Ensure target script loads rather than current script again.

    @headius
    headius committed Feb 24, 2016
    Copy the full SHA
    b1dbba9 View commit details

  2. Fix verification scripts for new json version.

    @headius
    headius committed Feb 24, 2016
    Copy the full SHA
    98dcabb 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
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
//{
// throw new RuntimeException( "log file does not contain '" + expected + "'" );
//}
expected = "json (1.8.1 java)";
expected = "json (1.8.3 java)";
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
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
//{
// throw new RuntimeException( "log file does not contain '" + expected + "'" );
//}
expected = "json (1.8.1 java)";
expected = "json (1.8.3 java)";
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
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
//{
// throw new RuntimeException( "log file does not contain '" + expected + "'" );
//}
expected = "json (1.8.1 java)";
expected = "json (1.8.3 java)";
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
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
//{
// throw new RuntimeException( "log file does not contain '" + expected + "'" );
//}
expected = "json (1.8.1 java)";
expected = "json (1.8.3 java)";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
4 changes: 2 additions & 2 deletions test/jruby/test_load_compiled_ruby.rb
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
require 'fileutils'

class TestLoadCompiledRuby < Test::Unit::TestCase
FILENAME = 'test_load_compiled_ruby.rb'
COMPILED = 'test_load_compiled_ruby.class'
FILENAME = 'test_load_compiled_ruby_script.rb'
COMPILED = 'test_load_compiled_ruby_script.class'
def test_load_compiled_ruby
begin
File.open(FILENAME, 'w') do |f|