[CalendarServer-changes] [14334] CalendarServer/trunk/bin/test

[source_changes at macosforge.org]

Revision: 14334
          http://trac.calendarserver.org//changeset/14334
Author:   wsanchez at apple.com
Date:     2015-01-21 14:10:45 -0800 (Wed, 21 Jan 2015)
Log Message:
-----------
Add -L option

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

Modified: CalendarServer/trunk/bin/test
===================================================================
--- CalendarServer/trunk/bin/test	2015-01-21 19:57:08 UTC (rev 14333)
+++ CalendarServer/trunk/bin/test	2015-01-21 22:10:45 UTC (rev 14334)
@@ -38,6 +38,7 @@
 
 do_setup="false";
   do_get="false";
+ viewlog="false";
 
     random="--random=$(date "+%s")";
   no_color="";
@@ -58,18 +59,19 @@
 
   echo "Usage: ${program} [options]";
   echo "Options:";
-  echo "        -h  Print this help and exit";
-  echo "        -n  Do not use color";
-  echo "        -o  Do not run tests in random order.";
-  echo "        -r<num>  Use specified seed to determine order.";
-  echo "        -u  Run until the tests fail.";
-  echo "        -c  Generate coverage reports.";
+  echo "        -h         Print this help and exit";
+  echo "        -n         Do not use color";
+  echo "        -o         Do not run tests in random order.";
+  echo "        -r <seed>  Use specified seed to determine order.";
+  echo "        -u         Run until the tests fail.";
+  echo "        -c         Generate coverage reports.";
+  echo "        -L         Show logging output in a separate view.";
 
   if [ "${1-}" == "-" ]; then return 0; fi;
   exit 64;
 }
 
-while getopts "nhoucr:j:" option; do
+while getopts "hor:nucj:L" option; do
   case "${option}" in
     '?') usage; ;;
     'h') usage -; exit 0; ;;
@@ -79,6 +81,7 @@
     'u') until_fail="--until-failure"; ;;
     'c')   coverage="--coverage"; ;;
     'j')    numjobs="-j $OPTARG"; ;;
+    'L')    viewlog="true";
   esac;
 done;
 shift $((${OPTIND} - 1));
@@ -104,6 +107,25 @@
 # Unit tests
 #
 
+trial_temp="${dev_home}/trial";
+
+if "${viewlog}"; then
+  if [ "${TERM_PROGRAM}" = "Apple_Terminal" ]; then
+    if [ ! -d "${trial_temp}" ]; then
+      mkdir "${trial_temp}";
+    fi;
+
+    touch "${trial_temp}/_trial_marker";
+    cp /dev/null "${trial_temp}/test.log";
+
+    open -a Console "${trial_temp}/test.log";
+  else
+    echo "Unable to view log.";
+  fi;
+fi;
+
+error=0;
+
 if [ $# -eq 0 ]; then
   lint="true";
   # Test these modules with a single invocation of trial
@@ -118,7 +140,8 @@
     ${no_color}                                       \
     ${coverage}                                       \
     ${numjobs}                                        \
-    "$@";
+    "$@"                                              \
+    || error=$?;
 else
   lint="false";
   # Loop over the passed-in modules
@@ -136,22 +159,24 @@
       ${no_color}                                       \
       ${coverage}                                       \
       ${numjobs}                                        \
-      "${module}";
+      "${module}"                                       \
+      || error=$? ;
   done;
 fi;
 
-
-
-if ! "${lint}"; then
-  exit 0;
+if [ ${error} -ne 0 ]; then
+  exit ${error};
 fi;
 
 
-
 #
 # Linting
 #
 
+if ! "${lint}"; then
+  exit 0;
+fi;
+
 echo "";
 echo "Running pyflakes...";
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150121/cdceedc1/attachment.html>