Merge branch 'slurm-14.11'

Conflicts:
	NEWS
	testsuite/expect/test20.12

NEWS

@@ -173,6 +173,7 @@ documents those changes that are of interest to users and administrators.
     a newly submitted job can start immediately even if there is a higher
     priority non-runnable job which has been waiting for less time than
     bf_min_age_reserve.
+ -- qsub wrapper modified to export "all" with -V option
 
 * Changes in Slurm 14.11.5
 ==========================

testsuite/expect/Makefile.am

@@ -409,6 +409,7 @@ EXTRA_DIST = \
 	test20.9			\
 	test20.10			\
 	test20.11			\
+	test20.12			\
 	test21.1			\
 	test21.2			\
 	test21.3			\

testsuite/expect/Makefile.in

@@ -800,6 +800,7 @@ EXTRA_DIST = \
 	test20.9			\
 	test20.10			\
 	test20.11			\
+	test20.12			\
 	test21.1			\
 	test21.2			\
 	test21.3			\

testsuite/expect/test20.12

@@ -30,7 +30,6 @@ proc make_random_var_name {} {
 }
 
 proc run_qsub { variable1_name variable1_expect_val variable2_name variable2_expect_val qsub_extra_options extra_batch_header } {
-
 	global file_in
 	global file_out
 	global exit_code
@@ -45,6 +44,10 @@ proc run_qsub { variable1_name variable1_expect_val variable2_name variable2_exp
 	global variable2_value
 	global subtest_name
 
+	send_user "\n==============================================\n"
+	send_user "$subtest_name\n"
+	send_user "==============================================\n"
+
 	set job_id 0
 	exec rm -f $file_out
 	make_bash_script $file_in "$extra_batch_header\n$bin_echo $variable1_name=\$$variable1_name\n$bin_echo $variable2_name=\$$variable2_name\n"
@@ -86,7 +89,6 @@ proc run_qsub { variable1_name variable1_expect_val variable2_name variable2_exp
 	}
 	set matches 0
 	spawn $bin_cat $file_out
-
 	expect {
 		"$variable1_name=$variable1_expect_val\r\n" {
 			incr matches
@@ -111,8 +113,6 @@ proc run_qsub { variable1_name variable1_expect_val variable2_name variable2_exp
 	} else {
 		exit $exit_code
 	}
-
-	sleep 5
 }
 
 # Test -V
@@ -150,6 +150,5 @@ set var1_name [make_random_var_name]
 set var2_name [make_random_var_name]
 run_qsub $var1_name "LETITGOOO" $var2_name $variable2_value "-V -v $var1_name=LETITGOOO" "#SBATCH --export=NONE"
 
-
 send_user "\nSUCCESS\n"
 exit 0