aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-22 13:19:15 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-22 13:19:15 +0000
commit026b0b9469286d5166f7238351df0042fdbf4d9a (patch)
treeaf14fd04359280a6adda384eddb4cb515ac0ee3b
parent3b1862e62fc398126ab3a6ebb28b86cec728ffcc (diff)
downloadruby-026b0b9469286d5166f7238351df0042fdbf4d9a.tar.gz
* file.c (rb_io_statfs): need to define even if the system doesn't have
fstatfs(2). * test/ruby/test_file.rb (TestFile#test_statfs): skip if IO#stafs is not implemented. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--file.c2
-rw-r--r--test/ruby/test_file.rb1
3 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fca9f3eb6e..e3af87068c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 22 22:15:51 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (rb_io_statfs): need to define even if the system doesn't have
+ fstatfs(2).
+
+ * test/ruby/test_file.rb (TestFile#test_statfs): skip if IO#stafs is not
+ implemented.
+
Tue Apr 22 19:32:48 2014 NARUSE, Yui <naruse@ruby-lang.org>
* file.c: newly added a class File::Statfs. (experimental)
diff --git a/file.c b/file.c
index 86839b15b3..e700478fdf 100644
--- a/file.c
+++ b/file.c
@@ -1125,6 +1125,8 @@ rb_io_statfs(VALUE obj)
}
return rb_statfs_new(&st);
}
+#else
+#define rb_io_statfs rb_f_notimplement
#endif
static int
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 9775c91ce3..77be3237c3 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -385,6 +385,7 @@ class TestFile < Test::Unit::TestCase
end
def test_statfs
+ skip "not implemented" unless $stdout.respond_to?(:statfs)
open(__FILE__) do |f|
st = f.statfs
assert_kind_of File::Statfs, st