<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch release-2.4
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b6d72434ed46414aa1e3bd59f7166b46434ceb36">https://github.com/macports/macports-base/commit/b6d72434ed46414aa1e3bd59f7166b46434ceb36</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b6d72434ed46414aa1e3bd59f7166b46434ceb36
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Mon Mar 12 17:37:25 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> tests: Avoid using network in port1.0 unit tests
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using the network can cause tests to fail, for example due to missing
</span><span style='display:block; white-space:pre;color:#404040;'> root CA certificates or unsupported TLS versions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid these failures by replacing the Portfile with an empty one.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 521e0143893f89c35f084205f9230fbd24e30165)
</span>---
src/port1.0/tests/Portfile | 45 +++++++++++++++++++--------------------------
1 file changed, 19 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/Portfile b/src/port1.0/tests/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c923895..57aacd6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name gcc_select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers mww
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Switch the default compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description gcc_select lets you switch the default compiler. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It symlinks the standard compiler executables \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in the MacPorts prefix to the selected version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name emptyport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories sysutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Nothing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://svn.macports.org/repository/macports/contrib/select/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://downloads.sourceforge.net/project/macports/distfiles/select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.ignore_sslcert yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname select-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 18e1f95c2ddd88210aa52eb696261859af2dc3a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://github.com/kelseyhightower/nocode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles
</span> patch {
foreach patch $patchfiles {
set fd [open ${filespath}/${patch} r]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +24,16 @@ patch {
</span> close $fd
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man --name=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/etc/select/gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch ${destroot}${prefix}/etc/select/gcc/base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -d -m755 ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -d -m755 ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch ${destroot}${prefix}/share/${name}/EMPTY
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test {
touch ${worksrcpath}/README
file delete -force ${worksrcpath}/README
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span></pre><pre style='margin:0'>
</pre>