[CalendarServer-changes] [814] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 814
          http://trac.macosforge.org/projects/calendarserver/changeset/814
Author:   wsanchez at apple.com
Date:     2006-12-12 14:58:18 -0800 (Tue, 12 Dec 2006)

Log Message:
-----------
Um, merged wrong file

Modified Paths:
--------------
    CalendarServer/trunk/run
    CalendarServer/trunk/testcaldav

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2006-12-12 22:57:25 UTC (rev 813)
+++ CalendarServer/trunk/run	2006-12-12 22:58:18 UTC (rev 814)
@@ -171,7 +171,8 @@
   if ! "${setup_only}"; then
     if [ ! -f "${config}" ]; then
         echo "Missing config file: ${config}";
-        echo "You might want to copy conf/caldavd-test.plist to conf/caldavd-dev.plist and start from there.";
+        echo "You might want to start by copying the test configuration:";
+        echo "  cp conf/caldavd-test.plist conf/caldavd-dev.plist";
         exit 1;
     fi;
 

Modified: CalendarServer/trunk/testcaldav
===================================================================
--- CalendarServer/trunk/testcaldav	2006-12-12 22:57:25 UTC (rev 813)
+++ CalendarServer/trunk/testcaldav	2006-12-12 22:58:18 UTC (rev 814)
@@ -19,13 +19,14 @@
 ##
 
 wd="$(cd "$(dirname "$0")" && pwd)";
+cdt="${wd}/../CalDAVTester";
 
 ##
 # Command line handling
 ##
 
 verbose="";
-serverinfo="serverinfo.xml";
+serverinfo="${cdt}/scripts/server/serverinfo.xml";
 documentroot="${wd}/twistedcaldav/test/data";
 
 usage ()
@@ -46,8 +47,8 @@
     case "$option" in 
         '?') usage; ;;
         'h') usage -; exit 0; ;;
-        'd') documentroot=${OPTARG}; ;;
-        's')   serverinfo=${OPTARG}; ;;
+        'd') documentroot="${OPTARG}"; ;;
+        's')   serverinfo="${OPTARG}"; ;;
         'v')      verbose="v"; ;;
     esac;
 done;
@@ -62,17 +63,12 @@
 
 export PYTHONPATH=$("${wd}/run" -p);
 
-cdt="${wd}/../CalDAVTester";
-
 if [ -d "${cdt}" ]; then
   svn update "${cdt}";
 else
   svn checkout http://svn.macosforge.org/repository/calendarserver/CalDAVTester/trunk "${cdt}"
 fi;
 
-cd "${documentroot}/calendars/users/user01/"
-tar -zx${verbose}f "${cdt}/Resource/errors/calendar.1000.tgz"
+tar -C "${documentroot}/calendars/users/user01/" -x${verbose}zf "${cdt}/Resource/errors/calendar.1000.tgz"
 
-cd "${cdt}";
-
-python testcaldav.py -s "${serverinfo}" --all;
+cd "${cdt}" && python testcaldav.py -s "${serverinfo}" --all;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061212/2abb9e7b/attachment.html