Read $top_srcdir/versions instead of ../version.incl, so the script

gets all the versions.  Added tests for requests 63-88.

src/server/testsuite/lyskomd.0/01.exp

 # Check return values for a lot of functions.
 
-set f [open "../version.incl"]
-gets $f
-gets $f server_compat_version
+set f [open "$top_srcdir/versions"]
+while {[gets $f line] >= 0} {
+    if {[lindex $line 0] == "PROTOCOL-A-LEVEL:"} {
+	set protocol_a_level [lindex $line 1]
+    } elseif {[lindex $line 0] == "SERVER-SOFTWARE:"} {
+	set server_software [lindex $line 1]
+    } elseif {[lindex $line 0] == "SERVER-VERSION:"} {
+	set server_version [lindex $line 1]
+    } elseif {[lindex $line 0] == "SERVER-COMPAT-VERSION:"} {
+	set server_compat_version [lindex $line 1]
+    }
+}
 close $f
 
 lyskomd_start
@@ -238,10 +247,94 @@ simple_expect "%1075 14 0"
 # 62:login
 send "1076 62 0 [holl "broken"] 1\n"
 simple_expect "%1076 8 0"
+# 63:who-is-on-ident
+send "1077 63\n"
+simple_expect "=1077 0 \\*"
+# 64:get-session-info-ident
+send "1078 64 1\n"
+simple_expect "%1078 6 0"
+# 65:re-lookup-person
+send "1079 65 [holl "."]\n"
+simple_expect "=1079 2 { 5 6 }"
+# 66:re-lookup-conf
+send "1080 66 [holl "Pre.*m.*"]\n"
+simple_expect "=1080 2 { 1 2 }"
+# 67:lookup-person
+send "1081 67 [holl "ad"]\n"
+simple_expect "=1081 1 { 5 }"
+# 68:lookup-conf
+send "1082 68 [holl "n o lys"]\n"
+simple_expect "=1082 1 { 4 }"
+# 69:set-client-version
+send "1083 69 [holl "DejaGnu"] [holl "1.3"]\n"
+simple_expect "=1083"
+# 70:get-client-name
+send "1084 70 1\n"
+simple_expect "%1084 6 0"
+# 71:get-client-version
+send "1085 71 1\n"
+simple_expect "%1085 6 0"
+# 72:mark-text
+send "1086 72 1 239\n"
+simple_expect "%1086 6 0"
+# 73:unmark-text
+send "1087 73 1\n"
+simple_expect "%1087 6 0"
+# 74:re-z-lookup
+send "1088 74 [holl "LysKOM"] 1 1\n"
+simple_expect "=1088 2 { [holl "Nyheter om LysKOM"] 0000 4 [holl "Administratr .fr. LysKOM"] 1001 5 }"
+# 75:get-version-info
+send "1089 75\n"
+simple_expect "=1089 $protocol_a_level [holl "$server_software"] [holl "$server_version"]"
+# 76:lookup-z-name
+send "1090 76 [holl "pre m"] 1 1\n"
+simple_expect "=1090 2 { [holl "Presentation .av nya. mten"] 0000 1 [holl "Presentation .av nya. medlemmar"] 0000 2 }"
+# 77:set-last-read
+send "1091 77 3 4\n"
+simple_expect "%1091 6 0"
+# 78:get-uconf-stat
+send "1092 78 3\n"
+simple_expect "=1092 [holl "Lappar .p. drren"] 00001000 0 77"
+# 79:set-info
+send "1093 79 10901 1 2 3 4 1080\n"
+simple_expect "%1093 6 0"
+# 80:accept-async
+send "1094 80 0 { }\n"
+simple_expect "=1094"
+# 81:query-async
+send "1095 81\n"
+simple_expect "=1095 0 \\*"
+# 82:user-active
+send "1096 82\n"
+simple_expect "=1096"
+# 83:who-is-on-dynamic
+send "1097 83 1 1 0\n"
+simple_expect "=1097 1 { 1 0 0 $any_num 11000000 [holl ""] }"
+# 84:get-static-session-info
+send "1098 84 1\n"
+simple_expect "%1098 6 0"
+# 85:get-collate-table
+send "1099 85\n"
+unanchored_expect "^MRK:client0: =1099 256H" "collate-table start"
+unanchored_expect "0123456789" "collate digits"
+unanchored_expect "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "collate upper"
+unanchored_expect "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "collate lower"
+unanchored_expect "\377$nl" "collate end"
+# 86:create-text
+send "1100 86 [holl "some text"] 1 { 0 4 } 0 { }\n"
+simple_expect "%1100 6 0"
+# 87:create-anonymous-text
+send "1101 87 [holl "some text"] 1 { 0 4 } 0 { }\n"
+simple_expect "%1101 6 0"
+# 88:create-conf
+send "1102 88 [holl "new conf"] 0000 0 { }\n"
+simple_expect "%1102 6 0"
+send "1103 88 [holl "new conf"] 00000000 0 { }\n"
+simple_expect "%1103 6 0"
 
 # finally, check that 55=disconnect actually works without logging in.
-send "1077 55 1\n"
-simple_expect "=1077"
+send "1104 55 1\n"
+simple_expect "=1104"
 client_death 0
 
 client_start 0
@@ -250,32 +343,32 @@ send "A\n"
 send "[holl "DejaGnu test suite"]\n"
 simple_expect "LysKOM" "connected"
 # Turn of async messages
-send "1078 80 0 { }\n"
-simple_expect "=1078"
+send "1105 80 0 { }\n"
+simple_expect "=1105"
 
 # Log in
-send "1079 62 5 [holl "gazonk"] 0\n"
-simple_expect "=1079"
+send "1106 62 5 [holl "gazonk"] 0\n"
+simple_expect "=1106"
 
-send "1080 9 5 5\n"
-simple_expect "=1080 $any_time 5 255 0 0 \\*"
+send "1107 9 5 5\n"
+simple_expect "=1107 $any_time 5 255 0 0 \\*"
 
-send "1081 27 5 0 { }\n"
-simple_expect "=1081"
+send "1108 27 5 0 { }\n"
+simple_expect "=1108"
 
-send "1082 9 5 5\n"
-simple_expect "=1082 $any_time 5 255 0 0 \\*"
+send "1109 9 5 5\n"
+simple_expect "=1109 $any_time 5 255 0 0 \\*"
 
-send "1083 6 6 1\n"
-simple_expect "=1083 [holl "DejaGnu test suite.unknown.@localhost"] 0000010000000000 00000000 $any_time 0 0 1 0 0 0 0 0 0 1 0 0 1"
-send "1084 6 6 0\n"
-simple_expect "=1084 0H 0000010000000000 00000000 $any_time 0 0 1 0 0 0 0 0 0 1 0 0 1"
+send "1110 6 6 1\n"
+simple_expect "=1110 [holl "DejaGnu test suite.unknown.@localhost"] 0000010000000000 00000000 $any_time 0 0 1 0 0 0 0 0 0 1 0 0 1"
+send "1111 6 6 0\n"
+simple_expect "=1111 0H 0000010000000000 00000000 $any_time 0 0 1 0 0 0 0 0 0 1 0 0 1"
 
 talk_to client 0
 
-send "1085 42 255\n"
-simple_expect "=1085" "42=enable succeeded"
-send "1086 44 0\n"
-simple_expect "=1086" "44=shutdown-kom succeeded"
+send "1112 42 255\n"
+simple_expect "=1112" "42=enable succeeded"
+send "1113 44 0\n"
+simple_expect "=1113" "44=shutdown-kom succeeded"
 client_death 0
 lyskomd_death