<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4e5e475d964ede2367cfac812ae55923b6106827">https://github.com/macports/macports-ports/commit/4e5e475d964ede2367cfac812ae55923b6106827</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4e5e475d964ede2367cfac812ae55923b6106827
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 16 17:48:26 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> salt: Run test phase normally; don't override it
</span>---
sysutils/salt/Portfile | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/salt/Portfile b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56a182422c1..3e18fbaf90a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,15 +162,24 @@ if {$subport eq $name} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-test {
</span> copy ${worksrcpath}/conf ${worksrcpath}/test
file mkdir ${worksrcpath}/test/cache
reinplace -E "s|^#?cachedir:.*$|cachedir: ${worksrcpath}/test/cache|" \
${worksrcpath}/test/minion
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PYTHONPATH=${worksrcpath}/build/lib ${python.bin} scripts-${python.branch}/salt-call --log-file=${worksrcpath}/build/minion.log --config-dir=${worksrcpath}/test --hard-crash --local --id=local test.versions_information"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env PYTHONPATH=${worksrcpath}/build/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${python.bin} scripts-${python.branch}/salt-call
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test.versions_information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args --log-file=${worksrcpath}/build/minion.log \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --config-dir=${worksrcpath}/test \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --hard-crash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --local \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --id=local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach daemon [list minion master syndic api] {
subport salt-${daemon} {
startupitem.create yes
</pre><pre style='margin:0'>
</pre>