<!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>[146710] trunk/base/src/macports1.0/tests</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/146710">146710</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-03-15 09:53:03 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>macports1.0/tests: Move initialization of custom prefix to library</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10testslibrarytcl">trunk/base/src/macports1.0/tests/library.tcl</a></li>
<li><a href="#trunkbasesrcmacports10testsmacportstest">trunk/base/src/macports1.0/tests/macports.test</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10testslibrarytcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/library.tcl (146709 => 146710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/tests/library.tcl 2016-03-15 16:40:48 UTC (rev 146709)
+++ trunk/base/src/macports1.0/tests/library.tcl 2016-03-15 16:53:03 UTC (rev 146710)
</span><span class="lines">@@ -63,3 +63,25 @@
</span><span class="cx"> # We don't need to handle portinterp_deferred_options, they're
</span><span class="cx"> # automatically handled correctly.
</span><span class="cx"> }
</span><ins>+
+# Set up a custom environment with its own configuration
+proc init_tmp_prefix {srcpath dstpath} {
+ global env
+
+ # use custom macports.conf and sources.conf
+ makeDirectory $dstpath
+ makeDirectory $dstpath/share
+ makeDirectory $dstpath/var/macports/registry
+ set fd [open $dstpath/macports.conf w+]
+ puts $fd "portdbpath $dstpath/var/macports"
+ puts $fd "prefix $dstpath"
+ puts $fd "variants_conf $dstpath/variants.conf"
+ puts $fd "sources_conf $srcpath/sources.conf"
+ puts $fd "applications_dir $dstpath/Applications"
+ puts $fd "frameworks_dir $dstpath/Library/Frameworks"
+ close $fd
+ file link -symbolic $dstpath/share/macports $macports::autoconf::prefix/share/macports
+ close [open $dstpath/variants.conf w+]
+
+ set env(PORTSRC) $dstpath/macports.conf
+}
</ins></span></pre></div>
<a id="trunkbasesrcmacports10testsmacportstest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports.test (146709 => 146710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/tests/macports.test 2016-03-15 16:40:48 UTC (rev 146709)
+++ trunk/base/src/macports1.0/tests/macports.test 2016-03-15 16:53:03 UTC (rev 146710)
</span><span class="lines">@@ -12,36 +12,22 @@
</span><span class="cx"> testConstraint darwin [expr {$macports::autoconf::os_platform eq "darwin"}]
</span><span class="cx">
</span><span class="cx"> package require macports 1.0
</span><ins>+package require Thread
</ins><span class="cx">
</span><ins>+source ./library.tcl
+
</ins><span class="cx"> # clean leftovers from interrupted tests
</span><span class="cx"> file delete -force $pwd/tmpdir
</span><ins>+# use a local, temporary prefix for testing
+init_tmp_prefix $pwd $pwd/tmpdir
</ins><span class="cx">
</span><del>-# use custom macports.conf and sources.conf
-makeDirectory $pwd/tmpdir
-makeDirectory $pwd/tmpdir/share
-makeDirectory $pwd/tmpdir/var/macports/registry
-set fd [open $pwd/tmpdir/macports.conf w+]
-puts $fd "portdbpath $pwd/tmpdir/var/macports"
-puts $fd "prefix $pwd/tmpdir"
-puts $fd "variants_conf $pwd/tmpdir/variants.conf"
-puts $fd "sources_conf $pwd/sources.conf"
-puts $fd "applications_dir $pwd/tmpdir/Applications"
-puts $fd "frameworks_dir $pwd/tmpdir/Library/Frameworks"
-close $fd
-set env(PORTSRC) $pwd/tmpdir/macports.conf
-file link -symbolic $pwd/tmpdir/share/macports $macports::autoconf::prefix/share/macports
-close [open $pwd/tmpdir/variants.conf w+]
-
</del><span class="cx"> # Debug options
</span><span class="cx"> array set ui_options {}
</span><span class="cx"> #set ui_options(ports_debug) yes
</span><span class="cx"> #set ui_options(ports_verbose) yes
</span><span class="cx"> mportinit ui_options
</span><span class="cx">
</span><del>-package require Thread
-source ./library.tcl
</del><span class="cx">
</span><del>-
</del><span class="cx"> test mportclose {
</span><span class="cx"> Mport close unit test.
</span><span class="cx"> } -setup {
</span></span></pre>
</div>
</div>
</body>
</html>