kosaki	2011-05-03 20:31:20 +0900 (Tue, 03 May 2011)

  New Revision: 31415

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31415

  Log:
    * test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
      Skip sticky bit test if the platform is FreeBSD. It doesn't allow to
      change sticky bit if a target is regular file.

  Modified files:
    trunk/ChangeLog
    trunk/test/fileutils/test_fileutils.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31414)
+++ ChangeLog	(revision 31415)
@@ -1,3 +1,9 @@
+Tue May  3 20:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
+	  Skip sticky bit test if the platform is FreeBSD. It doesn't allow to
+	  change sticky bit if a target is regular file.
+
 Tue May  3 18:23:57 2011  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* test/date/test_date.rb (TestDate#test_coerce):
Index: test/fileutils/test_fileutils.rb
===================================================================
--- test/fileutils/test_fileutils.rb	(revision 31414)
+++ test/fileutils/test_fileutils.rb	(revision 31415)
@@ -909,10 +909,17 @@
     assert_equal 04500, File.stat('tmp/a').mode & 07777
     chmod "+s", 'tmp/a'
     assert_equal 06500, File.stat('tmp/a').mode & 07777
-    chmod "u+t,o+t", 'tmp/a'
-    assert_equal 07500, File.stat('tmp/a').mode & 07777
-    chmod "a-t,a-s", 'tmp/a'
-    assert_equal 0500, File.stat('tmp/a').mode & 07777
+
+    # FreeBSD ufs and tmpfs don't allow to change sticky bit against
+    # regular file. It's slightly strange. Anyway it's no effect bit.
+    # see /usr/src/sys/ufs/ufs/ufs_chmod()
+    if /freebsd/ !~ RUBY_PLATFORM
+      chmod "u+t,o+t", 'tmp/a'
+      assert_equal 07500, File.stat('tmp/a').mode & 07777
+      chmod "a-t,a-s", 'tmp/a'
+      assert_equal 0500, File.stat('tmp/a').mode & 07777
+    end
+
   end if have_file_perm?
 
 

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