Deal with messages coming out of order.

testsuite/expect/test1.89

@@ -133,10 +133,6 @@ expect {
 		incr task_mask $expect_out(2,string)
 		exp_continue
 	}
-	-re "setting affinity of task" {
-		incr verbose_cnt
-		exp_continue
-	}
 	-re "error" {
 		send_user "\nFAILURE: some error occurred\n"
 		set exit_code 1
@@ -152,6 +148,24 @@ if {$task_mask != $task_cnt} {
 	send_user "\nFAILURE: affinity mask inconsistent ($task_mask,$task_cnt)\n"
 	set exit_code 1
 }
+set verbose_cnt 0
+send "$srun -c1 --cpu_bind=verbose,map_cpu:0 $file_prog\n"
+expect {
+	-re "setting affinity of task" {
+		incr verbose_cnt
+		exp_continue
+	}
+	-re "error" {
+		send_user "\nFAILURE: some error occurred\n"
+		set exit_code 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: srun (from --allocate) not responding\n"
+		set exit_code 1
+	}
+	-re $prompt
+}
 if {$verbose_cnt != $task_cnt} {
 	send_user "\nFAILURE: verbose messages count inconsisent ($verbose_cnt,$task_cnt)\n"
 	set exit_code 1