<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/3aa4e130b1f4f59bb4abbe05d22676c531de3b9b">https://github.com/macports/macports-base/commit/3aa4e130b1f4f59bb4abbe05d22676c531de3b9b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3aa4e130 Fix whitespace in tests
</span>3aa4e130 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3aa4e130b1f4f59bb4abbe05d22676c531de3b9b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 16 21:50:29 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Fix whitespace in tests
</span>---
src/macports1.0/tests/macports.test | 182 +++++++++++++++---------------
src/macports1.0/tests/macports_dlist.test | 56 ++++-----
src/macports1.0/tests/macports_util.test | 44 ++++----
src/port1.0/tests/portchecksum.test | 20 ++--
src/port1.0/tests/portclean.test | 22 ++--
5 files changed, 162 insertions(+), 162 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/tests/macports.test b/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;color:#808080;'>index b9400163..93f96700 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/tests/macports.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +33,10 @@ test mportclose {
</span> set mport [mportopen file://${pwd}]
} -body {
if {[catch {mportclose $mport}] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot run mportclose"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot run mportclose"
</span> }
if {[ditem_key $mport workername] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: port not closed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: port not closed"
</span> }
return "Mport close successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,16 +72,16 @@ test worker_init {
</span> } -body {
macports::worker_init $name $portpath $porturl $portbuildpath $options $variations
if {$name ne "interp0"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong workername"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong workername"
</span> }
if {[catch {$name eval source Portfile} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot load Portfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot load Portfile"
</span> }
if {[$name eval findBinary ls] ne "/bin/ls"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: alias not created"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: alias not created"
</span> }
if {[$name eval return \$os_arch] ne $macports::os_arch} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: var not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: var not set"
</span> }
return "Worker init successful."
} -result "Worker init successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +95,7 @@ test init_logging {
</span> set mport [mportopen file://${pwd}]
} -body {
if {[macports::init_logging $mport] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect channels"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect channels"
</span> }
return "Init logging successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,13 +107,13 @@ test ui_isset {
</span> Ui is set unit test.
} -body {
namespace eval macports {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set ui_options { test yes }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set ui_options { test yes }
</span> }
if {[macports::ui_isset test] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: set option not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: set option not detected"
</span> }
if {[macports::ui_isset port] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: unset option detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unset option detected"
</span> }
return "ui_isset successful."
} -result "ui_isset successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,13 +123,13 @@ test global_option_isset {
</span> Global option is set unit test.
} -body {
namespace eval macports {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set global_options { test yes }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set global_options { test yes }
</span> }
if {[macports::global_option_isset test] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: set option not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: set option not detected"
</span> }
if {[macports::global_option_isset port] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: unset option detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unset option detected"
</span> }
return "Global option isset successful."
} -result "Global option isset successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,13 +149,13 @@ test ch_logging {
</span>
} -body {
if {[macports::ch_logging $mport] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: channels not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: channels not set"
</span> }
if {![file exists $logname]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: logname dir missing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: logname dir missing"
</span> }
if {![file exists $logname/main.log]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: main.log missing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: main.log missing"
</span> }
return "Channel logging successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,10 +173,10 @@ test push_log {
</span> set ::logenabled 1
} -body {
if {[catch {macports::push_log $mport}] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot push log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot push log"
</span> }
if {[lindex $::logstack 0] != [list $::debuglog $::debuglogname]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect logstack"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect logstack"
</span> }
return "Push log successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,12 +192,12 @@ test pop_log {
</span> set ::debuglog [open $pwd/log w+]
set mport [mportopen file://${pwd}]
if {[catch {macports::push_log $mport}] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot push log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot push log"
</span> }
} -body {
macports::pop_log
if {$::debuglog ne $::logstack} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot pop log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot pop log"
</span> }
return "Pop log successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,7 +215,7 @@ test set_phase {
</span> } -body {
set res [set_phase test]
if {$macports::current_phase ne "test"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: phase not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: phase not set"
</span> }
return "Set phase successful."
} -result "Set phase successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -280,16 +280,16 @@ test ui_prefix_default {
</span> UI prefix default unit test.
} -body {
if {[macports::ui_prefix_default debug] ne {DEBUG: }} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong prefix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong prefix"
</span> }
if {[macports::ui_prefix_default error] ne {Error: }} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong prefix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong prefix"
</span> }
if {[macports::ui_prefix_default warn] ne {Warning: }} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong prefix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong prefix"
</span> }
if {[macports::ui_prefix_default default] ne {}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong prefix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong prefix"
</span> }
return "UI prefix default successful."
} -result "UI prefix default successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,25 +303,25 @@ test ui_channels_default {
</span> set macports::ui_options(ports_quiet) yes
} -body {
if {[macports::ui_channels_default debug] ne {stderr}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: stderr not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: stderr not set"
</span> }
if {[macports::ui_channels_default info] ne {stdout}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: stdout not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: stdout not set"
</span> }
if {[macports::ui_channels_default notice] ne {}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: channel not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: channel not set"
</span> }
if {[macports::ui_channels_default msg] ne {stdout}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: channel not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: channel not set"
</span> }
if {[macports::ui_channels_default warn] ne {stderr}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: channel not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: channel not set"
</span> }
if {[macports::ui_channels_default error] ne {stderr}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: channel not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: channel not set"
</span> }
if {[macports::ui_channels_default default] ne {stdout}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: channel not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: channel not set"
</span> }
return "UI channels default successful."
} -result "UI channels default successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,7 +337,7 @@ test ui_warn_once {
</span> set res [ui_warn_once 0 test]
if {$macports::warning_done(0) != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: warning flag not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: warning flag not set"
</span> }
return "UI warn once successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,10 +353,10 @@ test findBinary {
</span> Find binary unit test.
} -body {
if {[macports::findBinary pwd ls] ne "/bin/pwd"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong binary"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong binary"
</span> }
if {[macports::findBinary pwd /bin/ls] ne "/bin/ls"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong binary"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong binary"
</span> }
return "Find binary successful."
} -result "Find binary successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,10 +366,10 @@ test binaryInPath {
</span> Binary in path unit test.
} -body {
if {[catch {macports::binaryInPath zz}] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: invalid binary found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: invalid binary found"
</span> }
if {[macports::binaryInPath ls] ne "/bin/ls"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong binary found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong binary found"
</span> }
return "Binary in path successful."
} -result "Binary in path successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -380,7 +380,7 @@ test getoption {
</span> } -body {
set macports::test macports
if {[macports::getoption test] ne "macports"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot get option"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot get option"
</span> }
return "Get option successful."
} -result "Get option successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,10 +394,10 @@ test setxcodeinfo {
</span> unset macports::xcodeversion
} -body {
if {[macports::setxcodeinfo a b c] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: xcode binary not found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: xcode binary not found"
</span> }
if {![info exists macports::xcodeversion]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: xcodeversion unset"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: xcodeversion unset"
</span> }
return "Set Xcode version successful."
} -result "Set Xcode version successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,10 +411,10 @@ test set_developer_dir {
</span> unset macports::developer_dir
if {[macports::set_developer_dir a b c] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot set dev dir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot set dev dir"
</span> }
if {![info exists macports::developer_dir]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: developer_dir var no set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: developer_dir var no set"
</span> }
return "Set developer dir successful."
} -result "Set developer dir successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,7 +426,7 @@ test _is_valid_developer_dir {
</span> darwin
} -body {
if {[macports::_is_valid_developer_dir $macports::developer_dir] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: valid dir not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: valid dir not detected"
</span> }
return "Valid dev dir successful."
} -result "Valid dev dir successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -460,14 +460,14 @@ test mportopen_installed {
</span> } -body {
set res [mportopen_installed $subport $version $revision $variants $options]
if {![string match "ditem_*" $res]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: installed port not opened"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: installed port not opened"
</span> }
if {[catch {mportclose $res}] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot close port"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot close port"
</span> }
if {[catch {mportclose $res}] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: installed port not closed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: installed port not closed"
</span> }
return "Installed port open successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -499,7 +499,7 @@ test mportshutdown {
</span>
} -body {
if {[mportshutdown] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: errors occured"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: errors occured"
</span> }
set res ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -507,7 +507,7 @@ test mportshutdown {
</span> set fd [open $macports::portdbpath/pingtimes r]
if {[gets $fd] ne $res} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong value saved"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong value saved"
</span> }
close $fd
return "Mportshutdown successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -525,10 +525,10 @@ test copy_xcode_plist {
</span> set target $pwd/target
if {[macports::copy_xcode_plist $target] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot copy xcode plist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot copy xcode plist"
</span> }
if {![file exists $target/Library/Preferences/com.apple.dt.Xcode.plist]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: missing plist file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: missing plist file"
</span> }
return "Copy xcode plist successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -544,7 +544,7 @@ test create_thread {
</span>
set res [macports::create_thread]
if {![string match "tid0x*" $res]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot create thread"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot create thread"
</span> }
return "Create thread successful."
} -result "Create thread successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -554,10 +554,10 @@ test get_tar_flags {
</span> Get tar flags unit test.
} -body {
if {[macports::get_tar_flags .tbz2] ne "-j"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong flaga (-j)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong flaga (-j)"
</span> }
if {[macports::get_tar_flags .tgz] ne "-z"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong flaga (-z)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong flaga (-z)"
</span> }
return "Get tar flags successful."
} -result "Get tar flags successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -569,7 +569,7 @@ test fetch_port {
</span> set url http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2
set res [macports::fetch_port $url]
if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_3"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot fetch port"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot fetch port"
</span> }
return "Fetch port successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,7 +581,7 @@ test getprotocol {
</span> Get protocol unit test.
} -body {
if {[macports::getprotocol https://www.macports.org] ne "https"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong protocol"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong protocol"
</span> }
return "Get protocol successful."
} -result "Get protocol successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -596,14 +596,14 @@ test getportdir {
</span> set res [macports::getportdir $url]
set expected ${pwd}/portdbpath/portdirs/db_select-0.1_3
if {$res ne $expected} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect port directory $res (expected $expected)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect port directory $res (expected $expected)"
</span> }
set url file://${pwd}/local_file
set res [macports::getportdir $url]
set expected ${pwd}/portdbpath/portdirs/local_file
if {$res ne $expected} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect local port directory $res (expected $expected)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect local port directory $res (expected $expected)"
</span> }
return "Get port dir successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -621,13 +621,13 @@ test getportresourcepath {
</span> set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2/_resources
if {[macports::getportresourcepath $url "" yes] ne $default_path} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong resource path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong resource path"
</span> }
if {[macports::getportresourcepath $url "" no] ne $fallback_path} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong fallback path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong fallback path"
</span> }
if {[macports::getportresourcepath $url "test" no] ne "${fallback_path}/test"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong fallback path with subdir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong fallback path with subdir"
</span> }
return "Get resource path successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -640,14 +640,14 @@ test getdefaultportresourcepath {
</span> set path test/path
set macports::sources_default file://$pwd
if {[macports::getdefaultportresourcepath $path] ne "${pwd}/_resources/${path}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong file res path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong file res path"
</span> }
set macports::sources_default http://$pwd
set default_source_url [lindex ${macports::sources_default} 0]
set right_path [macports::getsourcepath $default_source_url]/_resources/test/path
if {[macports::getdefaultportresourcepath $path] ne $right_path} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong http res path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong http res path"
</span> }
return "Default res path successful."
} -result "Default res path successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -667,12 +667,12 @@ test mporttraverse {
</span> file copy -force $pwd/Portfile $pwd/porttree/cat2/gcc_select/Portfile
proc test_proc {file} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global pwd res
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fd [open ${pwd}/porttree/${file}/Portfile r]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gets $fd line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assumes this will be "PortSystem 1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append res [lindex [split $line " "] 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global pwd res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fd [open ${pwd}/porttree/${file}/Portfile r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gets $fd line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Assumes this will be "PortSystem 1.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append res [lindex [split $line " "] 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $fd
</span> }
global res
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -680,7 +680,7 @@ test mporttraverse {
</span> } -body {
mporttraverse test_proc $pwd/porttree
if {$res ne "1.01.0"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: porttree not traversed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: porttree not traversed"
</span> }
return "Mport traverse successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -850,16 +850,16 @@ test mportselect {
</span> close $fd
} -body {
if {[mportselect list group] ne {file1 file2}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: files not listed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: files not listed"
</span> }
if {[mportselect set group file1] ne ""} {
reutrn "FAIL: cannot set links"
}
if {![file exists $macports::prefix/a]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: link not created"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: link not created"
</span> }
if {[mportselect show group] ne "file1"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: file not selected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: file not selected"
</span> }
return "Mport select successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -874,11 +874,11 @@ test gettmpdir {
</span> global env
set env(TMPDIR) temporal
if {[macports::gettmpdir] ne "temporal"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: set temp dir not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: set temp dir not detected"
</span> }
unset env(TMPDIR)
if {[macports::gettmpdir] ne "/tmp"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: default value not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: default value not set"
</span> }
return "Get tmp dir successful."
} -result "Get tmp dir successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -891,22 +891,22 @@ test arch_runnable {
</span> set macports::os_arch i386
set macports::os_platform darwin
if {[macports::arch_runnable ppc1] != no} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: major:12 arch:i386 arch:ppc* not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: major:12 arch:i386 arch:ppc* not detected"
</span> }
if {[macports::arch_runnable ppc64] != no} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: major:12 arch:i386 arch:ppc64 not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: major:12 arch:i386 arch:ppc64 not detected"
</span> }
set macports::os_major 7
set macports::os_arch i386
set macports::os_platform darwin
if {[macports::arch_runnable x86_64] != no} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: major:7 arch:i386 arch:x86_64 not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: major:7 arch:i386 arch:x86_64 not detected"
</span> }
set macports::os_major 12
set macports::os_arch i386
set macports::os_platform darwin
if {[macports::arch_runnable x86_64] != yes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: major:12 arch:i386 arch:x86_64 not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: major:12 arch:i386 arch:x86_64 not detected"
</span> }
return "Arch runnable successful."
} -result "Arch runnable successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -921,14 +921,14 @@ test path_is_in_prefix {
</span> } -body {
set macports::applications_dir appdir
if {[macports::path_is_in_prefix appdir/test/port] != yes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: application dir not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: application dir not detected"
</span> }
set macports::prefix prefix
if {[macports::path_is_in_prefix prefix/test/port] != yes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: prefix not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: prefix not detected"
</span> }
if {[macports::path_is_in_prefix test/port] != no} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: no prefix detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: no prefix detected"
</span> }
return "Path prefix successful."
} -result "Path prefix successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -939,11 +939,11 @@ test revupgrade_handle_special_paths {
</span> } -body {
set res [macports::revupgrade_handle_special_paths fname test_path]
if {$res ne "test_path"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong path"
</span> }
set res [macports::revupgrade_handle_special_paths fname @loader_path/test_load]
if {$res ne "./test_load"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong load path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong load path"
</span> }
return "Revupgrade handle special path successful."
} -result "Revupgrade handle special path successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -961,13 +961,13 @@ test get_pingtime {
</span> set macports::preferred_hosts macports_pref
} -body {
if {[macports::get_pingtime macports.org] ne "MacPorts"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong ping time"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong ping time"
</span> }
if {[macports::get_pingtime macports_blacklist] != -1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong time for blacklisted host"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong time for blacklisted host"
</span> }
if {[macports::get_pingtime macports_pref] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong time for preferred host"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong time for preferred host"
</span> }
return "Get ping time successful."
} -result "Get ping time successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -978,7 +978,7 @@ test set_pingtime {
</span> } -body {
set macports::ping_cache(macports) {}
if {[lindex [macports::set_pingtime macports 007] 0] != 007} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: ping time not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: ping time not set"
</span> }
return "Set ping time successful."
} -result "Set ping time successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1000,15 +1000,15 @@ test get_archive_sites_conf_values {
</span> set res [macports::get_archive_sites_conf_values]
puts $res
if {[lindex [split $res " "] 1] ne "macports.org:nosubdir"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: name not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: name not set"
</span> }
if {[lindex [split $res " "] 3] ne "tgz"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong type set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong type set"
</span> }
set macports::archive_sites_conf_values {a b c}
if {[macports::get_archive_sites_conf_values] ne {a b c}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong result for bad conf file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong result for bad conf file"
</span> }
return "Get archive sites conf values successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1020,7 +1020,7 @@ test get_archive_sites_conf_values {
</span> set shellescapeTests [list \
"using \\backslashes" \
" spaces " \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "and tabs" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "and tabs" \
</span> "quotes need to be \"supported\", too" \
"… and not only 'double-quotes'" \
"other meta chars such as \$dollar," \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/tests/macports_dlist.test b/src/macports1.0/tests/macports_dlist.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b4301fc..13a0957c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/tests/macports_dlist.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/tests/macports_dlist.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +20,17 @@ test dlist_match_multi {
</span> } -setup {
set mport [mportopen file://[pwd]]
set crit [list \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- provides gcc_select \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- porturl file://[pwd] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ provides gcc_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ porturl file://[pwd] \
</span> ]
set crit2 { provides fondu2 }
} -body {
if {[dlist_match_multi $mport $crit] ne $mport} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: correct dlist not matched"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: correct dlist not matched"
</span> }
if {[dlist_match_multi $mport $crit2] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect dlist matched"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect dlist matched"
</span> }
return "dlist match successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +44,10 @@ test dlist_search {
</span> set mport [mportopen file://.]
} -body {
if {[dlist_search $mport provides gcc_select] ne $mport} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: matching item not found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: matching item not found"
</span> }
if {[dlist_search $mport provides fondu2] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong item detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong item detected"
</span> }
return "dlist successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +63,10 @@ test dlist_delete {
</span> lappend dlist $mport
} -body {
if {[dlist_delete dlist $mport] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: cannot run dlist_delete"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: cannot run dlist_delete"
</span> }
if {$dlist ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: port not removed from list"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: port not removed from list"
</span> }
return "Dlist delete successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,10 +80,10 @@ test dlist_has_pending {
</span> set mport [mportopen file://.]
} -body {
if {[dlist_has_pending $mport gcc_select] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: not detected"
</span> }
if {[dlist_has_pending $mport provides] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect detected"
</span> }
return "dlist pending successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,14 +96,14 @@ test dlist_count_unmet {
</span> } -setup {
set mport [mportopen file://.]
array set statusdict {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- vara 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- varb 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- varc 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vara 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ varb 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ varc 1
</span> }
set tokens {vara varb vard}
} -body {
if {[dlist_count_unmet $mport statusdict $tokens] != 3} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong unmet number"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong unmet number"
</span> }
return "count unmet successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +127,7 @@ test dlist_append_dependents {
</span> set result {fondu2}
} -body {
if {[dlist_append_dependents $mport provides $result] ne {fondu2 provides}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong depends"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong depends"
</span> }
return "Append depends successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +142,7 @@ test dlist_get_next {
</span> set dict {gcc_select}
} -body {
if {[dlist_get_next $mport $dict] ne $mport} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong dlist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong dlist"
</span> }
return "dlist get next successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,16 +155,16 @@ test dlist_eval {
</span> } -setup {
set mport [mportopen file://.]
proc cond {arg} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match "ditem_*" $arg] != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match "ditem_*" $arg] != 0} {
</span> return 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> return 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
proc handler {arg} {}
} -body {
if {[dlist_eval $mport cond handler] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong value returned"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong value returned"
</span> }
return "dlist eval successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,10 +177,10 @@ test ditem_create {
</span> } -body {
set res [macports_dlist::ditem_create]
if {[string match "ditem_*" $res] == 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: ditem not created"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: ditem not created"
</span> }
if {[info exists macports_dlist::$res] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: array not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: array not set"
</span> }
return "Create ditem successful."
} -result "Create ditem successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,7 +192,7 @@ test ditem_delete {
</span> set res [macports_dlist::ditem_create]
set res [macports_dlist::ditem_delete $res]
if {[info exists macports_dlist::$res] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: array not deleted"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: array not deleted"
</span> }
return "Ditem delete successful."
} -result "Ditem delete successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,7 +205,7 @@ test ditem_key {
</span> macports_dlist::ditem_key $res macports test
} -body {
if {[array get macports_dlist::$res macports] ne "macports test"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL ditem key not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL ditem key not set"
</span> }
return "Ditem key successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +221,7 @@ test ditem_append {
</span> macports_dlist::ditem_append $res macports test2
} -body {
if {[array get macports_dlist::$res macports] ne "macports {test test2}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: ditem key not appended"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: ditem key not appended"
</span> }
return "Ditem key append successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,7 +237,7 @@ test ditem_append_unique {
</span> macports_dlist::ditem_append_unique $res macports test
} -body {
if {[array get macports_dlist::$res macports] ne "macports test"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: ditem key not unique"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: ditem key not unique"
</span> }
return "Ditem append unique successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,10 +251,10 @@ test ditem_contains {
</span> set mport [mportopen file://.]
} -body {
if {[ditem_contains $mport provides] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: valid key not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: valid key not detected"
</span> }
if {[ditem_contains $mport wants] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: invalid key detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: invalid key detected"
</span> }
return "ditem contains successful."
} -cleanup {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/tests/macports_util.test b/src/macports1.0/tests/macports_util.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 3360858b..9ff93f03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/tests/macports_util.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/tests/macports_util.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,19 +55,19 @@ test ldindex {
</span> } -body {
set list {0 1 2 3}
if {[ldindex list 1] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: correct element not popped, single index"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: correct element not popped, single index"
</span> }
if {$list ne {0 2 3}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong list remaining, single index"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong list remaining, single index"
</span> }
if {[catch {ldindex list 4}] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: error not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: error not detected"
</span> }
if {[ldindex list] ne {0 2 3}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: not all elements popped"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: not all elements popped"
</span> }
if {$list ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: list not emptied"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: list not emptied"
</span> }
set list {{{0 1} {2 3}} {{4 5} {6 7}}}
if {[ldindex list 1 1 1] != 7} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,10 +85,10 @@ test lpop {
</span> } -body {
set list {0 1 2}
if {[lpop list] != 2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: element not popped"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: element not popped"
</span> }
if {$list != {0 1}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong element popped"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong element popped"
</span> }
return "lpop successful."
} -result "lpop successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,13 +99,13 @@ test lpush {
</span> } -body {
set list {0 1}
if {[lpush list 2] != {0 1 2}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: element not appended"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: element not appended"
</span> }
if {[lpush list 3 4] != {0 1 2 3 4}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: multiple elements not appended"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: multiple elements not appended"
</span> }
if {[lpush list1 0] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: list not created"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: list not created"
</span> }
return "lpop successful."
} -result "lpop successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,13 +118,13 @@ test lshift {
</span> set list1 {}
if {[lshift list] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong element popped"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong element popped"
</span> }
if {$list != {1 2}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong list remaining"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong list remaining"
</span> }
if {[lshift list1] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: empty list not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: empty list not detected"
</span> }
return "lshift successful."
} -result "lshift successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,13 +136,13 @@ test lunshift {
</span> set list {3 4}
if {[lunshift list 2] != {2 3 4}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: element not inserted"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: element not inserted"
</span> }
if {[lunshift list 0 1] != {0 1 2 3 4}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: multiple elements not inserted"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: multiple elements not inserted"
</span> }
if {[lunshift list2 0] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: list not created"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: list not created"
</span> }
return "lunshift successful."
} -result "lunshift successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,15 +153,15 @@ test throw {
</span> Throw unit test.
} -setup {
proc test_proc {arg} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- catch {throw $arg} res
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch {throw $arg} res
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $res
</span> }
} -body {
if {[test_proc {7 msg info}] != "error: 7 msg info"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong error returneed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong error returneed"
</span> }
if {[catch {test_proc ""}] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong value returned"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong value returned"
</span> }
return "throw successful."
} -result "throw successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,13 +174,13 @@ test try {
</span> proc test_proc2 {} {try {error "msg" "info" 3} catch * {return 6}}
} -body {
if {[test_proc] != 7} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: try clause not working"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: try clause not working"
</span> }
if {[test_proc2] != 6} {
reutrn "FAIL: catch clause not working"
}
if {[catch {try}] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: no args err not detected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: no args err not detected"
</span> }
return "try successful."
} -result "try successful."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portchecksum.test b/src/port1.0/tests/portchecksum.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 65e381bd..3ed0c8fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portchecksum.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portchecksum.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +25,10 @@ test parse_checksum {
</span> set res [portchecksum::parse_checksums $checksums_str]
if {$res != "yes"} {return "FAIL: error in checksum parse"}
if {$checksums_array(file) != "md5 1111"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: invalid file options"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: invalid file options"
</span> }
if {$checksums_array(file2) != "sha1 3333"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: invalid file options"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: invalid file options"
</span> }
return "Parse checksum successful."
} -result "Parse checksum successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ test calc_md5 {
</span>
set res [portchecksum::calc_md5 $pwd/file]
if {$res != "9f70ecc1095ff10df81be6b5f218328d"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: unexpected md5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unexpected md5"
</span> }
return "Calc md5 successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ test calc_sha1 {
</span>
set res [portchecksum::calc_sha1 $pwd/file]
if {$res != "5560df60ff202ca8b8c3dcf51ad650b78e859261"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: unexpected sha1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unexpected sha1"
</span> }
return "Calc sha1 successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@ test calc_rmd160 {
</span>
set res [portchecksum::calc_rmd160 $pwd/file]
if {$res != "5aee5d12fe536e2e288e9f1daafd84f1bc17c3e6"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: unexpected rmd160"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unexpected rmd160"
</span> }
return "Calc rmd160 successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,7 @@ test calc_sha256 {
</span>
set res [portchecksum::calc_sha256 $pwd/file]
if {$res != "2f686816f2a80e8efcc4ef40ac4e898d27ce4205a61ee422d56f8c5e8b46612e"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: unexpected sha1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unexpected sha1"
</span> }
return "Calc sha256 successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +167,7 @@ test checksum_main {
</span> set checksum.skip yes
if {[portchecksum::checksum_main] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: checksum not skipped"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: checksum not skipped"
</span> }
set checksum.skip no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,12 +177,12 @@ test checksum_main {
</span> close [open $distpath/file w]
close [open $distpath/file2 w]
array set checksums_array {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file {md5 d41d8cd98f00b204e9800998ecf8427e}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file2 {sha1 da39a3ee5e6b4b0d3255bfef95601890afd80709}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file {md5 d41d8cd98f00b204e9800998ecf8427e}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file2 {sha1 da39a3ee5e6b4b0d3255bfef95601890afd80709}
</span> }
if {[portchecksum::checksum_main] != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: incorrect checksum"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: incorrect checksum"
</span> }
return "Checksum main successful."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portclean.test b/src/port1.0/tests/portclean.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 1468e272..9ec1e57a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portclean.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portclean.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ test clean_start {
</span> set prefix /opt/local
seteuid 333
if {[catch {clean_start args}] != 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: couldn't elevate privileges"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: couldn't elevate privileges"
</span> }
seteuid 0
return "Clean_start successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,16 +66,16 @@ test clean_dist {
</span> portclean::clean_dist
if {[file exists $distpath/dist_file]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: distfile not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: distfile not removed"
</span> }
if {[file exists $distpath/dist_file2]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: distfile not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: distfile not removed"
</span> }
if {[file exists $patchpath/patch_file2]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: patchfile not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: patchfile not removed"
</span> }
if {[file exists $portdbpath/distfiles/$dist_subdir]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: distfiles dir not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: distfiles dir not removed"
</span> }
return "Clean distfiles successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,10 +105,10 @@ test clean_work {
</span> portclean::clean_work
if {[file exists $subbuildpath]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: buildpath not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: buildpath not removed"
</span> }
if {[file exists $worksymlink]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: symlink not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: symlink not removed"
</span> }
return "Clean work successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +136,7 @@ test clean_logs {
</span> portclean::clean_logs
if {[file exists $subport]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: log dir not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: log dir not removed"
</span> }
return "Clean logs successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,13 +166,13 @@ test clean_archive {
</span> portclean::clean_archive
if {[file exists $portdbpath/incoming/subport-1_0.0.0.0.TMP]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: .TMP file not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: .TMP file not removed"
</span> }
if {![file exists $portdbpath/incoming/test.clean]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: removed unrelated file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: removed unrelated file"
</span> }
if {[file exists $portdbpath/incoming/subport-2_0.0.0.0.zip]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: zip archive not removed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: zip archive not removed"
</span> }
return "Clean archive successful."
</pre><pre style='margin:0'>
</pre>