<!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>[141417] trunk/base/tests/test/trace</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="https://trac.macports.org/changeset/141417">141417</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-10-17 17:37:12 -0700 (Sat, 17 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: test/trace: Adapt to new output format
Trace mode no longer prints a message for each trace violation; Adjust the
expected output accordigly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseteststesttraceMakefile">trunk/base/tests/test/trace/Makefile</a></li>
<li><a href="#trunkbaseteststesttracePortfile">trunk/base/tests/test/trace/Portfile</a></li>
<li><a href="#trunkbaseteststesttracemaster">trunk/base/tests/test/trace/master</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseteststesttraceMakefile"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/trace/Makefile (141416 => 141417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/trace/Makefile 2015-10-18 00:09:35 UTC (rev 141416)
+++ trunk/base/tests/test/trace/Makefile 2015-10-18 00:37:12 UTC (rev 141417)
</span><span class="lines">@@ -18,16 +18,15 @@
</span><span class="cx"> @rm -f /tmp/hello-trace
</span><span class="cx"> @ln -sf /usr/include/unistd.h /tmp/link-trace2
</span><span class="cx"> @-[ "`id -u`" == "0" ] && chown -h $(RUNUSR) /tmp/link-trace2
</span><del>- @PORTSRC=$(PORTSRC) $(bindir)/port -t test > output 2>&1 || (cat output; exit 1)
</del><ins>+ @PORTSRC=$(PORTSRC) $(bindir)/port -vt test > output 2>&1 || (cat output; exit 1)
</ins><span class="cx"> @rm -f /tmp/link-trace2
</span><span class="cx"> @rm -f /tmp/hello-trace
</span><span class="cx"> @rm -rf ../tracetesttmp
</span><del>- @sed -e "s|$(PWD)|PWD|g" < output > output.sed
- @diff -u master output.sed 2>&1 | tee difference
</del><ins>+ @diff -u master output 2>&1 | tee difference
</ins><span class="cx"> @if [ -s difference ]; then \
</span><span class="cx"> exit 1; \
</span><span class="cx"> else \
</span><del>- rm -f difference output.sed; \
</del><ins>+ rm -f difference output; \
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> clean::
</span></span></pre></div>
<a id="trunkbaseteststesttracePortfile"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/trace/Portfile (141416 => 141417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/trace/Portfile 2015-10-18 00:09:35 UTC (rev 141416)
+++ trunk/base/tests/test/trace/Portfile 2015-10-18 00:37:12 UTC (rev 141417)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> if {![catch $operation]} {
</span><span class="cx"> ui_error "Operation ${operation} succeeded although it should have failed!"
</span><span class="cx"> error "test failure"
</span><ins>+ } else {
+ ui_info "${operation} failed as expected"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> # the port directory is outside of the sandbox; make sure files can't be
</span></span></pre></div>
<a id="trunkbaseteststesttracemaster"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/trace/master (141416 => 141417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/trace/master 2015-10-18 00:09:35 UTC (rev 141416)
+++ trunk/base/tests/test/trace/master 2015-10-18 00:37:12 UTC (rev 141417)
</span><span class="lines">@@ -4,9 +4,31 @@
</span><span class="cx"> ---> Configuring trace
</span><span class="cx"> ---> Building trace
</span><span class="cx"> ---> Testing trace
</span><del>-Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/create-trace
-Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/create-trace-modenv
-Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/delete-trace
-Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/mkdir-trace
-Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/rename-trace
-Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/rmdir-trace
</del><ins>+touch: ../tracetesttmp/create-trace: No such file or directory
+Command failed: touch ../tracetesttmp/create-trace
+Exit code: 1
+system "touch ../tracetesttmp/create-trace" failed as expected
+rm: ../tracetesttmp/delete-trace: No such file or directory
+Command failed: rm ../tracetesttmp/delete-trace
+Exit code: 1
+system "rm ../tracetesttmp/delete-trace" failed as expected
+ln: ../tracetesttmp/link-trace: No such file or directory
+Command failed: ln -s /usr/include/ ../tracetesttmp/link-trace
+Exit code: 1
+system "ln -s /usr/include/ ../tracetesttmp/link-trace" failed as expected
+mkdir: ../tracetesttmp: No such file or directory
+Command failed: mkdir ../tracetesttmp/mkdir-trace
+Exit code: 1
+system "mkdir ../tracetesttmp/mkdir-trace" failed as expected
+rmdir: ../tracetesttmp/rmdir-trace: No such file or directory
+Command failed: rmdir ../tracetesttmp/rmdir-trace
+Exit code: 1
+system "rmdir ../tracetesttmp/rmdir-trace" failed as expected
+mv: rename ../tracetesttmp/rename-trace to ../tracetesttmp/rename-new-trace: No such file or directory
+Command failed: mv ../tracetesttmp/rename-trace ../tracetesttmp/rename-new-trace
+Exit code: 1
+system "mv ../tracetesttmp/rename-trace ../tracetesttmp/rename-new-trace" failed as expected
+touch: ../tracetesttmp/create-trace-modenv: No such file or directory
+Command failed: DYLD_INSERT_LIBRARIES= touch ../tracetesttmp/create-trace-modenv
+Exit code: 1
+system "DYLD_INSERT_LIBRARIES= touch ../tracetesttmp/create-trace-modenv" failed as expected
</ins></span></pre>
</div>
</div>
</body>
</html>