Merge branch 'qa' into 'master'

See merge request SchedMD/dev/slurm!2669

Author: agilmor

testsuite/expect/test6.15

@@ -123,6 +123,11 @@ proc test_signaling { batch full } {
 	# Wait for job completion
 	#
 	wait_for_job -fail $job_id DONE
+	wait_for_file -fail $file_out
+	set output ""
+	wait_for -fail {[regexp -all "Ending: " $output] == 4} {
+		set output [run_command_output -fail "$bin_cat $file_out"]
+	}
 
 	set expected_script_signaled 0
 	set expected_parent_step_signaled 0

testsuite/expect/test6.15.prog.c

@@ -56,5 +56,16 @@ int main(int argc, char *argv[])
 	if (pid)
 		wait(NULL);
 
+	if (pid)
+		if (step)
+			printf("Ending: parent_step\n");
+		else
+			printf("Ending: parent_command\n");
+	else
+		if (step)
+			printf("Ending: child_step\n");
+		else
+			printf("Ending: child_command\n");
+
 	return 0;
 }