<!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>[120186] trunk/base</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/120186">120186</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-05-18 17:05:16 -0700 (Sun, 18 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>use proper testConstraint to avoid running trace mode test on unsupported platforms, and add darwin platform constraint to a couple tests that need it</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseconfigure">trunk/base/configure</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
<li><a href="#trunkbaseteststesttracetesttcl">trunk/base/tests/test/trace/test.tcl</a></li>
<li><a href="#trunkbaseteststestuniversaltesttcl">trunk/base/tests/test/universal/test.tcl</a></li>
<li><a href="#trunkbaseteststestxcodeversiontesttcl">trunk/base/tests/test/xcodeversion/test.tcl</a></li>
<li><a href="#trunkbaseteststesttclin">trunk/base/tests/test.tcl.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbaseteststestlibrarytclin">trunk/base/tests/test/library.tcl.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkbaseteststestlibrarytcl">trunk/base/tests/test/library.tcl</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkbaseteststest">trunk/base/tests/test/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseconfigure"></a>
<div class="modfile"><h4>Modified: trunk/base/configure (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/configure 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -11386,7 +11386,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Output
</span><del>-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile tests/test.tcl vendor/Makefile"
</del><ins>+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile tests/test.tcl tests/test/library.tcl vendor/Makefile"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ac_config_files="$ac_config_files src/dedup_portfiles.tcl"
</span><span class="lines">@@ -12121,6 +12121,7 @@
</span><span class="cx"> "src/registry2.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry2.0/registry_autoconf.tcl" ;;
</span><span class="cx"> "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
</span><span class="cx"> "tests/test.tcl") CONFIG_FILES="$CONFIG_FILES tests/test.tcl" ;;
</span><ins>+ "tests/test/library.tcl") CONFIG_FILES="$CONFIG_FILES tests/test/library.tcl" ;;
</ins><span class="cx"> "vendor/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/Makefile" ;;
</span><span class="cx"> "src/dedup_portfiles.tcl") CONFIG_FILES="$CONFIG_FILES src/dedup_portfiles.tcl" ;;
</span><span class="cx"> "src/images_to_archives.tcl") CONFIG_FILES="$CONFIG_FILES src/images_to_archives.tcl" ;;
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/configure.ac 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -429,6 +429,7 @@
</span><span class="cx"> src/registry2.0/registry_autoconf.tcl
</span><span class="cx"> tests/Makefile
</span><span class="cx"> tests/test.tcl
</span><ins>+ tests/test/library.tcl
</ins><span class="cx"> vendor/Makefile
</span><span class="cx"> ])
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbaseteststest"></a>
<div class="propset"><h4>Property changes: trunk/base/tests/test</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkbaseteststestlibrarytcl"></a>
<div class="delfile"><h4>Deleted: trunk/base/tests/test/library.tcl (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/library.tcl 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/tests/test/library.tcl 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -1,172 +0,0 @@
</span><del>-set autoconf [file dirname $argv0]/../../../Mk/macports.autoconf.mk
-eval ::tcltest::configure $::argv
-
-set output_file "output"
-set work_dir "work"
-
-# Set of procs used for testing.
-
-# Sets $bindir variable from macports.autoconf.mk
-# autogenerated file.
-proc load_variables {pwd} {
- global autoconf bindir datadir portsrc cpwd
-
- if { ![file exists $autoconf] } {
- puts "ERROR: $autoconf does not exist."
- exit 1
- }
-
- set cpwd [file dirname [file dirname $pwd]]
-
- set line [get_line $autoconf "prefix*"]
- set prefix [lrange [split $line " "] 1 1]
-
- set line [get_line $autoconf "bindir*"]
- set bin [lrange [split $line "/"] 1 1]
-
- set bindir ${prefix}/${bin}
- set datadir ${prefix}/share
- set portsrc ${cpwd}/test-macports.conf
-
-}
-
-proc cleanup {} {
- global cpwd
-
- file delete -force /tmp/macports-tests
- file delete -force ${cpwd}/PortIndex ${cpwd}/PortIndex.quick
-}
-
-# Sets initial directories
-proc set_dir {} {
- global datadir cpwd
-
- cleanup
-
- file mkdir /tmp/macports-tests/ports \
- /tmp/macports-tests/opt/local/etc/macports \
- /tmp/macports-tests/opt/local/share \
- /tmp/macports-tests/opt/local/var/macports/receipts \
- /tmp/macports-tests/opt/local/var/macports/registry \
- /tmp/macports-tests/opt/local/var/macports/build
-
- file link -symbolic /tmp/macports-tests/opt/local/share/macports $datadir/macports
- file link -symbolic /tmp/macports-tests/ports/test $cpwd/test
-}
-
-# Run portindex
-proc port_index {} {
- global bindir datadir cpwd
-
- # Move up 2 level to run portindex.
- set path [pwd]
- cd ../..
- # Avoid warning about ports tree being old
- exec sh -c {touch */*/Portfile}
-
- exec ${bindir}/portindex 2>@1
-
- file copy ${cpwd}/sources.conf /tmp/macports-tests/opt/local/etc/macports/
- file copy ${cpwd}/PortIndex ${cpwd}/PortIndex.quick /tmp/macports-tests/ports/
-
- cd $path
-}
-
-# Executes port clean.
-proc port_clean {pwd} {
- global bindir datadir portsrc
-
- set back [pwd]
- cd $pwd
-
- catch {exec env PORTSRC=${portsrc} ${bindir}/port clean 2>@1}
- cd $back
-}
-
-# Runs the portfile.
-proc port_run {pwd} {
- global bindir datadir portsrc
-
- set back [pwd]
- cd $pwd
-
- set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port -d test >&output} ]
- cd $back
- return $result
-}
-
-# Runs port trace.
-proc port_trace {pwd} {
- global bindir datadir portsrc
-
- set back [pwd]
- cd $pwd
-
- set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port -t test >&output 2>@1} ]
- cd $back
- return $result
-}
-
-# Installs new portfile.
-proc port_install {} {
- global bindir portsrc
-
- set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port install > output 2>@1} ]
-}
-
-# Run configure command.
-proc port_config {pwd} {
- global path bindir portsrc
-
- set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port configure 2>@1} ]
-}
-
-# Run destroot command.
-proc port_destroot {pwd} {
- global path bindir portsrc work_dir output_file
-
- file copy -force ${path}/statefile ${work_dir}/.macports.statefile-unknown-version.state
- if { [exec id -u] == 0 } {
- exec chown macports ${work_dir}/.macports.statefile-unknown-version.state
- }
- set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port destroot >$output_file 2>@1} ]
-}
-
-# Uninstalls portfile.
-proc port_uninstall {} {
- global bindir portsrc
-
- set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port uninstall > output 2>@1} ]
-}
-
-# Returns the line containint a given string
-# from a given file, or -1 if nothing is found.
-proc get_line {filename lookup} {
- set fp [open $filename r]
-
- while {[gets $fp line] != -1} {
- set line [string tolower $line]
-
- if {[string match $lookup $line] != 0} {
- close $fp
- return $line
- }
- }
- return -1
-}
-
-# This proc contains all the steps necesary
-# to install a port and save the output to a file.
-# Needed for the majority of regression tests.
-proc initial_setup {} {
- global output_file work_dir path
-
- makeFile "" $output_file
- makeDirectory $work_dir
-
- load_variables $path
- set_dir
- port_index
- port_clean $path
- port_run $path
-}
</del></span></pre></div>
<a id="trunkbaseteststestlibrarytclinfromrev120185trunkbaseteststestlibrarytcl"></a>
<div class="copfile"><h4>Copied: trunk/base/tests/test/library.tcl.in (from rev 120185, trunk/base/tests/test/library.tcl) (0 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/library.tcl.in (rev 0)
+++ trunk/base/tests/test/library.tcl.in 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -0,0 +1,167 @@
</span><ins>+eval ::tcltest::configure $::argv
+
+set output_file "output"
+set work_dir "work"
+
+# constraint for tests that should only run on Darwin
+::tcltest::testConstraint darwin [expr {"@OS_PLATFORM@" eq "darwin"}]
+
+# constraint indicating whether the platform supports trace mode
+::tcltest::testConstraint tracemode_support [expr {@TRACEMODE_SUPPORT@ != 0}]
+
+# Set of procs used for testing.
+
+# Sets $bindir variable from autoconf
+proc load_variables {pwd} {
+ global bindir datadir portsrc cpwd
+
+ set cpwd [file dirname [file dirname $pwd]]
+
+ set prefix "@prefix@"
+ set exec_prefix "@exec_prefix@"
+ set bindir "@bindir@"
+ set datadir "@datarootdir@"
+ set portsrc ${cpwd}/test-macports.conf
+
+}
+
+proc cleanup {} {
+ global cpwd
+
+ file delete -force /tmp/macports-tests
+ file delete -force ${cpwd}/PortIndex ${cpwd}/PortIndex.quick
+}
+
+# Sets initial directories
+proc set_dir {} {
+ global datadir cpwd
+
+ cleanup
+
+ file mkdir /tmp/macports-tests/ports \
+ /tmp/macports-tests/opt/local/etc/macports \
+ /tmp/macports-tests/opt/local/share \
+ /tmp/macports-tests/opt/local/var/macports/receipts \
+ /tmp/macports-tests/opt/local/var/macports/registry \
+ /tmp/macports-tests/opt/local/var/macports/build
+
+ file link -symbolic /tmp/macports-tests/opt/local/share/macports $datadir/macports
+ file link -symbolic /tmp/macports-tests/ports/test $cpwd/test
+}
+
+# Run portindex
+proc port_index {} {
+ global bindir datadir cpwd
+
+ # Move up 2 level to run portindex.
+ set path [pwd]
+ cd ../..
+ # Avoid warning about ports tree being old
+ exec sh -c {touch */*/Portfile}
+
+ exec ${bindir}/portindex 2>@1
+
+ file copy ${cpwd}/sources.conf /tmp/macports-tests/opt/local/etc/macports/
+ file copy ${cpwd}/PortIndex ${cpwd}/PortIndex.quick /tmp/macports-tests/ports/
+
+ cd $path
+}
+
+# Executes port clean.
+proc port_clean {pwd} {
+ global bindir datadir portsrc
+
+ set back [pwd]
+ cd $pwd
+
+ catch {exec env PORTSRC=${portsrc} ${bindir}/port clean 2>@1}
+ cd $back
+}
+
+# Runs the portfile.
+proc port_run {pwd} {
+ global bindir datadir portsrc
+
+ set back [pwd]
+ cd $pwd
+
+ set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port -d test >&output} ]
+ cd $back
+ return $result
+}
+
+# Runs port trace.
+proc port_trace {pwd} {
+ global bindir datadir portsrc
+
+ set back [pwd]
+ cd $pwd
+
+ set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port -t test >&output 2>@1} ]
+ cd $back
+ return $result
+}
+
+# Installs new portfile.
+proc port_install {} {
+ global bindir portsrc
+
+ set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port install > output 2>@1} ]
+}
+
+# Run configure command.
+proc port_config {pwd} {
+ global path bindir portsrc
+
+ set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port configure 2>@1} ]
+}
+
+# Run destroot command.
+proc port_destroot {pwd} {
+ global path bindir portsrc work_dir output_file
+
+ file copy -force ${path}/statefile ${work_dir}/.macports.statefile-unknown-version.state
+ if { [exec id -u] == 0 } {
+ exec chown macports ${work_dir}/.macports.statefile-unknown-version.state
+ }
+ set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port destroot >$output_file 2>@1} ]
+}
+
+# Uninstalls portfile.
+proc port_uninstall {} {
+ global bindir portsrc
+
+ set result [catch {exec env PORTSRC=${portsrc} ${bindir}/port uninstall > output 2>@1} ]
+}
+
+# Returns the line containint a given string
+# from a given file, or -1 if nothing is found.
+proc get_line {filename lookup} {
+ set fp [open $filename r]
+
+ while {[gets $fp line] != -1} {
+ set line [string tolower $line]
+
+ if {[string match $lookup $line] != 0} {
+ close $fp
+ return $line
+ }
+ }
+ return -1
+}
+
+# This proc contains all the steps necesary
+# to install a port and save the output to a file.
+# Needed for the majority of regression tests.
+proc initial_setup {} {
+ global output_file work_dir path
+
+ makeFile "" $output_file
+ makeDirectory $work_dir
+
+ load_variables $path
+ set_dir
+ port_index
+ port_clean $path
+ port_run $path
+}
</ins></span></pre></div>
<a id="trunkbaseteststesttracetesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/trace/test.tcl (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/trace/test.tcl 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/tests/test/trace/test.tcl 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx">
</span><span class="cx"> test trace {
</span><span class="cx"> Regression test for trace.
</span><ins>+} -constraints {
+ tracemode_support
</ins><span class="cx"> } -body {
</span><span class="cx"> test_trace
</span><span class="cx"> } -result "No errors found."
</span></span></pre></div>
<a id="trunkbaseteststestuniversaltesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/universal/test.tcl (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/universal/test.tcl 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/tests/test/universal/test.tcl 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> test universal {
</span><span class="cx"> Regression test for universal variant.
</span><ins>+} -constraints {
+ darwin
</ins><span class="cx"> } -body {
</span><span class="cx"> univ_test "yes"
</span><span class="cx"> } -result "variants: universal"
</span></span></pre></div>
<a id="trunkbaseteststestxcodeversiontesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/xcodeversion/test.tcl (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/xcodeversion/test.tcl 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/tests/test/xcodeversion/test.tcl 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -24,12 +24,16 @@
</span><span class="cx">
</span><span class="cx"> test envvariables {
</span><span class="cx"> Regression test for XCode version.
</span><ins>+} -constraints {
+ darwin
</ins><span class="cx"> } -body {
</span><span class="cx"> xcode_ver
</span><span class="cx"> } -result "xcodeversion >= 2.1"
</span><span class="cx">
</span><span class="cx"> test xcode_path {
</span><span class="cx"> Regression test for XCode path.
</span><ins>+} -constraints {
+ darwin
</ins><span class="cx"> } -body {
</span><span class="cx"> xcode_binpath
</span><span class="cx"> } -result "xcodebuildcmd = /usr/bin/xcodebuild"
</span></span></pre></div>
<a id="trunkbaseteststesttclin"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test.tcl.in (120185 => 120186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test.tcl.in 2014-05-18 22:14:29 UTC (rev 120185)
+++ trunk/base/tests/test.tcl.in 2014-05-19 00:05:16 UTC (rev 120186)
</span><span class="lines">@@ -15,13 +15,12 @@
</span><span class="cx"> statefile-version2-invalid
</span><span class="cx"> statefile-version2-outdated
</span><span class="cx"> svn-and-patchsites
</span><ins>+ trace
</ins><span class="cx"> universal
</span><span class="cx"> variants
</span><span class="cx"> xcodeversion
</span><span class="cx"> }
</span><del>-if {@TRACEMODE_SUPPORT@ != 0} {
- lappend test_suite trace
-}
</del><ins>+
</ins><span class="cx"> set arguments ""
</span><span class="cx"> set test_name ""
</span><span class="cx"> set color_out ""
</span><span class="lines">@@ -29,13 +28,7 @@
</span><span class="cx"> set err ""
</span><span class="cx">
</span><span class="cx"> # Get tclsh path.
</span><del>-set autoconf ../Mk/macports.autoconf.mk
-set fp [open $autoconf r]
-while {[gets $fp line] != -1} {
- if {[string match "TCLSH*" $line] != 0} {
- set tcl [lrange [split $line " "] 1 1]
- }
-}
</del><ins>+set tcl "@TCLSH@"
</ins><span class="cx">
</span><span class="cx"> proc print_help {arg} {
</span><span class="cx"> if { $arg eq "tests" } {
</span></span></pre>
</div>
</div>
</body>
</html>