conduit r1871 - in trunk: . conduit scripts

[jstowers svn gnome org]

Author: jstowers
Date: Fri Feb 13 09:34:13 2009
New Revision: 1871
URL: http://svn.gnome.org/viewvc/conduit?rev=1871&view=rev

Log:
2009-02-13  John Stowers  <john stowers gmail com>

	* scripts/continuous-tester.sh: Can now
	specify the args to pass to run_tests.sh script.

	* conduit/Vfs.py: Dont strip '/' from URIs,
	it breaks lots. Techinically I think we should
	still strip them from the filename, but I m not sure.
	The tests pass and it fixes #571540



Modified:
   trunk/ChangeLog
   trunk/conduit/Vfs.py
   trunk/scripts/continuous-tester.sh

Modified: trunk/conduit/Vfs.py
==============================================================================
--- trunk/conduit/Vfs.py	(original)
+++ trunk/conduit/Vfs.py	Fri Feb 13 09:34:13 2009
@@ -146,11 +146,11 @@
     import string
 
     ILLEGAL_CHARS = {
-        "fat"       :   "\\:*?\"<>|/",
-        "vfat"      :   "\\:*?\"<>|/",
-        "msdos"     :   "\\:*?\"<>|/",
-        "msdosfs"   :   "\\:*?\"<>|/",
-        "ntfs"      :   "\\:*?\"<>|/"
+        "fat"       :   "\\:*?\"<>|",
+        "vfat"      :   "\\:*?\"<>|",
+        "msdos"     :   "\\:*?\"<>|",
+        "msdosfs"   :   "\\:*?\"<>|",
+        "ntfs"      :   "\\:*?\"<>|"
     }
 
     illegal = ILLEGAL_CHARS.get(filesystem,None)

Modified: trunk/scripts/continuous-tester.sh
==============================================================================
--- trunk/scripts/continuous-tester.sh	(original)
+++ trunk/scripts/continuous-tester.sh	Fri Feb 13 09:34:13 2009
@@ -3,8 +3,8 @@
 TEST_DIR='/home/john/testing/conduit'
 LOGFILE='/home/john/testing/conduit-test.log'
 SVN_REPO='http://svn.gnome.org/svn/conduit/trunk'
-TEST_OPTIONS='cuDSN'
 SLEEP_TIME='1h'
+DEFAULT_TEST_OPTIONS='cuDSN'
 
 ME=`basename $0`
 USAGE="\
@@ -17,6 +17,7 @@
 \t-d\t\tDisable buliding of documentation\n\
 \t-l\t\tRun in a never ending loop\n\
 \t-b\t\tRun with dbus-launch\n\
+\t-o [options]\tRun tests with the specified options [default: $DEFAULT_TEST_OPTIONS]\n\
 \t-h\t\tShow this help message\n"
 
 FORCE=no
@@ -24,7 +25,8 @@
 CNT=-1
 LOOP=no
 DBUS_LAUNCH=''
-while getopts "fdlbh" options
+TEST_OPTIONS=$DEFAULT_TEST_OPTIONS
+while getopts "fdlbho:" options
 do
     case $options in
         f )     FORCE=yes;;
@@ -32,6 +34,7 @@
         l )     LOOP=yes
                 CNT=1;;
         b )     DBUS_LAUNCH=dbus-launch;;
+        o )     TEST_OPTIONS=$OPTARG;;
         h )     echo -e $USAGE
                 exit 0;;
         * )     echo -e $USAGE