[csw-devel] SF.net SVN: gar:[17019] csw/mgar/pkg/ruby19/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sat Feb 11 04:11:54 CET 2012


Revision: 17019
          http://gar.svn.sourceforge.net/gar/?rev=17019&view=rev
Author:   bdwalton
Date:     2012-02-11 03:11:54 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
ruby19/trunk: patch around a solaris chmod() platform difference in the test suite; build for sol10+ only for now

Modified Paths:
--------------
    csw/mgar/pkg/ruby19/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2012-02-10 16:24:31 UTC (rev 17018)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2012-02-11 03:11:54 UTC (rev 17019)
@@ -4,6 +4,8 @@
 CATEGORIES = lang
 GARTYPE = v2
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 # Working with Jens Deppe, we've determined that the two failing tests
 # in 1.9.1p376 are bad tests (as documented here[1] and here[2]).
 # They make assumptions about kernel behaviour that don't hold for
@@ -78,6 +80,7 @@
 MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/1.9/
 DISTFILES  = $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Skip-a-chmod-fileutils-test-on-solaris.patch
 PATCHFILES += 0003-Use-echo-port-instead-of-http-for-gem-server-test.patch
 
 # We define upstream file regex so we can be notifed of new upstream

Added: csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch
===================================================================
--- csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/ruby19/trunk/files/0001-Skip-a-chmod-fileutils-test-on-solaris.patch	2012-02-11 03:11:54 UTC (rev 17019)
@@ -0,0 +1,29 @@
+From 884a805cc4484712dc72ded825d3a8e5f399d8a6 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 11 Feb 2012 02:20:57 +0100
+Subject: [PATCH] Skip a chmod fileutils test on solaris
+
+Setting sticky bits on regular files doesn't work, so add solaris to
+the list of systems where this fileutils mode setting test is skipped.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ test/fileutils/test_fileutils.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
+index 70a6fb8..271a5e8 100644
+--- a/test/fileutils/test_fileutils.rb
++++ b/test/fileutils/test_fileutils.rb
+@@ -914,7 +914,7 @@ class TestFileUtils
+     # regular file. It's slightly strange. Anyway it's no effect bit.
+     # see /usr/src/sys/ufs/ufs/ufs_chmod()
+     # NetBSD and OpenBSD also denies it.
+-    if /freebsd|netbsd|openbsd/ !~ RUBY_PLATFORM
++    if /solaris|freebsd|netbsd|openbsd/ !~ 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'
+-- 
+1.7.8.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list