<!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>[119689] trunk/base/src/port1.0/tests/test.tcl</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/119689">119689</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-05-03 15:21:05 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: port1.0 tests: format, unify whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10teststesttcl">trunk/base/src/port1.0/tests/test.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10teststesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/tests/test.tcl (119688 => 119689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/tests/test.tcl 2014-05-03 22:18:43 UTC (rev 119688)
+++ trunk/base/src/port1.0/tests/test.tcl 2014-05-03 22:21:05 UTC (rev 119689)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc print_help {arg} {
</span><del>- if { $arg eq "tests" } {
</del><ins>+ if {$arg eq "tests"} {
</ins><span class="cx"> puts "The list of available tests is:"
</span><del>- cd tests
- set test_suite [glob *.test]
</del><ins>+ cd tests
+ set test_suite [glob *.test]
</ins><span class="cx"> foreach test $test_suite {
</span><span class="cx"> puts [puts -nonewline " "]$test
</span><span class="cx"> }
</span><span class="lines">@@ -34,77 +34,86 @@
</span><span class="cx">
</span><span class="cx"> # Process args
</span><span class="cx"> foreach arg $argv {
</span><del>- if { $arg eq "-h" || $arg eq "-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 eq "-debug" } {
</del><ins>+ } elseif {$arg eq "-debug"} {
</ins><span class="cx"> set index [expr {[lsearch $argv $arg] + 1}]
</span><span class="cx"> set level [lindex $argv $index]
</span><del>- if { $level >= 0 && $level <= 3 } {
</del><ins>+ if {$level >= 0 && $level <= 3} {
</ins><span class="cx"> lappend arguments "-debug" $level
</span><span class="cx"> } else {
</span><span class="cx"> puts "Invalid debug level."
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><del>- } elseif { $arg eq "-t" } {
</del><ins>+ } elseif {$arg eq "-t"} {
</ins><span class="cx"> set index [expr {[lsearch $argv $arg] + 1}]
</span><span class="cx"> set test_name [lindex $argv $index]
</span><span class="cx"> set no 0
</span><del>- cd tests
- set test_suite [glob *.test]
</del><ins>+ cd tests
+ set test_suite [glob *.test]
</ins><span class="cx"> foreach test $test_suite {
</span><del>- if { $test_name != $test } {
</del><ins>+ if {$test_name ne $test} {
</ins><span class="cx"> set no [expr {$no + 1}]
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if { $no == [llength $test_suite] } {
</del><ins>+ if {$no == [llength $test_suite]} {
</ins><span class="cx"> print_help tests
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><del>- } elseif { $arg eq "-l" } {
</del><ins>+ } elseif {$arg eq "-l"} {
</ins><span class="cx"> print_help tests
</span><span class="cx"> exit 0
</span><del>- } elseif { $arg eq "-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 ne ""} {
</del><ins>+if {$test_name ne ""} {
</ins><span class="cx"> set result [exec -ignorestderr $tcl $test_name {*}$arguments]
</span><span class="cx"> puts $result
</span><del>-
</del><span class="cx"> } else {
</span><span class="cx"> cd tests
</span><span class="cx"> set test_suite [glob *.test]
</span><span class="cx">
</span><span class="cx"> foreach test $test_suite {
</span><span class="cx"> set result [exec -ignorestderr $tcl $test {*}$arguments]
</span><del>- set lastline [lindex [split $result "\n"] end]
</del><ins>+ set lastline [lindex [split $result "\n"] end]
</ins><span class="cx">
</span><del>- if {[lrange [split $lastline "\t"] 1 1] != "Total"} {
- set lastline [lindex [split $result "\n"] end-2]
- set errmsg [lindex [split $result "\n"] end]
- }
</del><ins>+ if {[lrange [split $lastline "\t"] 1 1] ne "Total"} {
+ set lastline [lindex [split $result "\n"] end-2]
+ set errmsg [lindex [split $result "\n"] end]
+ }
</ins><span class="cx">
</span><del>- set splitresult [split $lastline "\t"]
</del><ins>+ set splitresult [split $lastline "\t"]
</ins><span class="cx"> set total [lindex $splitresult 2]
</span><span class="cx"> set pass [lindex $splitresult 4]
</span><span class="cx"> set skip [lindex $splitresult 6]
</span><span class="cx"> set fail [lindex $splitresult 8]
</span><span class="cx">
</span><del>- # Format output
- if {$total < 10} { set total "0${total}"}
- if {$pass < 10} { set pass "0${pass}"}
- if {$skip < 10} { set skip "0${skip}"}
- if {$fail < 10} { set fail "0${fail}"}
</del><ins>+ # Format output
+ if {$total < 10} {
+ set total "0${total}"
+ }
+ if {$pass < 10} {
+ set pass "0${pass}"
+ }
+ if {$skip < 10} {
+ set skip "0${skip}"
+ }
+ if {$fail < 10} {
+ set fail "0${fail}"
+ }
</ins><span class="cx">
</span><span class="cx"> # Check for errors.
</span><del>- if { $fail != 0 } { set err "yes" }
</del><ins>+ if {$fail != 0} {
+ set err "yes"
+ }
</ins><span class="cx">
</span><span class="cx"> set out ""
</span><del>- if { ($fail != 0 || $skip != 0) && $color_out eq "" } {
</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">@@ -113,19 +122,21 @@
</span><span class="cx">
</span><span class="cx"> # Print results and constrints for auto-skipped tests.
</span><span class="cx"> puts $out
</span><del>- if { $skip != 0 } {
</del><ins>+ if {$skip != 0} {
</ins><span class="cx"> set out " Constraint: "
</span><span class="cx"> append out [string trim $errmsg "\t {}"]
</span><span class="cx"> puts $out
</span><span class="cx"> }
</span><del>- if { $fail != 0 } {
- set end [expr {[string first $test $result 0] - 1}]
- puts [string range $result 0 $end]
- }
</del><ins>+ if {$fail != 0} {
+ set end [expr {[string first $test $result 0] - 1}]
+ puts [string range $result 0 $end]
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Return 1 if errors were found.
</span><del>-if {$err ne ""} { exit 1 }
</del><ins>+if {$err ne ""} {
+ exit 1
+}
</ins><span class="cx">
</span><span class="cx"> return 0
</span></span></pre>
</div>
</div>
</body>
</html>