Merge remote-tracking branch 'origin/slurm-16.05' into slurm-17.02

testsuite/expect/test17.51

@@ -121,9 +121,9 @@ send_user "\n---Checking sbatch uses mcs-label only for some jobs (ondemand mode
 #
 # Change the slurm.conf MCSparameters and MCSPlugin
 #
-exec $bin_sed -i /^\s*MCSPlugin\s*=/Id $config_path/slurm.conf
-exec $bin_sed -i /^\s*MCSParameters\s*=/Id $config_path/slurm.conf
-exec $bin_sed -i /^\s*PrivateData\s*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*MCSPlugin\[\t\s\]*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*MCSParameters\[\t\s\]*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*PrivateData\[\t\s\]*=/Id $config_path/slurm.conf
 exec $bin_echo -e "\nMCSPlugin=mcs/user" >> $config_path/slurm.conf
 exec $bin_echo MCSParameters=ondemand,select,privatedata >> $config_path/slurm.conf
 exec $bin_echo PrivateData=jobs,nodes >> $config_path/slurm.conf
@@ -334,9 +334,9 @@ cancel_job $job_id
 # test with enforced
 #
 send_user "\n---Checking sbatch uses mcs-label with all jobs (enforced mode)---\n"
-exec $bin_sed -i /^\s*MCSPlugin\s*=/Id $config_path/slurm.conf
-exec $bin_sed -i /^\s*MCSParameters\s*=/Id $config_path/slurm.conf
-exec $bin_sed -i /^\s*PrivateData\s*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*MCSPlugin\[\t\s\]*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*MCSParameters\[\t\s\]*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*PrivateData\[\t\s\]*=/Id $config_path/slurm.conf
 exec $bin_echo -e "\nMCSPlugin=mcs/user" >> $config_path/slurm.conf
 exec $bin_echo MCSParameters=enforced,noselect,privatedata >> $config_path/slurm.conf
 exec $bin_echo PrivateData=jobs,nodes >> $config_path/slurm.conf

testsuite/expect/test17.52

@@ -136,9 +136,9 @@ expect {
 	}
 }
 
-exec $bin_sed -i /^\s*MCSPlugin\s*=/Id $config_path/slurm.conf
-exec $bin_sed -i /^\s*MCSParameters\s*=/Id $config_path/slurm.conf
-exec $bin_sed -i /^\s*PrivateData\s*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*MCSPlugin\[\t\s\]*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*MCSParameters\[\t\s\]*=/Id $config_path/slurm.conf
+exec $bin_sed -i /^\[\t\s\]*PrivateData\[\t\s\]*=/Id $config_path/slurm.conf
 exec $bin_echo -e "\nMCSPlugin=mcs/group" >> $config_path/slurm.conf
 exec $bin_echo MCSParameters=ondemand,select,privatedata:$groups_name >> $config_path/slurm.conf
 exec $bin_echo PrivateData=jobs,nodes >> $config_path/slurm.conf