- fix miscalculation in column numbers when multiple tabs

  or empty lines are involved;
- change linku1() to return the head of the list (unused at the moment);
- ignore the source line number in runtests as they change with the
  source and cause mismatches in the comparison with the reference output.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23130 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 2 deletions

diff --git a/pbx/ael/ael-test/runtests b/pbx/ael/ael-test/runtests
index c0d148de4..a8de9eaec 100755
--- a/pbx/ael/ael-test/runtests
+++ b/pbx/ael/ael-test/runtests
@@ -1,9 +1,12 @@
 #!/bin/bash
-
+ORIG=`mktemp /tmp/mytest.XXXXXX`
+NEW=`mktemp /tmp/mytest.XXXXXX`
 for i in ael-test*; do
 	echo -n Test: $i..................
 	(cd $i; ../../../../utils/aelparse -n -d | grep -v -i 'seconds' > ../res.$i)
-	if (diff -q res.$i ref.$i > /dev/null 2>&1 ) then
+	sed 's/line:[0-9]*//; /^Executed.*/d' < res.$i > $NEW
+	sed 's/line:[0-9]*//; /^Executed.*/d' < ref.$i > $ORIG
+	if (diff -q $NEW $ORIG > /dev/null 2>&1 ) then
 		echo PASSED
 		rm res.$i
 	else
@@ -12,3 +15,4 @@ for i in ael-test*; do
 	fi
 
 done
+rm $NEW $ORIG