Commit 44bb94ea authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Use "$hollerith" instead of a hard-coded regexp, to avoid parsing past

newlines.
parent a16295c3
...@@ -427,7 +427,7 @@ simple_expect "=9007 1 $any_time 10 100 0 0 \\* 6 $any_time 00000000" ...@@ -427,7 +427,7 @@ simple_expect "=9007 1 $any_time 10 100 0 0 \\* 6 $any_time 00000000"
kom_login 9 "PW9" 0 kom_login 9 "PW9" 0
send "10000 49 9\n" send "10000 49 9\n"
extracting_expect "=10000 \[0-9\]+H.* \[01\]+ 10000000 $any_time 0 $any_num (.*)" pers 1 extracting_expect "=10000 $hollerith \[01\]+ 10000000 $any_time 0 $any_num ($any*)" pers 1
# Call on self # Call on self
...@@ -435,7 +435,7 @@ send "10001 106 9 10011001\n" ...@@ -435,7 +435,7 @@ send "10001 106 9 10011001\n"
simple_expect "=10001" simple_expect "=10001"
send "10001 49 9\n" send "10001 49 9\n"
simple_expect "=10001 \[0-9\]+H.* \[01\]+ 10011001 $any_time 0 $any_num $pers" simple_expect "=10001 $hollerith \[01\]+ 10011001 $any_time 0 $any_num $pers"
# Call on supervised person # Call on supervised person
...@@ -446,7 +446,7 @@ send "10002 106 9 01100110\n" ...@@ -446,7 +446,7 @@ send "10002 106 9 01100110\n"
simple_expect "=10002" simple_expect "=10002"
send "10002 49 9\n" send "10002 49 9\n"
simple_expect "=10002 \[0-9\]+H.* \[01\]+ 01100110 $any_time 0 $any_num $pers" simple_expect "=10002 $hollerith \[01\]+ 01100110 $any_time 0 $any_num $pers"
# Call as administrator # Call as administrator
...@@ -458,7 +458,7 @@ send "10003 106 9 11000011\n" ...@@ -458,7 +458,7 @@ send "10003 106 9 11000011\n"
simple_expect "=10003" simple_expect "=10003"
send "10003 49 9\n" send "10003 49 9\n"
simple_expect "=10003 \[0-9\]+H.* \[01\]+ 11000011 $any_time 0 $any_num $pers" simple_expect "=10003 $hollerith \[01\]+ 11000011 $any_time 0 $any_num $pers"
# Call on secret person we don't know about # Call on secret person we don't know about
...@@ -470,7 +470,7 @@ simple_expect "%10004 10 7" ...@@ -470,7 +470,7 @@ simple_expect "%10004 10 7"
kom_login 5 "gazonk" 0 kom_login 5 "gazonk" 0
kom_enable 0 kom_enable 0
send "10005 49 7\n" send "10005 49 7\n"
simple_expect "=10005 \[0-9\]+H.* \[01\]+ 00000000 .*" simple_expect "=10005 $hollerith \[01\]+ 00000000 $any*"
# Call on person 0 # Call on person 0
...@@ -484,7 +484,7 @@ send "10007 106 9 10101010\n" ...@@ -484,7 +484,7 @@ send "10007 106 9 10101010\n"
simple_expect "%10007 12 9" simple_expect "%10007 12 9"
send "10008 49 9\n" send "10008 49 9\n"
simple_expect "=10008 \[0-9\]+H.* \[01\]+ 11000011 $any_time 0 $any_num $pers" simple_expect "=10008 $hollerith \[01\]+ 11000011 $any_time 0 $any_num $pers"
......
...@@ -54,7 +54,7 @@ simple_expect "=1002" ...@@ -54,7 +54,7 @@ simple_expect "=1002"
# Test async 6 # Test async 6
send "1003 4 [holl "Testing"]\n" send "1003 4 [holl "Testing"]\n"
simple_expect ":5 6 5 0 1 [holl "Testing"] ${any_num}H.*" simple_expect ":5 6 5 0 1 [holl "Testing"] $hollerith"
simple_expect "=1003" simple_expect "=1003"
# Test async 7 # Test async 7
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment