[CalendarServer-changes] [355] CalendarServer/branches/users/cdaboo/dropbox

[source_changes at macosforge.org]

Revision: 355
          http://trac.macosforge.org/projects/calendarserver/changeset/355
Author:   cdaboo at apple.com
Date:     2006-11-02 12:30:09 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
merge -r324:351 http://svn.opensource.apple.com/repository/calendarserver/CalendarServer/trunk

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/dropbox/test
    CalendarServer/branches/users/cdaboo/dropbox/testcaldav

Modified: CalendarServer/branches/users/cdaboo/dropbox/test
===================================================================
--- CalendarServer/branches/users/cdaboo/dropbox/test	2006-11-02 20:29:22 UTC (rev 354)
+++ CalendarServer/branches/users/cdaboo/dropbox/test	2006-11-02 20:30:09 UTC (rev 355)
@@ -32,4 +32,4 @@
     test_modules="twistedcaldav.test";
 fi;
 
-cd "${wd}" && "${twisted}/bin/trial" "$@" ${test_modules};
+cd "${wd}" && "${twisted}/bin/trial" ${test_modules};

Modified: CalendarServer/branches/users/cdaboo/dropbox/testcaldav
===================================================================
--- CalendarServer/branches/users/cdaboo/dropbox/testcaldav	2006-11-02 20:29:22 UTC (rev 354)
+++ CalendarServer/branches/users/cdaboo/dropbox/testcaldav	2006-11-02 20:30:09 UTC (rev 355)
@@ -64,9 +64,8 @@
 
 cdt="${wd}/../CalDAVTester";
 
-if [ -f "${cdt}" ]; then
-  cd "${cdt}";
-  svn update .;
+if [ -d "${cdt}" ]; then
+  svn update "${cdt}";
 else
   svn checkout http://svn.macosforge.org/repository/calendarserver/CalDAVTester/trunk "${cdt}"
 fi;

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