<!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>[118609] branches/release_2_3/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/118609">118609</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-05 14:20:48 -0700 (Sat, 05 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge <a href="https://trac.macports.org/changeset/118606">r118606</a>, <a href="https://trac.macports.org/changeset/118607">r118607</a> from trunk: don't run tracemode test on systems that don't support trace mode</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3baseconfigure">branches/release_2_3/base/configure</a></li>
<li><a href="#branchesrelease_2_3baseconfigureac">branches/release_2_3/base/configure.ac</a></li>
<li><a href="#branchesrelease_2_3baseteststesttracetesttcl">branches/release_2_3/base/tests/test/trace/test.tcl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3baseteststesttclin">branches/release_2_3/base/tests/test.tcl.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3baseteststesttcl">branches/release_2_3/base/tests/test.tcl</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_3base">branches/release_2_3/base/</a></li>
<li><a href="#branchesrelease_2_3basetests">branches/release_2_3/base/tests/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesrelease_2_3base"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118598-118599,118602-118603
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx"> + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118598-118599,118602-118603,118606-118607
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesrelease_2_3baseconfigure"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/configure (118608 => 118609)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/configure 2014-04-05 21:05:53 UTC (rev 118608)
+++ branches/release_2_3/base/configure 2014-04-05 21:20:48 UTC (rev 118609)
</span><span class="lines">@@ -10591,7 +10591,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/cflib1.0/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_fastload.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 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/cflib1.0/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_fastload.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"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ac_config_files="$ac_config_files src/pkg_mkindex.sh"
</span><span class="lines">@@ -11321,6 +11321,7 @@
</span><span class="cx"> "src/registry2.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/registry2.0/Makefile" ;;
</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><ins>+ "tests/test.tcl") CONFIG_FILES="$CONFIG_FILES tests/test.tcl" ;;
</ins><span class="cx"> "vendor/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/Makefile" ;;
</span><span class="cx"> "src/pkg_mkindex.sh") CONFIG_FILES="$CONFIG_FILES src/pkg_mkindex.sh" ;;
</span><span class="cx">
</span></span></pre></div>
<a id="branchesrelease_2_3baseconfigureac"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/configure.ac (118608 => 118609)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/configure.ac 2014-04-05 21:05:53 UTC (rev 118608)
+++ branches/release_2_3/base/configure.ac 2014-04-05 21:20:48 UTC (rev 118609)
</span><span class="lines">@@ -426,6 +426,7 @@
</span><span class="cx"> src/registry2.0/Makefile
</span><span class="cx"> src/registry2.0/registry_autoconf.tcl
</span><span class="cx"> tests/Makefile
</span><ins>+ tests/test.tcl
</ins><span class="cx"> vendor/Makefile
</span><span class="cx"> ])
</span><span class="cx">
</span></span></pre></div>
<a id="branchesrelease_2_3basetests"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base/tests</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx"> + Makefile
</span><span class="cx">test.tcl
</span><a id="branchesrelease_2_3baseteststesttracetesttcl"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/tests/test/trace/test.tcl (118608 => 118609)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/tests/test/trace/test.tcl 2014-04-05 21:05:53 UTC (rev 118608)
+++ branches/release_2_3/base/tests/test/trace/test.tcl 2014-04-05 21:20:48 UTC (rev 118609)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> makeDirectory ../tracetesttmp
</span><span class="cx"> if {[getuid] == 0} {
</span><del>- file attributes ../tracetesttmp -owner $user
</del><ins>+ file attributes ../tracetesttmp -owner $user
</ins><span class="cx"> exec chown -h $user /tmp/link-trace2
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx">
</span><span class="cx"> set err "error*"
</span><span class="cx"> set line [get_line $path/$output_file $err]
</span><del>- if { $line == -1 } {
</del><ins>+ set unsupported [get_line $path/$output_file "*tracelib not supported on this platform*"]
+ if {$unsupported != -1 || $line == -1} {
</ins><span class="cx"> return "No errors found."
</span><span class="cx"> } else {
</span><span class="cx"> return $line
</span></span></pre></div>
<a id="branchesrelease_2_3baseteststesttcl"></a>
<div class="delfile"><h4>Deleted: branches/release_2_3/base/tests/test.tcl (118608 => 118609)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/tests/test.tcl 2014-04-05 21:05:53 UTC (rev 118608)
+++ branches/release_2_3/base/tests/test.tcl 2014-04-05 21:20:48 UTC (rev 118609)
</span><span class="lines">@@ -1,143 +0,0 @@
</span><del>-set test_suite {
- case-insensitive-deactivate
- checksums-1
- dependencies-a
- dependencies-b
- dependencies-c
- dependencies-d
- dependencies-e
- envvariables
- site-tags
- statefile-unknown-version
- statefile-version1
- statefile-version1-outdated
- statefile-version2
- statefile-version2-invalid
- statefile-version2-outdated
- svn-and-patchsites
- trace
- universal
- variants
- xcodeversion
-}
-set arguments ""
-set test_name ""
-set color_out ""
-set tcl ""
-set err ""
-
-# Get tclsh path.
-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]
- }
-}
-
-proc print_help {arg} {
- if { $arg eq "tests" } {
- puts "The list of available tests is:"
- foreach test $::test_suite {
- puts [puts -nonewline " "]$test
- }
- } else {
- puts "Usage: tclsh test.tcl \[-debug level\] \[-t test\] \[-l\]\n"
- puts " -debug LVL : sets the level of printed debug info \[0-3\]"
- puts " -t TEST : run a specific test"
- puts " -nocolor : disable color output (for automatic testing)"
- puts " -l : print the list of available tests"
- puts " -h, -help : print this message\n"
- }
-}
-
-# Process args
-foreach arg $argv {
- if { $arg eq "-h" || $arg eq "-help" } {
- print_help ""
- exit 0
- } elseif { $arg eq "-debug" } {
- set index [expr {[lsearch $argv $arg] + 1}]
- set level [lindex $argv $index]
- if { $level >= 0 && $level <= 3 } {
- append arguments "-debug " $level
- } else {
- puts "Invalid debug level."
- exit 1
- }
- } elseif { $arg eq "-t" } {
- set index [expr {[lsearch $argv $arg] + 1}]
- set test_name [lindex $argv $index]
- set no 0
- foreach test $test_suite {
- if { $test_name != $test } {
- set no [expr {$no + 1}]
- }
- }
- if { $no == [llength $test_suite] } {
- print_help tests
- exit 1
- }
- } elseif { $arg eq "-l" } {
- print_help tests
- exit 0
- } elseif { $arg eq "-nocolor" } {
- set color_out "no"
- }
-}
-
-
-# Run tests
-if {$test_name ne ""} {
- cd test/$test_name
-
- set result [eval exec $tcl test.tcl $arguments 2>@stderr]
- puts $result
-
-} else {
- foreach test $test_suite {
- cd test/$test
-
- set result [eval exec $tcl test.tcl $arguments 2>@stderr]
- set lastline [lindex [split $result "\n"] end]
-
- if {[lrange [split $lastline "\t"] 1 1] != "Total"} {
- set lastline [lindex [split $result "\n"] end-2]
- set errmsg [lindex [split $result "\n"] end]
- }
-
- set splitresult [split $lastline "\t"]
- set total [lindex $splitresult 2]
- set pass [lindex $splitresult 4]
- set skip [lindex $splitresult 6]
- set fail [lindex $splitresult 8]
-
- # Check for errors.
- if { $fail != 0 } { set err "yes" }
-
- set out ""
- if { ($fail != 0 || $skip != 0) && $color_out eq "" } {
- # Color failed tests.
- append out "\x1b\[1;31mTotal:" $total " Passed:" $pass " Failed:" $fail " Skipped:" $skip " \x1b\[0m" $test
- } else {
- append out "Total:" $total " Passed:" $pass " Failed:" $fail " Skipped:" $skip " " $test
- }
-
- # Print results and constrints for auto-skipped tests.
- puts $out
- if { $skip != 0 } {
- set out " Constraint: "
- append out [string trim $errmsg "\t {}"]
- puts $out
- }
-
- cd ../..
- }
-}
-
-# Return 1 if errors were found.
-if {$err ne ""} {
- exit 1
-}
-
-return 0
</del></span></pre></div>
<a id="branchesrelease_2_3baseteststesttclinfromrev118607trunkbaseteststesttclin"></a>
<div class="copfile"><h4>Copied: branches/release_2_3/base/tests/test.tcl.in (from rev 118607, trunk/base/tests/test.tcl.in) (0 => 118609)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/tests/test.tcl.in (rev 0)
+++ branches/release_2_3/base/tests/test.tcl.in 2014-04-05 21:20:48 UTC (rev 118609)
</span><span class="lines">@@ -0,0 +1,145 @@
</span><ins>+set test_suite {
+ case-insensitive-deactivate
+ checksums-1
+ dependencies-a
+ dependencies-b
+ dependencies-c
+ dependencies-d
+ dependencies-e
+ envvariables
+ site-tags
+ statefile-unknown-version
+ statefile-version1
+ statefile-version1-outdated
+ statefile-version2
+ statefile-version2-invalid
+ statefile-version2-outdated
+ svn-and-patchsites
+ universal
+ variants
+ xcodeversion
+}
+if {@TRACEMODE_SUPPORT@ != 0} {
+ lappend test_suite trace
+}
+set arguments ""
+set test_name ""
+set color_out ""
+set tcl ""
+set err ""
+
+# Get tclsh path.
+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]
+ }
+}
+
+proc print_help {arg} {
+ if { $arg eq "tests" } {
+ puts "The list of available tests is:"
+ foreach test $::test_suite {
+ puts [puts -nonewline " "]$test
+ }
+ } else {
+ puts "Usage: tclsh test.tcl \[-debug level\] \[-t test\] \[-l\]\n"
+ puts " -debug LVL : sets the level of printed debug info \[0-3\]"
+ puts " -t TEST : run a specific test"
+ puts " -nocolor : disable color output (for automatic testing)"
+ puts " -l : print the list of available tests"
+ puts " -h, -help : print this message\n"
+ }
+}
+
+# Process args
+foreach arg $argv {
+ if { $arg eq "-h" || $arg eq "-help" } {
+ print_help ""
+ exit 0
+ } elseif { $arg eq "-debug" } {
+ set index [expr {[lsearch $argv $arg] + 1}]
+ set level [lindex $argv $index]
+ if { $level >= 0 && $level <= 3 } {
+ append arguments "-debug " $level
+ } else {
+ puts "Invalid debug level."
+ exit 1
+ }
+ } elseif { $arg eq "-t" } {
+ set index [expr {[lsearch $argv $arg] + 1}]
+ set test_name [lindex $argv $index]
+ set no 0
+ foreach test $test_suite {
+ if { $test_name != $test } {
+ set no [expr {$no + 1}]
+ }
+ }
+ if { $no == [llength $test_suite] } {
+ print_help tests
+ exit 1
+ }
+ } elseif { $arg eq "-l" } {
+ print_help tests
+ exit 0
+ } elseif { $arg eq "-nocolor" } {
+ set color_out "no"
+ }
+}
+
+
+# Run tests
+if {$test_name ne ""} {
+ cd test/$test_name
+
+ set result [eval exec $tcl test.tcl $arguments 2>@stderr]
+ puts $result
+
+} else {
+ foreach test $test_suite {
+ cd test/$test
+
+ set result [eval exec $tcl test.tcl $arguments 2>@stderr]
+ set lastline [lindex [split $result "\n"] end]
+
+ if {[lrange [split $lastline "\t"] 1 1] != "Total"} {
+ set lastline [lindex [split $result "\n"] end-2]
+ set errmsg [lindex [split $result "\n"] end]
+ }
+
+ set splitresult [split $lastline "\t"]
+ set total [lindex $splitresult 2]
+ set pass [lindex $splitresult 4]
+ set skip [lindex $splitresult 6]
+ set fail [lindex $splitresult 8]
+
+ # Check for errors.
+ if { $fail != 0 } { set err "yes" }
+
+ set out ""
+ if { ($fail != 0 || $skip != 0) && $color_out eq "" } {
+ # Color failed tests.
+ append out "\x1b\[1;31mTotal:" $total " Passed:" $pass " Failed:" $fail " Skipped:" $skip " \x1b\[0m" $test
+ } else {
+ append out "Total:" $total " Passed:" $pass " Failed:" $fail " Skipped:" $skip " " $test
+ }
+
+ # Print results and constrints for auto-skipped tests.
+ puts $out
+ if { $skip != 0 } {
+ set out " Constraint: "
+ append out [string trim $errmsg "\t {}"]
+ puts $out
+ }
+
+ cd ../..
+ }
+}
+
+# Return 1 if errors were found.
+if {$err ne ""} {
+ exit 1
+}
+
+return 0
</ins></span></pre>
</div>
</div>
</body>
</html>