Merge branch 'slurm-2.6'

testsuite/expect/test1.70

@@ -37,13 +37,14 @@ set file_out    "test$test_id.out"
 set file_in     "$srun"
 set exit_code   0
 
+print_header $test_id
 
 if {[test_cray]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
-	exit 1
+	exit 0
 } elseif {[test_launch_poe]} {
 	send_user "\nWARNING: This test is incompatible with poe\n"
-	exit 1
+	exit 0
 }
 
 # Remove any remaining files

testsuite/expect/test11.2

@@ -112,7 +112,8 @@ if { $got_output != 1 } {
 set got_output   0
 spawn $poe printenv MP_EUIDEVICE -labelio yes -rmpool $partition -euilib ip -euidevice eth0
 expect {
-	-re "($number): *eth0" {
+	# Might return "ethernet" or "eth0" on various systems
+	-re "($number): *eth" {
 		set got_output 1
 		exp_continue
 	}