<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bdf70c29a8c415865ff0b82ad3d1964aaee8da2f">https://github.com/macports/macports-ports/commit/bdf70c29a8c415865ff0b82ad3d1964aaee8da2f</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 bdf70c29a8c muniversal-1.0.tcl: Allow running tests on arm64
</span>bdf70c29a8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bdf70c29a8c415865ff0b82ad3d1964aaee8da2f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 10 10:38:05 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> muniversal-1.0.tcl: Allow running tests on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And don't try to test arm64 binaries on non-ARM systems; that wouldn't
</span><span style='display:block; white-space:pre;color:#404040;'> work.
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a6849785f2b..b31b8050b17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -860,7 +860,9 @@ variant universal {
</span> foreach arch ${universal_archs_to_use} {
# Rosetta does not translate G5 instructions
# PowerPC systems can't translate Intel instructions
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {(${os.arch} eq "i386" && ${arch} ne "ppc64") || (${os.arch} eq "powerpc" && ${arch} ni [list i386 x86_64])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(${os.arch} eq "arm" && ${arch} in [list arm64 x86_64])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${os.arch} eq "i386" && ${arch} in [list i386 ppc x86_64])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${os.arch} eq "powerpc" && ${arch} in [list ppc ppc64])} {
</span> ui_info "$UI_PREFIX [format [msgcat::mc "Testing %1\$s for architecture %2\$s"] ${subport} ${arch}]"
if { [info exists merger_test_env(${arch})] } {
</pre><pre style='margin:0'>
</pre>