<!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>[116515] trunk/base/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/116515">116515</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-01-27 07:27:21 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base/tests: Tcl cleanup, patch by Gustaf Neumann, Tcl8.4-clean</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseteststeststatefileunknownversiontesttcl">trunk/base/tests/test/statefile-unknown-version/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion1testtcl">trunk/base/tests/test/statefile-version1/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion1outdatedtesttcl">trunk/base/tests/test/statefile-version1-outdated/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion2testtcl">trunk/base/tests/test/statefile-version2/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion2invalidtesttcl">trunk/base/tests/test/statefile-version2-invalid/test.tcl</a></li>
<li><a href="#trunkbaseteststeststatefileversion2outdatedtesttcl">trunk/base/tests/test/statefile-version2-outdated/test.tcl</a></li>
<li><a href="#trunkbaseteststestuniversaltesttcl">trunk/base/tests/test/universal/test.tcl</a></li>
<li><a href="#trunkbaseteststesttcl">trunk/base/tests/test.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseteststeststatefileunknownversiontesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-unknown-version/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/statefile-unknown-version/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/statefile-unknown-version/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> proc state_unknown {warn} {
</span><span class="cx"> global path output_file
</span><span class="cx">
</span><del>- if {[string compare $warn "no"]} {
</del><ins>+ if {$warn ne "no"} {
</ins><span class="cx"> set msg "warning*"
</span><span class="cx"> } else {
</span><span class="cx"> set msg "*staging*destroot*"
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion1testtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version1/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/statefile-version1/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/statefile-version1/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> proc statefile_v1 {warn} {
</span><span class="cx"> global path output_file
</span><span class="cx">
</span><del>- if {[string compare $warn "no"]} {
</del><ins>+ if {$warn ne "no"} {
</ins><span class="cx"> set msg "*discarding previous state*"
</span><span class="cx"> } else {
</span><span class="cx"> set msg "*staging*destroot*"
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion1outdatedtesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version1-outdated/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/statefile-version1-outdated/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/statefile-version1-outdated/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> proc state_v1 {warn} {
</span><span class="cx"> global path output_file
</span><span class="cx">
</span><del>- if {[string compare $warn "no"]} {
</del><ins>+ if {$warn ne "no"} {
</ins><span class="cx"> set msg "*discarding previous state*"
</span><span class="cx"> } else {
</span><span class="cx"> set msg "*staging*destroot*"
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion2testtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version2/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/statefile-version2/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/statefile-version2/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> proc statefile_v2 {arg} {
</span><span class="cx"> global path output_file
</span><span class="cx">
</span><del>- if {[string compare $arg "no"]} {
</del><ins>+ if {$arg ne "no"} {
</ins><span class="cx"> set msg "*discarding previous state*"
</span><span class="cx"> } else {
</span><span class="cx"> set msg "*staging*destroot*"
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion2invalidtesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version2-invalid/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/statefile-version2-invalid/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/statefile-version2-invalid/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> proc state_v2_invalid {warn} {
</span><span class="cx"> global path output_file
</span><span class="cx">
</span><del>- if {[string compare $warn "no"]} {
</del><ins>+ if {$warn ne "no"} {
</ins><span class="cx"> set msg "*warning*checksum*"
</span><span class="cx"> } else {
</span><span class="cx"> set msg "*staging*destroot*"
</span></span></pre></div>
<a id="trunkbaseteststeststatefileversion2outdatedtesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/statefile-version2-outdated/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/statefile-version2-outdated/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/statefile-version2-outdated/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> proc state_v2_out {warn} {
</span><span class="cx"> global path output_file
</span><span class="cx">
</span><del>- if {[string compare $warn "no"]} {
</del><ins>+ if {$warn ne "no" } {
</ins><span class="cx"> set msg "*discarding previous state*"
</span><span class="cx"> } else {
</span><span class="cx"> set msg "*staging*destroot*"
</span></span></pre></div>
<a id="trunkbaseteststestuniversaltesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test/universal/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test/universal/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test/universal/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> global output_file path portsrc bindir
</span><span class="cx">
</span><span class="cx"> # Modify Porfile.in for variants.
</span><del>- if {[string compare $opt "yes"]} {
</del><ins>+ if {$opt ne "yes"} {
</ins><span class="cx"> # No universal variant
</span><span class="cx"> exec sed "s/@option@/universal_variant\ no/" $path/Portfile.in > Portfile
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbaseteststesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/tests/test.tcl (116514 => 116515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/test.tcl 2014-01-27 15:23:40 UTC (rev 116514)
+++ trunk/base/tests/test.tcl 2014-01-27 15:27:21 UTC (rev 116515)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc print_help {arg} {
</span><del>- if { $arg == "tests" } {
</del><ins>+ if { $arg eq "tests" } {
</ins><span class="cx"> puts "The list of available tests is:"
</span><span class="cx"> foreach test $::test_suite {
</span><span class="cx"> puts [puts -nonewline " "]$test
</span><span class="lines">@@ -53,11 +53,11 @@
</span><span class="cx">
</span><span class="cx"> # Process args
</span><span class="cx"> foreach arg $argv {
</span><del>- if { $arg == "-h" || $arg == "-help" } {
</del><ins>+ if { $arg eq "-h" || $arg eq "-help" } {
</ins><span class="cx"> print_help ""
</span><span class="cx"> exit 0
</span><del>- } elseif { $arg == "-debug" } {
- set index [expr [lsearch $argv $arg] + 1]
</del><ins>+ } elseif { $arg eq "-debug" } {
+ set index [expr {[lsearch $argv $arg] + 1}]
</ins><span class="cx"> set level [lindex $argv $index]
</span><span class="cx"> if { $level >= 0 && $level <= 3 } {
</span><span class="cx"> append arguments "-debug " $level
</span><span class="lines">@@ -65,30 +65,30 @@
</span><span class="cx"> puts "Invalid debug level."
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><del>- } elseif { $arg == "-t" } {
- set index [expr [lsearch $argv $arg] + 1]
</del><ins>+ } elseif { $arg eq "-t" } {
+ set index [expr {[lsearch $argv $arg] + 1}]
</ins><span class="cx"> set test_name [lindex $argv $index]
</span><span class="cx"> set no 0
</span><span class="cx"> foreach test $test_suite {
</span><span class="cx"> if { $test_name != $test } {
</span><del>- set no [expr $no + 1]
</del><ins>+ set no [expr {$no + 1}]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if { $no == [llength $test_suite] } {
</span><span class="cx"> print_help tests
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><del>- } elseif { $arg == "-l" } {
</del><ins>+ } elseif { $arg eq "-l" } {
</ins><span class="cx"> print_help tests
</span><span class="cx"> exit 0
</span><del>- } elseif { $arg == "-nocolor" } {
</del><ins>+ } elseif { $arg eq "-nocolor" } {
</ins><span class="cx"> set color_out "no"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Run tests
</span><del>-if { $test_name != ""} {
</del><ins>+if {$test_name ne ""} {
</ins><span class="cx"> cd test/$test_name
</span><span class="cx">
</span><span class="cx"> set result [eval exec $tcl test.tcl $arguments 2>@stderr]
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> if { $fail != 0 } { set err "yes" }
</span><span class="cx">
</span><span class="cx"> set out ""
</span><del>- if { ($fail != 0 || $skip != 0) && $color_out == "" } {
</del><ins>+ if { ($fail != 0 || $skip != 0) && $color_out eq "" } {
</ins><span class="cx"> # Color failed tests.
</span><span class="cx"> append out "\x1b\[1;31mTotal:" $total " Passed:" $pass " Failed:" $fail " Skipped:" $skip " \x1b\[0m" $test
</span><span class="cx"> } else {
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Return 1 if errors were found.
</span><del>-if {$err != ""} {
</del><ins>+if {$err ne ""} {
</ins><span class="cx"> exit 1
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>