Merged revisions 119998 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r119998 | murf | 2008-06-03 09:49:34 -0600 (Tue, 03 Jun 2008) | 16 lines

Merged revisions 119966 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119966 | murf | 2008-06-03 09:26:56 -0600 (Tue, 03 Jun 2008) | 8 lines

Updated the regressions on AEL. Hadn't updated
this for the changes I made to preserve ${EXTEN}
in switches, which affected several tests because
it adds extra priorities, and at least one needed to be updated
because of the removal of the empty extension warning
message.


........

................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120000 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 12 insertions, 11 deletions

diff --git a/pbx/ael/ael-test/ref.ael-vtest17 b/pbx/ael/ael-test/ref.ael-vtest17
index bb4204caa..596771161 100644
--- a/pbx/ael/ael-test/ref.ael-vtest17
+++ b/pbx/ael/ael-test/ref.ael-vtest17
@@ -1,12 +1,12 @@
 
 
 [dialextens]
-exten => _10X,1,Dial(Zap/${EXTEN:2}\,30\,tw)
-exten => _1ZX,1,Dial(Zap/${EXTEN:1}\,30\,tw)
+exten => _10X,1,Dial(Zap/${EXTEN:2},30,tw)
+exten => _1ZX,1,Dial(Zap/${EXTEN:1},30,tw)
 
 
 [dialthrus]
-exten => _3XX,1,Dial(Zap/${EXTEN:1}\,30\,tw)
+exten => _3XX,1,Dial(Zap/${EXTEN:1},30,tw)
 
 
 [t1incoming]
@@ -40,18 +40,19 @@ exten => 81,9,Set(time2=${EPOCH})
 exten => 81,10,Verbose(The time diff is $[${time2} - ${time1} ] seconds)
 exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ])
 exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ])
-exten => 82,1,Gosub(ndeep\,s\,1(100000))
+exten => 82,1,Gosub(ndeep,s,1(100000))
 exten => 82,2,Verbose(Finished 100000 levels deep call!)
-exten => 83,1,Goto(sw-2-${EXTEN}\,10)
-exten => 83,2,NoOp(Finish switch-extension-2)
-exten => _sw-2-.,10,Goto(83\,2)
+exten => 83,1,Set(~~EXTEN~~=${EXTEN})
+exten => 83,2,Goto(sw-2-${~~EXTEN~~},10)
+exten => 83,3,NoOp(Finish switch-extension-2)
+exten => _sw-2-.,10,Goto(83,3)
 exten => sw-2-,10,Goto(sw-2-.|10)
 exten => _sw-2-[4-7]X,10,Verbose(and this too!)
-exten => _sw-2-[4-7]X,11,Goto(sw-2-.\,10)
+exten => _sw-2-[4-7]X,11,Goto(sw-2-.,10)
 exten => _sw-2-9X,10,Verbose(handle both 8x and 9x calls)
-exten => _sw-2-9X,11,Goto(sw-2-49\,10)
+exten => _sw-2-9X,11,Goto(sw-2-49,10)
 exten => _sw-2-8X,10,Verbose(do something to prepare it)
-exten => _sw-2-8X,11,Goto(sw-2-99\,10)
+exten => _sw-2-8X,11,Goto(sw-2-99,10)
 
 
 [ndeep]
@@ -60,7 +61,7 @@ exten => s,2,GotoIf($[${level} == 0]?3:5)
 exten => s,3,Verbose(2|Got to Level 0)
 exten => s,4,Return()
 exten => s,5,NoOp(Finish if-ndeep-3)
-exten => s,6,Gosub(ndeep\,s\,1($[${level}-1]))
+exten => s,6,Gosub(ndeep,s,1($[${level}-1]))
 exten => s,7,Return()