Cosmetic changes to the test suite

testsuite/expect/test1.2

@@ -67,7 +67,7 @@ expect {
 
 if {$task_cnt != $tasks} {
 	send_user "\nFAILURE: Did not get proper number of tasks: "
-	send_user "$task_cnt, $tasks\n"
+	send_user "$task_cnt != $tasks\n"
 	set exit_code 1
 }
 if {$exit_code == 0} {

testsuite/expect/test1.25

@@ -47,12 +47,10 @@ set host_0      ""
 set timeout [expr $max_job_delay + $sleep_time]
 if { [test_bluegene] } {
 	set node_cnt 32-32k
+} elseif { [test_xcpu] } {
+	set node_cnt 1-1
 } else {
-	if { [test_xcpu] } {
-		set node_cnt 1-1
-	} else {
-		set node_cnt 1-64
-	}
+	set node_cnt 1-64
 }
 
 set srun_pid [spawn $srun -N$node_cnt --no-kill -t1 $bin_sleep $sleep_time]

testsuite/expect/test1.35

@@ -72,12 +72,10 @@ set timeout $max_job_delay
 
 if { [test_bluegene] } {
 	set node_cnt 32-2048
+} elseif { [test_xcpu] } {
+	set node_cnt 1-1
 } else {
-	if { [test_xcpu] } {
-		set node_cnt 1-1
-	} else {
-		set node_cnt 1-4
-	}
+	set node_cnt 1-4
 }
 
 set srun_pid [spawn $sbatch -N$node_cnt --output=$file_out --error=$file_err -t1 $file_in]