svn merge -r11622:11624 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

testsuite/expect/test1.59

@@ -171,7 +171,7 @@ for {set i 0} {$i<4} {incr i} {
 	#
 	# execute srun with a specific node count
 	#
-	send "$srun -l $extra $bin_printenv SLURMD_NODENAME\n"
+	send "$srun -l $extra -0 $bin_printenv SLURMD_NODENAME\n"
 	expect {
 		-re "($number): ($alpha_numeric)" {
 			set task_id $expect_out(1,string)
@@ -314,7 +314,7 @@ for {set i 0} {$i<4} {incr i} {
 	# execute srun with a specific node count
 	#
 	
-	send "$srun -l $extra $bin_printenv SLURMD_NODENAME\n"
+	send "$srun -l $extra -O $bin_printenv SLURMD_NODENAME\n"
 	
 	expect {
 		-re "($number): ($alpha_numeric)" {