usa	2016-11-15 03:58:23 +0900 (Tue, 15 Nov 2016)

  New Revision: 56789

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56789

  Log:
    merge revision(s) 56559,56582,56584,56585: [Backport #12903]
    
    * test/ruby/test_file.rb (TestFile#test_stat): fix noatime case.
      [ruby-core:77943] [Bug #12903]
    
    * ext/-test/file/fs.c (get_atime_p): Updating of file access times
      is enabled or not.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/-test-/file/extconf.rb
    branches/ruby_2_2/ext/-test-/file/fs.c
    branches/ruby_2_2/test/ruby/test_file.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ext/-test-/file/extconf.rb
===================================================================
--- ruby_2_2/ext/-test-/file/extconf.rb	(revision 56788)
+++ ruby_2_2/ext/-test-/file/extconf.rb	(revision 56789)
@@ -4,6 +4,7 @@ headers = %w[sys/param.h sys/mount.h sys https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/file/extconf.rb#L4
 if have_type("struct statfs", headers)
   have_struct_member("struct statfs", "f_fstypename", headers)
   have_struct_member("struct statfs", "f_type", headers)
+  have_struct_member("struct statfs", "f_flags", headers)
 end
 
 headers = %w[sys/statvfs.h].select {|h| have_header(h)}
Index: ruby_2_2/ext/-test-/file/fs.c
===================================================================
--- ruby_2_2/ext/-test-/file/fs.c	(revision 56788)
+++ ruby_2_2/ext/-test-/file/fs.c	(revision 56789)
@@ -33,6 +33,12 @@ typedef struct statvfs statfs_t; https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/file/fs.c#L33
 # if defined HAVE_STRUCT_STATVFS_F_TYPE
 #   define HAVE_STRUCT_STATFS_T_F_TYPE 1
 # endif
+#elif defined(HAVE_STRUCT_STATFS_F_TYPE) /* Linux */
+typedef struct statfs statfs_t;
+# define STATFS(f, s) statfs((f), (s))
+# if defined HAVE_STRUCT_STATFS_F_TYPE
+#   define HAVE_STRUCT_STATFS_T_F_TYPE 1
+# endif
 #endif
 
 VALUE
@@ -69,9 +75,31 @@ get_fsname(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/file/fs.c#L75
     return Qnil;
 }
 
+VALUE
+get_noatime_p(VALUE self, VALUE str)
+{
+#ifdef STATFS
+    statfs_t st;
+    FilePathValue(str);
+    str = rb_str_encode_ospath(str);
+    if (STATFS(StringValueCStr(str), &st) == -1) {
+       rb_sys_fail_str(str);
+    }
+# ifdef HAVE_STRUCT_STATFS_F_FLAGS
+#  ifdef MNT_NOATIME
+    return st.f_flags & MNT_NOATIME ? Qtrue : Qfalse;
+#  elif defined(ST_NOATIME)
+    return st.f_flags & ST_NOATIME ? Qtrue : Qfalse;
+#  endif
+# endif
+#endif
+    return Qnil;
+}
+
 void
 Init_fs(VALUE module)
 {
     VALUE fs = rb_define_module_under(module, "Fs");
     rb_define_module_function(fs, "fsname", get_fsname, 1);
+    rb_define_module_function(fs, "noatime?", get_noatime_p, 1);
 }
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56788)
+++ ruby_2_2/version.h	(revision 56789)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-11-15"
-#define RUBY_PATCHLEVEL 394
+#define RUBY_PATCHLEVEL 395
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_2/test/ruby/test_file.rb
===================================================================
--- ruby_2_2/test/ruby/test_file.rb	(revision 56788)
+++ ruby_2_2/test/ruby/test_file.rb	(revision 56789)
@@ -1,6 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_file.rb#L1
 require 'test/unit'
 require 'tempfile'
 require "thread"
+require "-test-/file"
 require_relative 'ut_eof'
 
 class TestFile < Test::Unit::TestCase
@@ -323,6 +324,7 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_file.rb#L324
       sleep 2
       File.write(path, "bar")
       sleep 2
+      File.read(path)
       File.chmod(0644, path)
       sleep 2
       File.read(path)
@@ -334,7 +336,7 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_file.rb#L336
       if stat.birthtime != stat.ctime
         assert_in_delta t0+4, stat.ctime.to_f, delta
       end
-      unless /mswin|mingw/ =~ RUBY_PLATFORM
+      if /mswin|mingw/ !~ RUBY_PLATFORM && !Bug::File::Fs.noatime?(path)
         # Windows delays updating atime
         assert_in_delta t0+6, stat.atime.to_f, delta
       end
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 56788)
+++ ruby_2_2/ChangeLog	(revision 56789)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Nov 15 03:55:45 2016  NARUSE, Yui  <naruse@r...>
+
+	* ext/-test/file/fs.c (get_atime_p): Updating of file access times
+	  is enabled or not.
+
+Tue Nov 15 03:55:45 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ruby/test_file.rb (TestFile#test_stat): fix noatime case.
+	  [ruby-core:77943] [Bug #12903]
+
 Tue Nov 15 03:54:14 2016  Shugo Maeda  <shugo@r...>
 
 	* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56559,56582,56584-56585


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/