svn merge -r12863:12876 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

src/plugins/mpi/mvapich/mvapich.c

@@ -836,8 +836,7 @@ mvapich_print_abort_message (mvapich_state_t *st, int rank,
 		msglen = 0;
 	}
 
-	host = slurm_step_layout_host_name(
-		sl, slurm_step_layout_host_id(sl, rank));
+	host = slurm_step_layout_host_name (sl, rank);
 
 	if (dest >= 0) {
 		const char *dsthost = slurm_step_layout_host_name (sl, dest);
@@ -855,10 +854,9 @@ mvapich_print_abort_message (mvapich_state_t *st, int rank,
 				st->job->jobid, st->job->stepid, 
 				rank, host, dest, dsthost, msgstr);
 		closelog();
-	}
-	else {
+	} else {
 		info ("mvapich: %M: ABORT from MPI rank %d [on %s]", 
-				rank, host);
+		      rank, host);
 		/*
 		 *  Log the abort event to syslog
 		 *   so that system administrators know about possible HW events.

testsuite/expect/test10.12

@@ -38,6 +38,11 @@ set non_bg      0
 
 print_header $test_id
 
+if { [test_bluegene] == 0 } {
+	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	exit 0
+}
+
 #
 # Test smap resolve ablilty
 # for XYZ coords to Rack Midplane

testsuite/expect/test20.4

@@ -41,16 +41,11 @@ if {[file executable $pbsnodes] == 0} {
 	exit 0
 }
 
-set match_state 0
-set match_pcpus 0
+set matches 0
 spawn $pbsnodes
 expect {
-	-re "state" {
-		incr match_state
-		exp_continue
-	}
-	-re "pcpus" {
-		incr match_pcpus
+	-re "state.*pcpus" {
+		incr matches
 		exp_continue
 	}
 	timeout {
@@ -61,7 +56,7 @@ expect {
 		wait
 	}
 }
-if {($match_state == 0) || ($match_pcpus == 0)} {
+if {$matches == 0} {
 	send_user "\nFAILURE: pbsnodes output failure\n"
 	set exit_code 1
 }