[csw-devel] SF.net SVN: gar:[6892] csw/mgar/pkg/pysvn/trunk

[wahwah at users.sourceforge.net]

Revision: 6892
          http://gar.svn.sourceforge.net/gar/?rev=6892&view=rev
Author:   wahwah
Date:     2009-10-18 14:15:28 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
pysvn: using CSWbash, disabling tests on Solaris 8 due to lack of UTF-8 locale support

Modified Paths:
--------------
    csw/mgar/pkg/pysvn/trunk/Makefile
    csw/mgar/pkg/pysvn/trunk/checksums
    csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch
    csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch

Modified: csw/mgar/pkg/pysvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pysvn/trunk/Makefile	2009-10-18 10:56:28 UTC (rev 6891)
+++ csw/mgar/pkg/pysvn/trunk/Makefile	2009-10-18 14:15:28 UTC (rev 6892)
@@ -43,12 +43,15 @@
 REQUIRED_PKGS += CSWneon
 REQUIRED_PKGS += CSWsvn
 
-PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel
+PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWsvn-devel CSWapache2-devel CSWbash
 INCOMPATIBELE_PKGS = CSWpyxml
 CONFIGURE_SCRIPTS = pysvn
 BUILD_SCRIPTS = pysvn
 INSTALL_SCRIPTS = pysvn
-TEST_SCRIPTS = pysvn
+TEST_SCRIPTS_5.8 =
+TEST_SCRIPTS_5.9 = pysvn
+TEST_SCRIPTS_5.10 = pysvn
+TEST_SCRIPTS = $(TEST_SCRIPTS_$(GAROSREL))
 CONFIGURE_ARGS = $(DIRPATHS)
 GARCOMPILER = GNU
 

Modified: csw/mgar/pkg/pysvn/trunk/checksums
===================================================================
--- csw/mgar/pkg/pysvn/trunk/checksums	2009-10-18 10:56:28 UTC (rev 6891)
+++ csw/mgar/pkg/pysvn/trunk/checksums	2009-10-18 14:15:28 UTC (rev 6892)
@@ -1,6 +1,6 @@
-b698502c7a43d9623189924f08904c3a  0001-fixes-for-tests.patch
+e6168840de7c75fcecffc6fc7e1831ba  0001-fixes-for-tests.patch
 20381f5964a9fc08b04eb6fc69a47d04  0002-pysvn.hpp-string-includes-first.patch
-64c9418717dee60ed1a613cc7d85c682  0003-bin-bash-instead-of-bin-sh.patch
+2f3e1b6c0ffed9baecdb1e0719748813  0003-bin-bash-instead-of-bin-sh.patch
 a69e791dd03491aca2cfeba83528389a  0005-Use-dash-capital-R-for-runtime-path.patch
 be7690f1395b76f984bf12de84418b68  0006-Use-opt-csw-lib.patch
 ac24c9b4348fd857353d1444c8448d8d  0008-gid-in-two-more-places.patch

Modified: csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch	2009-10-18 10:56:28 UTC (rev 6891)
+++ csw/mgar/pkg/pysvn/trunk/files/0001-fixes-for-tests.patch	2009-10-18 14:15:28 UTC (rev 6892)
@@ -18,7 +18,7 @@
  
  echo Info: Install hooks
 -echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit
-+echo '#!/bin/bash' >${TESTROOT}/repos/hooks/pre-commit
++echo '#!/opt/csw/bin/bash' >${TESTROOT}/repos/hooks/pre-commit
  echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit
  echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit
  echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit

Modified: csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch
===================================================================
--- csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch	2009-10-18 10:56:28 UTC (rev 6891)
+++ csw/mgar/pkg/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch	2009-10-18 14:15:28 UTC (rev 6892)
@@ -1,7 +1,7 @@
 From 848b922929a73b8c9587aec91876da7e544d376d Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
 Date: Sun, 18 Oct 2009 10:38:05 +0100
-Subject: [PATCH 3/3] /bin/bash instead of /bin/sh
+Subject: [PATCH 3/3] /opt/csw/bin/bash instead of /bin/sh
 
 ---
  Tests/test-01.sh |    2 +-
@@ -18,7 +18,7 @@
 +++ b/Tests/test-01.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/opt/csw/bin/bash
  # need to get rid of any symbolic links in the WORKDIR
  export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
  
@@ -28,7 +28,7 @@
 +++ b/Tests/test-03.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/opt/csw/bin/bash
  # need to get rid of any symbolic links in the WORKDIR
  export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
  
@@ -38,7 +38,7 @@
 +++ b/Tests/test-04.sh
 @@ -1,11 +1,11 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/opt/csw/bin/bash
  # need to get rid of any symbolic links in the WORKDIR
  export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
  
@@ -56,7 +56,7 @@
 +++ b/Tests/test-05.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/opt/csw/bin/bash
  # need to get rid of any symbolic links in the WORKDIR
  export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
  
@@ -66,7 +66,7 @@
 +++ b/Tests/test-06.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/opt/csw/bin/bash
  # need to get rid of any symbolic links in the WORKDIR
  export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
  
@@ -76,7 +76,7 @@
 +++ b/Tests/test-07.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
-+#!/bin/bash
++#!/opt/csw/bin/bash
  # need to get rid of any symbolic links in the WORKDIR
  export WORKDIR=$( ${PYTHON} -c 'import os;os.chdir("..");print( os.getcwd() )' )
  


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