[CalendarServer-changes] [13314] CalendarServer/trunk/bin

[source_changes at macosforge.org]

Revision: 13314
          http://trac.calendarserver.org//changeset/13314
Author:   wsanchez at apple.com
Date:     2014-04-17 15:24:24 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
Don't depend on installed scripts for trial and twistd.

Modified Paths:
--------------
    CalendarServer/trunk/bin/test
    CalendarServer/trunk/bin/trial
    CalendarServer/trunk/bin/twistd

Modified: CalendarServer/trunk/bin/test
===================================================================
--- CalendarServer/trunk/bin/test	2014-04-17 22:23:52 UTC (rev 13313)
+++ CalendarServer/trunk/bin/test	2014-04-17 22:24:24 UTC (rev 13314)
@@ -113,17 +113,17 @@
 # Unit tests
 #
 
-cd "${wd}" &&                           \
-  PYTHONPATH="${wd}"                    \
-  "${py_bindir}/trial"                  \
-  --temp-directory="${dev_home}/trial"  \
-  --rterrors                            \
-  ${reactor}                            \
-  ${random}                             \
-  ${until_fail}                         \
-  ${no_color}                           \
-  ${coverage}                           \
-  ${numjobs}                            \
+cd "${wd}" &&                                       \
+  "${python}"                                       \
+  -c "from twisted.scripts.trial import run; run()" \
+  --temp-directory="${dev_home}/trial"              \
+  --rterrors                                        \
+  ${reactor}                                        \
+  ${random}                                         \
+  ${until_fail}                                     \
+  ${no_color}                                       \
+  ${coverage}                                       \
+  ${numjobs}                                        \
   "$@";
 
 

Modified: CalendarServer/trunk/bin/trial
===================================================================
--- CalendarServer/trunk/bin/trial	2014-04-17 22:23:52 UTC (rev 13313)
+++ CalendarServer/trunk/bin/trial	2014-04-17 22:24:24 UTC (rev 13314)
@@ -26,4 +26,6 @@
 
 init_build > /dev/null;
 
-exec "${py_bindir}/trial" "$@";
+exec "${python}"                                    \
+  -c "from twisted.scripts.trial import run; run()" \
+  "$@";

Modified: CalendarServer/trunk/bin/twistd
===================================================================
--- CalendarServer/trunk/bin/twistd	2014-04-17 22:23:52 UTC (rev 13313)
+++ CalendarServer/trunk/bin/twistd	2014-04-17 22:24:24 UTC (rev 13314)
@@ -26,4 +26,6 @@
 
 init_build > /dev/null;
 
-exec "${py_bindir}/twistd" "$@";
+exec "${python}"                                     \
+  -c "from twisted.scripts.twistd import run; run()" \
+  "$@";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140417/20f37474/attachment.html>