summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb4
-rw-r--r--version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb
index 443d4b06b5..65d31f61af 100644
--- a/test/rubygems/test_gem_ext_configure_builder.rb
+++ b/test/rubygems/test_gem_ext_configure_builder.rb
@@ -46,13 +46,13 @@ class TestGemExtConfigureBuilder < Gem::TestCase
end
end
- shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure(?:: No such file or directory)?)}
+ shell_error_msg = %r{(\./configure: .*)|((?:Can't|cannot) open \./configure(?:: No such file or directory)?)}
sh_prefix_configure = "sh ./configure --prefix="
expected = %r(configure failed:
#{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path}
-.*?: #{shell_error_msg}
+(?:.*?: )?#{shell_error_msg}
)
assert_match expected, error.message
diff --git a/version.h b/version.h
index 0876879f78..ba4d7a03b5 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 79
+#define RUBY_PATCHLEVEL 80
#define RUBY_RELEASE_DATE "2012-02-10"
#define RUBY_RELEASE_YEAR 2012