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

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:22:00 PDT 2014


Revision: 11998
          http://trac.calendarserver.org//changeset/11998
Author:   wsanchez at apple.com
Date:     2013-11-22 17:54:26 -0800 (Fri, 22 Nov 2013)
Log Message:
-----------
Use bin/trial.

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

Modified: CalendarServer/trunk/test
===================================================================
--- CalendarServer/trunk/test	2013-11-23 01:50:52 UTC (rev 11997)
+++ CalendarServer/trunk/test	2013-11-23 01:54:26 UTC (rev 11998)
@@ -21,7 +21,7 @@
 
 wd="$(cd "$(dirname "$0")" && pwd -L)";
 
-. "${wd}/support/build.sh";
+#. "${wd}/support/build.sh";
 
 do_setup="false";
 do_get="false";
@@ -74,9 +74,6 @@
 
 export PYTHONPATH="${wd}:${PYTHONPATH:-}";
 
-dependencies;
-trial="$(type -p trial)";
-
 if [ $# -gt 0 ]; then
   test_modules="$@";
   flaky=true;
@@ -88,7 +85,7 @@
 find "${wd}" -name \*.pyc -print0 | xargs -0 rm;
 
 mkdir -p "${wd}/data";
-cd "${wd}" && "${python}" "${trial}" --temp-directory="${wd}/data/trial" --rterrors ${reactor} ${random} ${until_fail} ${no_colour} ${coverage} ${numjobs} ${test_modules};
+cd "${wd}" && "${wd}/bin/trial" --temp-directory="${wd}/data/trial" --rterrors ${reactor} ${random} ${until_fail} ${no_colour} ${coverage} ${numjobs} ${test_modules};
 
 if ${flaky}; then
   echo "";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/8f568da0/attachment.html>


More information about the calendarserver-changes mailing list