<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/ae7f1f1117b4c2195c6e60b6c42379f57164d8a2">https://github.com/macports/macports-base/commit/ae7f1f1117b4c2195c6e60b6c42379f57164d8a2</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 ae7f1f111 fix archivefetch tests
</span>ae7f1f111 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae7f1f1117b4c2195c6e60b6c42379f57164d8a2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Sep 22 00:39:39 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> fix archivefetch tests
</span>---
src/package1.0/tests/library.tcl | 10 +++++++---
src/package1.0/tests/portarchivefetch.test | 30 +++++++++++++++++-------------
src/port1.0/portutil.tcl | 2 +-
3 files changed, 25 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/tests/library.tcl b/src/package1.0/tests/library.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3be6f4233..ae5e57002 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/tests/library.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/tests/library.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,13 @@
</span> proc env_init {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform os.major os.arch epoch destpath package.destpath build_arch configure.build_arch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport version revision package.flat maintainers description categories homepage \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs porturl workpath distname license filespath portpath pwd name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.platform os.subplatform os.major os.arch epoch destpath package.destpath build_arch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.build_arch subport version revision package.flat maintainers description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories homepage supported_archs porturl workpath distname license filespath portpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pwd name platforms
</span>
set os.platform darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os.subplatform macosx
</span> set os.major 9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os.version 9.0.0
</span> set os.arch i386
set epoch 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +25,7 @@ proc env_init {} {
</span> set version 060102
set distname fondu_src-060102
set revision 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set platforms darwin
</span> set license BSD
set package.flat no
set maintainers {test@macports.org}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/tests/portarchivefetch.test b/src/package1.0/tests/portarchivefetch.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 29cf24996..eb7963df5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/tests/portarchivefetch.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/tests/portarchivefetch.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,17 +29,19 @@ proc ui_progress_download {args} {
</span> test filter_sites {
Filter sites unit test.
} -setup {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform os.major os.arch destpath package.destpath configure.build_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision package.flat maintainers description categories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global supported_archs name porturl portdbpath portpath workpath distname filespath license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.platform os.subplatform os.major os.version os.arch destpath package.destpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.build_arch subport version revision package.flat maintainers description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories supported_archs name porturl portdbpath portpath workpath distname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filespath license platforms
</span> env_init
set portvariants {var1}
set porturl http://www.fondu.sourceforge.net/fondu-060102_1var1.darwin_9.noarch.tgz
} -body {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[portarchivefetch::filter_sites] != "http://www.fondu.sourceforge.net/:tgz"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "FAIL: couldn't fetch file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set result [portarchivefetch::filter_sites]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result ne "http://www.fondu.sourceforge.net/:tgz"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: portarchivefetch::filter_sites returned '$result'"
</span> }
return "Filter sites successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,9 +51,10 @@ test filter_sites {
</span> test checkarchivefiles {
Check archive files unit test.
} -setup {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform os.major os.arch destpath package.destpath configure.build_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision package.flat maintainers description categories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global supported_archs name porturl portdbpath portpath workpath distname filespath license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.platform os.subplatform os.major os.version os.arch destpath package.destpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.build_arch subport version revision package.flat maintainers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description categories supported_archs name porturl portdbpath portpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workpath distname filespath license platforms
</span> env_init
set urls {www.a.com www.b.com}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +66,10 @@ test checkarchivefiles {
</span> if {[catch {portarchivefetch::checkarchivefiles $urls}] != 0} {
return "FAIL: cannot run checkarchivefiles"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lindex $all_archive_files 0] != "fondu-060102_1var1.darwin_9.noarch.zip"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lindex $all_archive_files 0] ne "fondu-060102_1var1.darwin_9.noarch.zip"} {
</span> return "FAIL: invalid archive file name"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lindex $all_archive_files 1] != "fondu-060102_1var1.darwin_9.noarch.tgz"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lindex $all_archive_files 1] ne "fondu-060102_1var1.darwin_9.noarch.tgz"} {
</span> return "FAIL: invalid archive file name"
}
return "Check archive files successful."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,9 +85,10 @@ test fetchfiles {
</span> } -constraints {
root
} -setup {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform os.major os.arch destpath package.destpath configure.build_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision package.flat maintainers description categories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global supported_archs name porturl portdbpath portpath workpath distname filespath license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.platform os.subplatform os.major os.version os.arch destpath package.destpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.build_arch subport version revision package.flat maintainers description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories supported_archs name porturl portdbpath portpath workpath distname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filespath license platforms
</span> env_init
array set ::portfetch::urlmap {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e54c9f490..f6537a138 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2721,7 +2721,7 @@ proc PortGroup {group version} {
</span>
# return filename of the archive for this port
proc get_portimage_name {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global subport version revision portvariants os.platform os.major portarchivetype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global subport version revision portvariants portarchivetype
</span> set ret "${subport}-${version}_${revision}${portvariants}.[_get_archive_platform].[join [get_canonical_archs] -].${portarchivetype}"
# should really look up NAME_MAX here, but it's 255 for all macOS so far
# (leave 10 chars for an extension like .rmd160 on the sig file)
</pre><pre style='margin:0'>
</pre>