<!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>[12440] CalendarServer/trunk</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/12440">12440</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 17:47:53 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More to bin/</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbinbenchmark">CalendarServer/trunk/bin/benchmark</a></li>
<li><a href="#CalendarServertrunkbinbenchreport">CalendarServer/trunk/bin/benchreport</a></li>
<li><a href="#CalendarServertrunkbinsim">CalendarServer/trunk/bin/sim</a></li>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbenchmark">CalendarServer/trunk/benchmark</a></li>
<li><a href="#CalendarServertrunkbenchreport">CalendarServer/trunk/benchreport</a></li>
<li><a href="#CalendarServertrunksim">CalendarServer/trunk/sim</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbenchmark"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/benchmark (12439 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/benchmark        2014-01-24 01:46:22 UTC (rev 12439)
+++ CalendarServer/trunk/benchmark        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-#!/bin/sh
-
-##
-# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e;
-set -u;
-
-wd="$(cd "$(dirname "$0")" && pwd -L)";
-
-export PYTHONPATH="$("${wd}/run" -p)";
-
-exec "${wd}/contrib/performance/benchmark" "$@";
</del></span></pre></div>
<a id="CalendarServertrunkbenchreport"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/benchreport (12439 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/benchreport        2014-01-24 01:46:22 UTC (rev 12439)
+++ CalendarServer/trunk/benchreport        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-#!/bin/sh
-
-##
-# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e;
-set -u;
-
-wd="$(cd "$(dirname "$0")" && pwd -L)";
-
-export PYTHONPATH="$("${wd}/run" -p):${wd}/../CalDAVClientLibrary/src";
-
-args="$@"
-
-echo "Parameter: 1";
-"${wd}/contrib/performance/report" ${args} 1 HTTP summarize;
-echo;
-echo "Parameter: 9";
-"${wd}/contrib/performance/report" ${args} 9 HTTP summarize;
-echo;
-echo "Parameter: 81";
-"${wd}/contrib/performance/report" ${args} 81 HTTP summarize;
</del></span></pre></div>
<a id="CalendarServertrunkbinbenchmarkfromrev12437CalendarServertrunkbenchmark"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/bin/benchmark (from rev 12437, CalendarServer/trunk/benchmark) (0 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/benchmark         (rev 0)
+++ CalendarServer/trunk/bin/benchmark        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+#!/bin/sh
+
+##
+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e;
+set -u;
+
+wd="$(cd "$(dirname "$0")" && pwd -L)";
+
+export PYTHONPATH="$("${wd}/run" -p)";
+
+exec "${wd}/contrib/performance/benchmark" "$@";
</ins></span></pre></div>
<a id="CalendarServertrunkbinbenchreportfromrev12437CalendarServertrunkbenchreport"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/bin/benchreport (from rev 12437, CalendarServer/trunk/benchreport) (0 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/benchreport         (rev 0)
+++ CalendarServer/trunk/bin/benchreport        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+#!/bin/sh
+
+##
+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e;
+set -u;
+
+wd="$(cd "$(dirname "$0")" && pwd -L)";
+
+export PYTHONPATH="$("${wd}/run" -p):${wd}/../CalDAVClientLibrary/src";
+
+args="$@"
+
+echo "Parameter: 1";
+"${wd}/contrib/performance/report" ${args} 1 HTTP summarize;
+echo;
+echo "Parameter: 9";
+"${wd}/contrib/performance/report" ${args} 9 HTTP summarize;
+echo;
+echo "Parameter: 81";
+"${wd}/contrib/performance/report" ${args} 81 HTTP summarize;
</ins></span></pre></div>
<a id="CalendarServertrunkbinsimfromrev12437CalendarServertrunksim"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/bin/sim (from rev 12437, CalendarServer/trunk/sim) (0 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/sim         (rev 0)
+++ CalendarServer/trunk/bin/sim        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+#!/bin/sh
+
+##
+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e;
+set -u;
+
+wd="$(cd "$(dirname "$0")" && pwd -L)";
+
+source "${wd}/support/shell.sh";
+
+export PYTHONPATH="$("${wd}/run" -p)";
+
+exec "${wd}/contrib/performance/sim" "$@";
</ins></span></pre></div>
<a id="CalendarServertrunkbintestserverfromrev12437CalendarServertrunktestserver"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/bin/testserver (from rev 12437, CalendarServer/trunk/testserver) (0 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver         (rev 0)
+++ CalendarServer/trunk/bin/testserver        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+#!/usr/bin/env bash
+
+##
+# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+wd="$(cd "$(dirname "$0")" && pwd)";
+cdt="${wd}/../CalDAVTester";
+
+##
+# Command line handling
+##
+
+verbose="";
+serverinfo="${cdt}/scripts/server/serverinfo.xml";
+printres="";
+subdir="";
+random="--random";
+seed="";
+ssl="";
+
+usage ()
+{
+ program="$(basename "$0")";
+ echo "Usage: ${program} [-v] [-s serverinfo]";
+ echo "Options:";
+ echo " -d Set the script subdirectory";
+ echo " -h Print this help and exit";
+ echo " -o Execute tests in order";
+ echo " -r Print request and response";
+ echo " -s Set the serverinfo.xml";
+ echo " -t Set the CalDAVTester directory";
+ echo " -x Random seed to use.";
+ echo " -v Verbose.";
+ echo " -z Use SSL.";
+
+ if [ "${1-}" == "-" ]; then return 0; fi;
+ exit 64;
+}
+
+while getopts 'hvrozt:s:d:x:' option; do
+ case "$option" in
+ '?') usage; ;;
+ 'h') usage -; exit 0; ;;
+ 't') cdt="${OPTARG}"; serverinfo="${OPTARG}/scripts/server/serverinfo.xml"; ;;
+ 'd') subdir="--subdir=${OPTARG}"; ;;
+ 's') serverinfo="${OPTARG}"; ;;
+ 'r') printres="--always-print-request --always-print-response"; ;;
+ 'v') verbose="v"; ;;
+ 'o') random=""; ;;
+ 'x') seed="--random-seed ${OPTARG}"; ;;
+ 'z') ssl="--ssl"; ;;
+ esac;
+done;
+
+shift $((${OPTIND} - 1));
+
+if [ $# == 0 ]; then
+ set - "--all";
+fi;
+
+##
+# Do The Right Thing
+##
+
+source "${wd}/support/shell.sh";
+
+cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
+
</ins></span></pre></div>
<a id="CalendarServertrunksim"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/sim (12439 => 12440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/sim        2014-01-24 01:46:22 UTC (rev 12439)
+++ CalendarServer/trunk/sim        2014-01-24 01:47:53 UTC (rev 12440)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-#!/bin/sh
-
-##
-# Copyright (c) 2005-2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-set -e;
-set -u;
-
-wd="$(cd "$(dirname "$0")" && pwd -L)";
-
-source "${wd}/support/shell.sh";
-
-export PYTHONPATH="$("${wd}/run" -p)";
-
-exec "${wd}/contrib/performance/sim" "$@";
</del></span></pre>
</div>
</div>
</body>
</html>