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

[source_changes at macosforge.org]

Revision: 13316
          http://trac.calendarserver.org//changeset/13316
Author:   wsanchez at apple.com
Date:     2014-04-17 23:33:45 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
undo r13314

Revision Links:
--------------
    http://trac.calendarserver.org//changeset/13314

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:48:57 UTC (rev 13315)
+++ CalendarServer/trunk/bin/test	2014-04-18 06:33:45 UTC (rev 13316)
@@ -113,17 +113,17 @@
 # Unit tests
 #
 
-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}                                        \
+cd "${wd}" &&                           \
+  PYTHONPATH="${wd}"                    \
+  "${py_bindir}/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-17 22:48:57 UTC (rev 13315)
+++ CalendarServer/trunk/bin/trial	2014-04-18 06:33:45 UTC (rev 13316)
@@ -26,6 +26,4 @@
 
 init_build > /dev/null;
 
-exec "${python}"                                    \
-  -c "from twisted.scripts.trial import run; run()" \
-  "$@";
+exec "${py_bindir}/trial" "$@";

Modified: CalendarServer/trunk/bin/twistd
===================================================================
--- CalendarServer/trunk/bin/twistd	2014-04-17 22:48:57 UTC (rev 13315)
+++ CalendarServer/trunk/bin/twistd	2014-04-18 06:33:45 UTC (rev 13316)
@@ -26,6 +26,4 @@
 
 init_build > /dev/null;
 
-exec "${python}"                                     \
-  -c "from twisted.scripts.twistd import run; run()" \
-  "$@";
+exec "${py_bindir}/twistd" "$@";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140417/ca58d4c9/attachment.html>