<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8958">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pretty_print: Update the result regex<br><br>Depending on teh branch of the testsuite being run, the test result<br>line may or may not have the name of the python module that actually<br>runs the test...  Example:<br><br>Test ['./lib/python/asterisk/test_runner.py', 'tests/abc'] passed<br>or<br>Test ['tests/abc'] passed<br><br>This patch updates the regex that matches the test result to acount<br>for both situations.<br><br>Change-Id: I2349109d062629b97b2e2a5a40402395d7863448<br>---<br>M contrib/scripts/pretty_print<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/contrib/scripts/pretty_print b/contrib/scripts/pretty_print<br>index d7df421..8ee22d8 100755<br>--- a/contrib/scripts/pretty_print<br>+++ b/contrib/scripts/pretty_print<br>@@ -145,10 +145,10 @@<br>           fi<br>    fi<br> <br>-        if [[ $line =~ ^Test\ *\[\'[^\']+\',\ *\'tests/([^\']+)\'(, \'[^\']+\')?\]\ *(passed|failed|timed\ out)$ ]] ; then<br>-               test=${BASH_REMATCH[1]}<br>-              _unused_arg=${BASH_REMATCH[2]}<br>-               status=${BASH_REMATCH[3]}<br>+    if [[ $line =~ ^Test\ *\[(\'[^\']+\',)?\ *\'tests/([^\']+)\'(, \'[^\']+\')?\]\ *(passed|failed|timed\ out)$ ]] ; then<br>+            test=${BASH_REMATCH[2]}<br>+              _unused_arg=${BASH_REMATCH[3]}<br>+               status=${BASH_REMATCH[4]}<br>             col=$(( ${TERM_WIDTH:-$(tput cols)} - ${#status_string} ))<br>            et=$(( $SECONDS - $st ))<br>              [ $countpid -gt 0 ] && kill $countpid<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8958">change 8958</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8958"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: certified/13.21 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2349109d062629b97b2e2a5a40402395d7863448 </div>
<div style="display:none"> Gerrit-Change-Number: 8958 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>