<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14334] CalendarServer/trunk/bin/test</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14334">14334</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 14:10:45 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add -L option</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbintest">CalendarServer/trunk/bin/test</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbintest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/test (14333 => 14334)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> do_setup="false";
</span><span class="cx"> do_get="false";
</span><ins>+ viewlog="false";
</ins><span class="cx">
</span><span class="cx"> random="--random=$(date "+%s")";
</span><span class="cx"> no_color="";
</span><span class="lines">@@ -58,18 +59,19 @@
</span><span class="cx">
</span><span class="cx"> echo "Usage: ${program} [options]";
</span><span class="cx"> echo "Options:";
</span><del>- 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.";
</del><ins>+ 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.";
</ins><span class="cx">
</span><span class="cx"> if [ "${1-}" == "-" ]; then return 0; fi;
</span><span class="cx"> exit 64;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-while getopts "nhoucr:j:" option; do
</del><ins>+while getopts "hor:nucj:L" option; do
</ins><span class="cx"> case "${option}" in
</span><span class="cx"> '?') usage; ;;
</span><span class="cx"> 'h') usage -; exit 0; ;;
</span><span class="lines">@@ -79,6 +81,7 @@
</span><span class="cx"> 'u') until_fail="--until-failure"; ;;
</span><span class="cx"> 'c') coverage="--coverage"; ;;
</span><span class="cx"> 'j') numjobs="-j $OPTARG"; ;;
</span><ins>+ 'L') viewlog="true";
</ins><span class="cx"> esac;
</span><span class="cx"> done;
</span><span class="cx"> shift $((${OPTIND} - 1));
</span><span class="lines">@@ -104,6 +107,25 @@
</span><span class="cx"> # Unit tests
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+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;
+
</ins><span class="cx"> if [ $# -eq 0 ]; then
</span><span class="cx"> lint="true";
</span><span class="cx"> # Test these modules with a single invocation of trial
</span><span class="lines">@@ -118,7 +140,8 @@
</span><span class="cx"> ${no_color} \
</span><span class="cx"> ${coverage} \
</span><span class="cx"> ${numjobs} \
</span><del>- "$@";
</del><ins>+ "$@" \
+ || error=$?;
</ins><span class="cx"> else
</span><span class="cx"> lint="false";
</span><span class="cx"> # Loop over the passed-in modules
</span><span class="lines">@@ -136,22 +159,24 @@
</span><span class="cx"> ${no_color} \
</span><span class="cx"> ${coverage} \
</span><span class="cx"> ${numjobs} \
</span><del>- "${module}";
</del><ins>+ "${module}" \
+ || error=$? ;
</ins><span class="cx"> done;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>-
-
-if ! "${lint}"; then
- exit 0;
</del><ins>+if [ ${error} -ne 0 ]; then
+ exit ${error};
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> #
</span><span class="cx"> # Linting
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+if ! "${lint}"; then
+ exit 0;
+fi;
+
</ins><span class="cx"> echo "";
</span><span class="cx"> echo "Running pyflakes...";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>