<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d713bfc226fb48e9fc22f6a8529acb96046808f4">https://github.com/macports/macports-base/commit/d713bfc226fb48e9fc22f6a8529acb96046808f4</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 d713bfc22 Fix test failures
</span>d713bfc22 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d713bfc226fb48e9fc22f6a8529acb96046808f4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Feb 12 05:10:12 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Fix test failures
</span>---
src/macports1.0/macports.tcl | 2 +-
src/macports1.0/macports_dlist.tcl | 4 +++-
src/macports1.0/tests/macports.test | 2 +-
src/macports1.0/tests/macports_dlist.test | 25 +++++++++++++++++++------
4 files changed, 24 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b4609686f..46f94cfb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3596,7 +3596,7 @@ proc mportclose {mport} {
</span> dlist_delete macports::open_mports $mport
set workername [ditem_key $mport workername]
interp delete $workername
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set porturl [ditem_key $mport porturl]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #set porturl [ditem_key $mport porturl]
</span> #if {[info exists macports::extracted_portdirs($porturl)]} {
# TODO port.tcl calls mportopen multiple times on the same port to
# determine a number of attributes and will close the port after
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_dlist.tcl b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e0047277..3eb3a0aeb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_dlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,8 +391,10 @@ proc ditem_key {ditem args} {
</span> } else {
return {}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[info exists $ditem]} {
</span> return [set $ditem]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {}
</span> }
}
<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 b59eaacba..e62da024e 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;'>@@ -35,7 +35,7 @@ test mportclose {
</span> if {[catch {mportclose $mport}] != 0} {
return "FAIL: cannot run mportclose"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[ditem_key $mport workername] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {ditem_key $mport workername} result] && $result ne ""} {
</span> return "FAIL: port not closed"
}
return "Mport close successful."
<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 13a0957c2..6443b1f42 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;'>@@ -124,10 +124,23 @@ test dlist_append_dependents {
</span> Dlist append dependents unit test.
} -setup {
set mport [mportopen file://.]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set result {fondu2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key $mport requires [list a e]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set result [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dlist [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dname {a b c d e f} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $dname [ditem_create]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key [set $dname] provides $dname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dlist [set $dname]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key $a requires [list b c]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key $b requires [list e]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dlist $mport
</span> } -body {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[dlist_append_dependents $mport provides $result] ne {fondu2 provides}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: wrong depends"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set expected [lsort [list $mport $a $b $c $e]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newlist [lsort [dlist_append_dependents $dlist $mport $result]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$newlist ne $expected} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: wrong depends: $newlist (expected $expected)"
</span> }
return "Append depends successful."
} -cleanup {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +217,7 @@ test ditem_key {
</span> set res [macports_dlist::ditem_create]
macports_dlist::ditem_key $res macports test
} -body {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[array get macports_dlist::$res macports] ne "macports test"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict get [set macports_dlist::$res]] ne "macports test"} {
</span> return "FAIL ditem key not set"
}
return "Ditem key successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,7 +233,7 @@ test ditem_append {
</span> macports_dlist::ditem_key $res macports test
macports_dlist::ditem_append $res macports test2
} -body {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[array get macports_dlist::$res macports] ne "macports {test test2}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict get [set macports_dlist::$res]] ne "macports {test test2}"} {
</span> return "FAIL: ditem key not appended"
}
return "Ditem key append successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,7 +249,7 @@ test ditem_append_unique {
</span> macports_dlist::ditem_key $res macports test
macports_dlist::ditem_append_unique $res macports test
} -body {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[array get macports_dlist::$res macports] ne "macports test"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict get [set macports_dlist::$res]] ne "macports test"} {
</span> return "FAIL: ditem key not unique"
}
return "Ditem append unique successful."
</pre><pre style='margin:0'>
</pre>