<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8710">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update pretty_print to not look for asterisk version in output<br><br>This change is backwards compatible with all testsuite versions/branches.<br><br>Change-Id: Ibed22c46fc3b7bd71dffde93b900c6ed861eba8a<br>---<br>M contrib/scripts/pretty_print<br>1 file changed, 7 insertions(+), 6 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 200b0b3..d7df421 100755<br>--- a/contrib/scripts/pretty_print<br>+++ b/contrib/scripts/pretty_print<br>@@ -111,10 +111,10 @@<br>       buffer+=("$line")<br> <br>        ### Running tests for Asterisk GIT-master-99dea9b (run 1 of 1)...<br>-    if [[ $line =~ ^Running\ tests\ for\ (Asterisk\ +[^\ ]+)\ +\(run\ +([0-9]+)\ +of\ +([0-9]+)\)\.\.\. ]] ; then<br>-                run=${BASH_REMATCH[2]}<br>-               runs=${BASH_REMATCH[3]}<br>-              version=${BASH_REMATCH[1]}<br>+   ### The version may or may not not be present.<br>+       if [[ $line =~ ^Running\ tests\ for\ Asterisk[^\(]*\(run\ +([0-9]+)\ +of\ +([0-9]+)\)\.\.\. ]] ; then<br>+                run=${BASH_REMATCH[1]}<br>+               runs=${BASH_REMATCH[2]}<br>       fi<br>    ### Tests to run: 11 * 1 time(s) = 11  Maximum test inactivity time: 120 sec.<br>         if [[ $run -eq 1 && $line =~ ^Tests\ to\ run:\ +([0-9]+)\ +\*\ +([0-9]+)\ +time\(s\)\ +=\ +([0-9]+)\ +Maximum.test.inactivity.time:.([-0-9-]+) ]] ; then<br>@@ -145,9 +145,10 @@<br>                fi<br>    fi<br> <br>-        if [[ $line =~ ^Test.*tests/([^\']+)\',.*(passed|failed|timed\ out)$ ]] ; then<br>+       if [[ $line =~ ^Test\ *\[\'[^\']+\',\ *\'tests/([^\']+)\'(, \'[^\']+\')?\]\ *(passed|failed|timed\ out)$ ]] ; then<br>                test=${BASH_REMATCH[1]}<br>-              status=${BASH_REMATCH[2]}<br>+            _unused_arg=${BASH_REMATCH[2]}<br>+               status=${BASH_REMATCH[3]}<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/8710">change 8710</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/8710"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibed22c46fc3b7bd71dffde93b900c6ed861eba8a </div>
<div style="display:none"> Gerrit-Change-Number: 8710 </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: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>