<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>



<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">

<h3>
James Browning pushed to branch 20k-Nov22-install-test-fix
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/-/commit/9508f06d912684f17e8856178c406c9d120f3626">9508f06d</a></strong>
<div>
<span>by James Browning</span>
<i>at 2020-11-27T05:16:29-08:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">bin_test: fix typo remove copypasta

</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#d240879a9c04c846954f97d69f96e6af9b13d26a">
wafhelpers/bin_test.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="d240879a9c04c846954f97d69f96e6af9b13d26a">
<a href="https://gitlab.com/NTPsec/ntpsec/-/commit/9508f06d912684f17e8856178c406c9d120f3626#d240879a9c04c846954f97d69f96e6af9b13d26a"><strong>wafhelpers/bin_test.py</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="58" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="58" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -58,7 +58,7 @@ def run(cmd, expected, pythonic, apath=None, environ=None):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="58" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
58
</td>
<td class="diff-line-num new_line" data-linenumber="58" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
58
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC58" class="line" lang="python">    <span class="s" style="color: #d14;">"""Run an individual test."""</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="59" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
59
</td>
<td class="diff-line-num new_line" data-linenumber="59" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
59
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC59" class="line" lang="python">    <span class="n" style="color: #333;">odir</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">apath</span> <span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">apath</span> <span class="k" style="font-weight: 600;">else</span> <span class="n" style="color: #333;">waflib</span><span class="p">.</span><span class="n" style="color: #333;">Context</span><span class="p">.</span><span class="n" style="color: #333;">out_dir</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="60" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
60
</td>
<td class="diff-line-num new_line" data-linenumber="60" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
60
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC60" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="61" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
61
</td>
<td class="diff-line-num new_line old" data-linenumber="61" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
 
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC61" class="line" lang="python">    <span class="n" style="color: #333;">environ</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">environ</span> <span class="ow" style="font-weight: 600;">i<span class="idiff left right">s</span></span> <span class="nb" style="color: #0086b3;">isinstance</span><span class="p">(</span><span class="n" style="color: #333;">environ</span><span class="p">,</span> <span class="nb" style="color: #0086b3;">dict</span><span class="p">)</span> <span class="k" style="font-weight: 600;">else</span> <span class="p">{}</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="62" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
 
</td>
<td class="diff-line-num new new_line" data-linenumber="61" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
61
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC61" class="line" lang="python">    <span class="n" style="color: #333;">environ</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">environ</span> <span class="k" style="font-weight: 600;">i<span class="idiff left right">f</span></span> <span class="nb" style="color: #0086b3;">isinstance</span><span class="p">(</span><span class="n" style="color: #333;">environ</span><span class="p">,</span> <span class="nb" style="color: #0086b3;">dict</span><span class="p">)</span> <span class="k" style="font-weight: 600;">else</span> <span class="p">{}</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="62" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
62
</td>
<td class="diff-line-num new_line" data-linenumber="62" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
62
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC62" class="line" lang="python">    <span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">apath</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="63" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
63
</td>
<td class="diff-line-num new_line" data-linenumber="63" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
63
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC63" class="line" lang="python">        <span class="n" style="color: #333;">cmd</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">[</span><span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">sep</span><span class="p">.</span><span class="n" style="color: #333;">join</span><span class="p">([</span><span class="s" style="color: #d14;">'.'</span><span class="p">]</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">cmd</span><span class="p">[</span><span class="mi" style="color: #099;">0</span><span class="p">].</span><span class="n" style="color: #333;">split</span><span class="p">(</span><span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">sep</span><span class="p">)[</span><span class="o" style="font-weight: 600;">-</span><span class="mi" style="color: #099;">1</span><span class="p">:])]</span> <span class="o" style="font-weight: 600;">+</span> <span class="nb" style="color: #0086b3;">list</span><span class="p">(</span><span class="n" style="color: #333;">cmd</span><span class="p">[</span><span class="mi" style="color: #099;">1</span><span class="p">:])</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="64" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
64
</td>
<td class="diff-line-num new_line" data-linenumber="64" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
64
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC64" class="line" lang="python">    <span class="n" style="color: #333;">prefix</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">"running: "</span> <span class="o" style="font-weight: 600;">+</span> <span class="s" style="color: #d14;">" "</span><span class="p">.</span><span class="n" style="color: #333;">join</span><span class="p">(</span><span class="n" style="color: #333;">cmd</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="107" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="107" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -107,7 +107,7 @@ def cmd_bin_test(ctx):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="107" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
107
</td>
<td class="diff-line-num new_line" data-linenumber="107" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
107
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC107" class="line" lang="python">        <span class="n" style="color: #333;">libpath</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">destdir</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">ctx</span><span class="p">.</span><span class="n" style="color: #333;">env</span><span class="p">.</span><span class="n" style="color: #333;">LIBDIR</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="108" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
108
</td>
<td class="diff-line-num new_line" data-linenumber="108" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
108
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC108" class="line" lang="python">        <span class="n" style="color: #333;">python_wrap</span> <span class="o" style="font-weight: 600;">=</span> <span class="bp" style="color: #999;">False</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="109" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
109
</td>
<td class="diff-line-num new_line" data-linenumber="109" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
109
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC109" class="line" lang="python">        <span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">destdir</span> <span class="o" style="font-weight: 600;">!=</span> <span class="s" style="color: #d14;">'/'</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="110" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
110
</td>
<td class="diff-line-num new_line old" data-linenumber="110" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
 
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC110" class="line" lang="python">            <span class="n" style="color: #333;">path</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">destdir</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">sep</span><span class="idiff left"> </span><span class="k" style="font-weight: 600;"><span class="idiff">if</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">destdir</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">!=</span></span><span class="idiff"> </span><span class="s" style="color: #d14;"><span class="idiff right">'/'</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
 
</td>
<td class="diff-line-num new new_line" data-linenumber="110" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
110
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC110" class="line" lang="python">            <span class="n" style="color: #333;">path</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">destdir</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">sep</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
111
</td>
<td class="diff-line-num new_line" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
111
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC111" class="line" lang="python">            <span class="n" style="color: #333;">spath</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">path</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">ctx</span><span class="p">.</span><span class="n" style="color: #333;">env</span><span class="p">.</span><span class="n" style="color: #333;">SBINDIR</span><span class="p">[</span><span class="mi" style="color: #099;">1</span><span class="p">:]</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">sep</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="112" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
112
</td>
<td class="diff-line-num new_line" data-linenumber="112" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
112
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC112" class="line" lang="python">            <span class="n" style="color: #333;">path</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">path</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">ctx</span><span class="p">.</span><span class="n" style="color: #333;">env</span><span class="p">.</span><span class="n" style="color: #333;">BINDIR</span><span class="p">[</span><span class="mi" style="color: #099;">1</span><span class="p">:]</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">sep</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="113" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
113
</td>
<td class="diff-line-num new_line" data-linenumber="113" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
113
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC113" class="line" lang="python">            <span class="n" style="color: #333;">env</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">{</span><span class="s" style="color: #d14;">'PYTHONPATH'</span><span class="p">:</span> <span class="n" style="color: #333;">pypath</span><span class="p">,</span></span>
</pre>
</td>
</tr>

</table>
<br>
</li>

</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">

<br>
<a href="https://gitlab.com/NTPsec/ntpsec/-/commit/9508f06d912684f17e8856178c406c9d120f3626">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/-/commit/9508f06d912684f17e8856178c406c9d120f3626"}}</script>


</p>
</div>
</body>
</html>