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

[source_changes at macosforge.org]

Revision: 13320
          http://trac.calendarserver.org//changeset/13320
Author:   wsanchez at apple.com
Date:     2014-04-18 08:15:53 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
Try again to not require 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-18 15:01:49 UTC (rev 13319)
+++ CalendarServer/trunk/bin/test	2014-04-18 15:15:53 UTC (rev 13320)
@@ -113,17 +113,16 @@
 # 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}" &&                                       \
+  "${wd}/bin/trial"                                 \
+  --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-18 15:01:49 UTC (rev 13319)
+++ CalendarServer/trunk/bin/trial	2014-04-18 15:15:53 UTC (rev 13320)
@@ -26,4 +26,12 @@
 
 init_build > /dev/null;
 
-exec "${py_bindir}/trial" "$@";
+exec "${python}" \
+  -c "\
+import sys;\
+import os;\
+sys.path.insert(0, os.path.abspath(os.getcwd()));\
+from twisted.scripts.trial import run;\
+run()\
+" \
+  "$@";

Modified: CalendarServer/trunk/bin/twistd
===================================================================
--- CalendarServer/trunk/bin/twistd	2014-04-18 15:01:49 UTC (rev 13319)
+++ CalendarServer/trunk/bin/twistd	2014-04-18 15:15:53 UTC (rev 13320)
@@ -26,4 +26,12 @@
 
 init_build > /dev/null;
 
-exec "${py_bindir}/twistd" "$@";
+exec "${python}" \
+  -c "\
+import sys;\
+import os;\
+sys.path.insert(0, os.path.abspath(os.getcwd()));\
+from twisted.scripts.twistd import run;\
+run()\
+" \
+  "$@";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140418/f2d61d21/attachment.html>