summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-25 06:37:36 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-25 06:37:36 +0000
commitd12d47c4beba330862f492fc556b862436652df2 (patch)
tree814a1e3728f47ac7c89452a7b4d5b1c2e7f4cb50
parent8eb39185810a59ad8d3aa874ba8f6c9a7b0949ac (diff)
* test/rdoc/test_rdoc_generator_darkfish.rb: add a guard for windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/rdoc/test_rdoc_generator_darkfish.rb9
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 50fa3ba..782eb40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 25 15:37:02 2013 Koichi Sasada <ko1@atdot.net>
+
+ * test/rdoc/test_rdoc_generator_darkfish.rb: add a guard for windows.
+
Wed Sep 25 09:53:11 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Fix CVE-2013-4363. Miscellaneous minor improvements.
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
index ff21515..1cefdbf 100644
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ b/test/rdoc/test_rdoc_generator_darkfish.rb
@@ -219,8 +219,13 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase
return
end
- assert_operator File.stat(filename).nlink, :>, 1,
- "#{filename} is not hard-linked"
+ # This guard is quoted from test/ruby/test_file_exhaustive.rb
+ unless /emx|mswin|mingw/ =~ RUBY_PLATFORM
+ # on Windows, nlink is always 1. but this behavior will be changed
+ # in the future.
+ assert_operator File.stat(filename).nlink, :>, 1,
+ "#{filename} is not hard-linked"
+ end
end
end