<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch release-2.5
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/b0df97785ea3c320f86fb059aaa569f0673833f8">https://github.com/macports/macports-base/commit/b0df97785ea3c320f86fb059aaa569f0673833f8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.5 by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new b0df977  fix trace test on systems without /usr/include
</span>b0df977 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b0df97785ea3c320f86fb059aaa569f0673833f8
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 5 13:42:05 2019 +1100

<span style='display:block; white-space:pre;color:#404040;'>    fix trace test on systems without /usr/include
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit 51fb9ee765f50044d41e4becfed7cc564bc8cfb1)
</span>---
 tests/test/trace/Makefile    | 2 +-
 tests/test/trace/Portfile    | 2 +-
 tests/test/trace/master      | 4 ++--
 tests/test/trace/test.tcl.in | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tests/test/trace/Makefile b/tests/test/trace/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52e08c3..79165eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tests/test/trace/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tests/test/trace/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ test:
</span>   @([ "`id -u`" == "0" ] && sudo -u $(RUNUSR) touch ../tracetesttmp/rename-trace) || touch ../tracetesttmp/rename-trace
        @([ "`id -u`" == "0" ] && sudo -u $(RUNUSR) mkdir -p ../tracetesttmp/rmdir-trace) || mkdir -p ../tracetesttmp/rmdir-trace
        @rm -f /tmp/hello-trace
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        @ln -sf /usr/include/unistd.h /tmp/link-trace2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   @ln -sf /usr/share/man/man1/awk.1 /tmp/link-trace2
</span>   @-[ "`id -u`" == "0" ] && chown -h $(RUNUSR) /tmp/link-trace2
        @PORTSRC=$(PORTSRC) $(bindir)/port -vt test > output 2>&1 || (cat output; exit 1)
        @rm -f /tmp/link-trace2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tests/test/trace/Portfile b/tests/test/trace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bc388f..fe469e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tests/test/trace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tests/test/trace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ test {
</span>     # created, deleted or symlinked into place here
     fails {system "touch ../tracetesttmp/create-trace"}
     fails {system "rm ../tracetesttmp/delete-trace"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    fails {system "ln -s /usr/include/ ../tracetesttmp/link-trace"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    fails {system "ln -s /usr/share/ ../tracetesttmp/link-trace"}
</span>     # we also don't want mkdir or rmdir here
     fails {system "mkdir ../tracetesttmp/mkdir-trace"}
     fails {system "rmdir ../tracetesttmp/rmdir-trace"}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tests/test/trace/master b/tests/test/trace/master
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b91f53..0fa0ea1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tests/test/trace/master
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tests/test/trace/master
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,9 @@ Command failed: rm ../tracetesttmp/delete-trace
</span> Exit code: 1
 system "rm ../tracetesttmp/delete-trace" failed as expected
 ln: ../tracetesttmp/link-trace: No such file or directory
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Command failed: ln -s /usr/include/ ../tracetesttmp/link-trace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Command failed: ln -s /usr/share/ ../tracetesttmp/link-trace
</span> Exit code: 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-system "ln -s /usr/include/ ../tracetesttmp/link-trace" failed as expected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+system "ln -s /usr/share/ ../tracetesttmp/link-trace" failed as expected
</span> mkdir: ../tracetesttmp: No such file or directory
 Command failed: mkdir ../tracetesttmp/mkdir-trace
 Exit code: 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tests/test/trace/test.tcl.in b/tests/test/trace/test.tcl.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a618c80..7c5d61d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tests/test/trace/test.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tests/test/trace/test.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ proc test_trace {} {
</span> 
     file delete -force /tmp/hello-trace
     file delete -force /tmp/link-trace2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    file link -symbolic /tmp/link-trace2 /usr/include/unistd.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    file link -symbolic /tmp/link-trace2 /usr/share/man/man1/awk.1
</span> 
     makeDirectory ../tracetesttmp
     if {[getuid] == 0} {
</pre><pre style='margin:0'>

</pre>