From ac81a6e38d85ad623f699d4ed8dd319b5fb28d32 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 14 Feb 2012 07:36:03 +0000 Subject: [PATCH] merge revision(s) 33232: * test/rubygems/test_gem_commands_help_command.rb: Add one `require` because if run test-all with test/unit parallel running, sometimes this test fails by some constants not found. The error reason is some worker doesn't require the file needed by this test. This issue is related to [ruby-core:36168]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 14 +++++++++++--- test/rubygems/test_gem_commands_help_command.rb | 1 + version.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7845d3473..5f280ee6c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,18 @@ -Tue Feb 14 15:58:31 2012 NAKAMURA Usaku +Tue Feb 14 16:34:11 2012 Shota Fukumori + + * test/rubygems/test_gem_commands_help_command.rb: Add one + `require` because if run test-all with test/unit parallel + running, sometimes this test fails by some constants not found. + The error reason is some worker doesn't require the file needed by + this test. This issue is related to [ruby-core:36168]. + +Tue Feb 14 15:58:31 2012 Nobuyoshi Nakada + + * gc.c (initial_params): pack in a struct. * gc.c (rb_gc_set_params): set parameters always. [ruby-dev:44648] [Bug #5467] - * gc.c (initial_params): pack in a struct. - Tue Feb 14 15:44:42 2012 NAKAMURA Usaku * test/irb/test_completion.rb: skip if cannot load irb/completion diff --git a/test/rubygems/test_gem_commands_help_command.rb b/test/rubygems/test_gem_commands_help_command.rb index d626b1436a..822811101c 100644 --- a/test/rubygems/test_gem_commands_help_command.rb +++ b/test/rubygems/test_gem_commands_help_command.rb @@ -3,6 +3,7 @@ require "rubygems/test_case" require "rubygems/commands/help_command" require "rubygems/format" require "rubygems/command_manager" +require_relative "rubygems_plugin" class TestGemCommandsHelpCommand < Gem::TestCase def setup diff --git a/version.h b/version.h index 00f4c0a0ac..3fd579b4d7 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 107 +#define RUBY_PATCHLEVEL 108 #define RUBY_RELEASE_DATE "2012-02-14" #define RUBY_RELEASE_YEAR 2012