[CalendarServer-changes] [1051] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1051
          http://trac.macosforge.org/projects/calendarserver/changeset/1051
Author:   tfitz at apple.com
Date:     2007-01-16 10:30:59 -0800 (Tue, 16 Jan 2007)

Log Message:
-----------
./test now supports black and white mode (for the buildbot).
The bash scripts now properly displays invalid arguments.

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/run
    CalendarServer/trunk/support/submit
    CalendarServer/trunk/test

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2007-01-16 14:33:08 UTC (rev 1050)
+++ CalendarServer/trunk/bin/caldavd	2007-01-16 18:30:59 UTC (rev 1051)
@@ -77,7 +77,7 @@
 {
     program="$(basename "$0")";
     
-    if [ "${1--}" != "-" ]; then echo "${1}"; echo; fi;
+    if [ "${1--}" != "-" ]; then echo "$@"; echo; fi;
 
     echo "Usage: ${program} [-hX] [-u username] [-g groupname] [-T twistd] [-t type] [-f caldavd.plist]";
     echo "Options:";

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2007-01-16 14:33:08 UTC (rev 1050)
+++ CalendarServer/trunk/run	2007-01-16 18:30:59 UTC (rev 1051)
@@ -41,7 +41,7 @@
 {
   program="$(basename "$0")";
 
-  if [ "${1--}" != "-" ]; then echo "${1}"; echo; fi;
+  if [ "${1--}" != "-" ]; then echo "$@"; echo; fi;
 
   echo "Usage: ${program} [-hvsf] [-iI dst]";
   echo "Options:";

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2007-01-16 14:33:08 UTC (rev 1050)
+++ CalendarServer/trunk/support/submit	2007-01-16 18:30:59 UTC (rev 1051)
@@ -40,7 +40,7 @@
 {
   program="$(basename "$0")";
 
-  if [ "${1-}" != "-" ]; then echo "$1"; echo; fi;
+  if [ "${1-}" != "-" ]; then echo "$@"; echo; fi;
 
   echo "Usage: ${program} release";
   echo "       ${program} -b";

Modified: CalendarServer/trunk/test
===================================================================
--- CalendarServer/trunk/test	2007-01-16 14:33:08 UTC (rev 1050)
+++ CalendarServer/trunk/test	2007-01-16 18:30:59 UTC (rev 1051)
@@ -18,6 +18,34 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
+usage ()
+{
+  program="$(basename "$0")";
+
+  if [ "${1--}" != "-" ]; then echo "$@"; echo; fi;
+
+  echo "Usage: ${program} [-hn]";
+  echo "Options:";
+  echo "        -h  Print this help and exit";
+  echo "        -n  Do not use color";
+
+  if [ "${1-}" == "-" ]; then return 0; fi;
+  exit 64;
+}
+
+
+while getopts 'nh' option; do
+  case "$option" in
+    '?') usage; ;;
+    'h') usage -; exit 0; ;;
+    'n') trial_args="--reporter=bwverbose"; ;;
+  esac;
+done;
+shift $((${OPTIND} - 1));
+
+if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi;
+
+
      wd="$(cd "$(dirname "$0")" && pwd -L)";
 twisted="$(cd "${wd}/.." && pwd -L)/Twisted";
 
@@ -31,4 +59,4 @@
     test_modules="twistedcaldav";
 fi;
 
-cd "${wd}" && "${twisted}/bin/trial" ${test_modules};
+cd "${wd}" && "${twisted}/bin/trial" ${trial_args} ${test_modules};

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070116/46abdbbd/attachment.html