aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rubygems/test_gem_ext_cmake_builder.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b00672bb8..f4c94f4fd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 15 08:37:01 2012 Masaya Tarui <tarui@ruby-lang.org>
+
+ * test/rubygems/test_gem_ext_cmake_builder.rb(test_self_build):
+ get rid of false positive.
+
Sat Dec 15 08:05:56 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/ruby/test_thread.rb (test_uninitialized, test_backtrace,
diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb
index f43f13662b..8c01c12982 100644
--- a/test/rubygems/test_gem_ext_cmake_builder.rb
+++ b/test/rubygems/test_gem_ext_cmake_builder.rb
@@ -36,7 +36,7 @@ install (FILES test.txt DESTINATION bin)
assert_equal "cmake . -DCMAKE_INSTALL_PREFIX=#{@dest_path}", output.shift
assert_match(/#{@ext}/, output.shift)
assert_equal make_command, output.shift
- assert_equal "", output.shift
+ assert_equal "", output.shift.gsub(/^make\[1\]: (?:Entering|Leaving) directory .*\n/,"")
assert_equal make_command + " install", output.shift
assert_match(/test\.txt/, output.shift)
end