[CalendarServer-changes] [5640] CalendarServer/trunk/test

[source_changes at macosforge.org]

Revision: 5640
          http://trac.macosforge.org/projects/calendarserver/changeset/5640
Author:   wsanchez at apple.com
Date:     2010-05-21 16:03:10 -0700 (Fri, 21 May 2010)
Log Message:
-----------
We don't require ../Twisted any more.

Modified Paths:
--------------
    CalendarServer/trunk/test

Modified: CalendarServer/trunk/test
===================================================================
--- CalendarServer/trunk/test	2010-05-21 21:41:24 UTC (rev 5639)
+++ CalendarServer/trunk/test	2010-05-21 23:03:10 UTC (rev 5640)
@@ -62,7 +62,11 @@
 done;
 shift $((${OPTIND} - 1));
 
-twisted="$(cd "${wd}/.." && pwd -L)/Twisted";
+if [ -d "${wd}/../Twisted" ]; then
+  trial="${wd}/../Twisted/bin/trial";
+else
+  trial="$(type -p trial)";
+fi;
 
 export PYTHONPATH="$("${wd}/run" -p)";
 
@@ -72,4 +76,4 @@
     test_modules="calendarserver twistedcaldav twext txdav txcaldav txcarddav ${m_twisted}";
 fi;
 
-cd "${wd}" && "${python}" "${twisted}/bin/trial" --rterrors ${random} ${until_fail} ${no_colour} ${coverage} ${test_modules};
+cd "${wd}" && "${python}" "${trial}" --rterrors ${random} ${until_fail} ${no_colour} ${coverage} ${test_modules};
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100521/ff917dcf/attachment.html>