Merge branch 'slurm-2.5'

src/common/timers.h

@@ -41,7 +41,7 @@
 
 #include <sys/time.h>
 
-#define DEF_TIMERS	struct timeval tv1, tv2; char tv_str[20]
+#define DEF_TIMERS	struct timeval tv1, tv2; char tv_str[20] = ""
 #define START_TIMER	gettimeofday(&tv1, NULL)
 #define END_TIMER	gettimeofday(&tv2, NULL); \
                 	slurm_diff_tv_str(&tv1, &tv2, tv_str, 20, NULL, 0)

testsuite/expect/inc3.11.8

@@ -60,7 +60,7 @@ proc inc3_11_8 {} {
 	set thread_res_num [ expr $core_res_num * $res_thread_cnt ]
 
 	# (First test) Submit the batch job: a simple job using half the threads on the nodes
-	set sbatch_pid [spawn $sbatch --nodes=1-$num_nodes --time=30:00 --ntasks-per-node=$thread_res_num --output=/dev/null $file_in]
+	set sbatch_pid [spawn $sbatch --nodes=1-$num_nodes --time=10:00 --ntasks-per-node=$thread_res_num --output=/dev/null $file_in]
 	expect {
 		-re "Submitted batch job ($number)" {
 			set job_id $expect_out(1,string)

testsuite/expect/test6.7

@@ -152,12 +152,15 @@ if {[wait_for_file $file_out] == 0} {
 #
 # Variation of above to test signal of batch script processes
 # Note that job termination sends SIGCONT/SIGTERM, hence the
-# duplicate sleep call
+# duplicate sleep call.
 #
 exec rm -f $file_in $file_out
 make_bash_script $file_in "
+ $bin_date
  $bin_sleep 10
+ $bin_date
  $bin_sleep 10
+ $bin_date
  echo FINI
 "