[CalendarServer-changes] [13482] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 13482
          http://trac.calendarserver.org//changeset/13482
Author:   sagen at apple.com
Date:     2014-05-15 18:44:14 -0700 (Thu, 15 May 2014)
Log Message:
-----------
Use calendar server's python for the other scripts as well

Modified Paths:
--------------
    CalDAVTester/trunk/QuickLook-CalDAV
    CalDAVTester/trunk/QuickLook-CardDAV
    CalDAVTester/trunk/Validation-All
    CalDAVTester/trunk/Validation-CalDAV
    CalDAVTester/trunk/Validation-CardDAV

Modified: CalDAVTester/trunk/QuickLook-CalDAV
===================================================================
--- CalDAVTester/trunk/QuickLook-CalDAV	2014-05-16 01:41:58 UTC (rev 13481)
+++ CalDAVTester/trunk/QuickLook-CalDAV	2014-05-16 01:44:14 UTC (rev 13482)
@@ -19,8 +19,7 @@
 # Runs a subset of tests as a quick check that the server is functional.
 #
 
-export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
-./testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml -o cdt.txt \
+/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/python testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml -o cdt.txt \
 	CalDAV/caldavIOP.xml \
 	CalDAV/errors.xml \
 	CalDAV/get.xml \

Modified: CalDAVTester/trunk/QuickLook-CardDAV
===================================================================
--- CalDAVTester/trunk/QuickLook-CardDAV	2014-05-16 01:41:58 UTC (rev 13481)
+++ CalDAVTester/trunk/QuickLook-CardDAV	2014-05-16 01:44:14 UTC (rev 13482)
@@ -19,8 +19,7 @@
 # Runs a subset of tests as a quick check that the server is functional.
 #
 
-export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
-./testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml -o cdt.txt \
+/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/python testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml -o cdt.txt \
 	CardDAV/ab-client.xml \
 	CardDAV/errors.xml \
 	CardDAV/get.xml \

Modified: CalDAVTester/trunk/Validation-All
===================================================================
--- CalDAVTester/trunk/Validation-All	2014-05-16 01:41:58 UTC (rev 13481)
+++ CalDAVTester/trunk/Validation-All	2014-05-16 01:44:14 UTC (rev 13482)
@@ -16,12 +16,11 @@
 # limitations under the License.
 ##
 #
-# Runs a full set of tests for CalDAV and CardDAV to verify that the 
+# Runs a full set of tests for CalDAV and CardDAV to verify that the
 # server is functional.
 #
 
-export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
-./testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all -o cdt.txt \
+/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/python testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all -o cdt.txt \
 	--exclude CalDAV/directory.xml \
 	--exclude CalDAV/proxyauthz.xml \
 	--exclude CalDAV/quota.xml \

Modified: CalDAVTester/trunk/Validation-CalDAV
===================================================================
--- CalDAVTester/trunk/Validation-CalDAV	2014-05-16 01:41:58 UTC (rev 13481)
+++ CalDAVTester/trunk/Validation-CalDAV	2014-05-16 01:44:14 UTC (rev 13482)
@@ -19,8 +19,7 @@
 # Runs a full set of tests to verify that the server is functional.
 #
 
-export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
-./testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all -o cdt.txt \
+/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/python testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all -o cdt.txt \
 	--subdir CalDAV \
 	--exclude CalDAV/directory.xml \
 	--exclude CalDAV/proxyauthz.xml \

Modified: CalDAVTester/trunk/Validation-CardDAV
===================================================================
--- CalDAVTester/trunk/Validation-CardDAV	2014-05-16 01:41:58 UTC (rev 13481)
+++ CalDAVTester/trunk/Validation-CardDAV	2014-05-16 01:44:14 UTC (rev 13482)
@@ -19,7 +19,6 @@
 # Runs a full set of tests to verify that the server is functional.
 #
 
-export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
-./testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all -o cdt.txt \
+/Applications/Server.app/Contents/ServerRoot/Library/CalendarServer/bin/python testcaldav.py $@ --ssl --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all -o cdt.txt \
 	--subdir CardDAV \
 	--exclude CardDAV/directory.xml
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140515/02a7d2d5/attachment.html>